Merge branch 'master' of csk/cus-wms-supervise2.0 into master

src/main/java/com/emato/cus/supervise/biz/acqGoodsMoveSchedule/up/AcqGoodsMoveUpDataConversion.java

@@ -114,11 +114,13 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
 
                 cusAcqGoodsMove05.setSkuNo(wmsAcqGoodsMove.getSkuNo());
                 cusAcqGoodsMove05.setGoodsId(wmsAcqGoodsMove.getGoodsId());
+                cusAcqGoodsMove05.setCodeTs(omsProductInfo.getCodeTs());
                 cusAcqGoodsMove05.setgUnit(wmsAcqGoodsMove.getgUnit());
                 cusAcqGoodsMove05.setgQty(wmsAcqGoodsMove.getgQty());
-                cusAcqGoodsMove05.setLegalUnit(wmsAcqGoodsMove.getLegalUnit());
-                cusAcqGoodsMove05.setLegalQty(wmsAcqGoodsMove.getLegalQty());
-                cusAcqGoodsMove05.setGoodsModel(wmsAcqGoodsMove.getGoodsModel());
+
+                cusAcqGoodsMove05.setLegalQty(omsProductInfo.getLegalQty());
+                cusAcqGoodsMove05.setLegalUnit(omsProductInfo.getLegalUnit());
+                cusAcqGoodsMove05.setGoodsModel(omsProductInfo.getGoodsModel());
 
                 cusAcqGoodsMove05.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
                 cusAcqGoodsMove05.setStoreCompanyName(Dict.storeCompanyName);
@@ -134,10 +136,7 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
                 cusAcqGoodsMove05.setCreaterSn(Dict.operater);
                 cusAcqGoodsMove05.setModerSn(Dict.operater);
                 cusAcqGoodsMove05.setModTime(LocalDateTime.now());
-                cusAcqGoodsMove05.setLegalQty(omsProductInfo.getLegalQyt());
-                cusAcqGoodsMove05.setLegalUnit(omsProductInfo.getLegalUnit());
-                cusAcqGoodsMove05.setGoodsModel(omsProductInfo.getGoodsModel());
-                cusAcqGoodsMove05.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqGoodsMove05List.add(cusAcqGoodsMove05);
             }catch (Exception e){
                 logger.error("货物库位移动组装cus数据系统异常", e);

src/main/java/com/emato/cus/supervise/biz/acqGoodsMoveSchedule/up/AcqGoodsMoveUpOmsShopDataConversion.java

@@ -78,7 +78,7 @@ public class AcqGoodsMoveUpOmsShopDataConversion implements DataConversion {
                 cusAcqGoodsMove05.setStoreCompanyName(Dict.storeCompanyName);
                 cusAcqGoodsMove05.setStoreUscCode(Dict.storeUscCode);
                 cusAcqGoodsMove05.setStoreCustomsCode(Dict.storeCustomsCode);
-                cusAcqGoodsMove05.setStoreCode(data.getStoreCode());
+                cusAcqGoodsMove05.setStoreCode(Dict.storeCodeMap.get(data.getStoreCode()));
 
                 cusAcqGoodsMove05.setCreateTime(LocalDateTime.now());
                 cusAcqGoodsMove05.setCreaterSn(Dict.operater);

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatCusData.java

@@ -35,9 +35,6 @@ public class AcqGoodsOnSeatCusData implements CusData {
     @Autowired
     private OmsCusUnitCodeMapper omsCusUnitCodeMapper;
 
-    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_GOODS_ON_SEAT.getCode() + "]" + EmtRecordTimeEnum.ACQ_GOODS_ON_SEAT.getName();
-
-
     @Override
     public int writeCus(List<?> list) {
         logger.info("---------- 库位货物数据::写入本次监控数据开始 --------------------");
@@ -56,7 +53,7 @@ public class AcqGoodsOnSeatCusData implements CusData {
 
         // 查询已有库存信息表对应sku数据
         List<CusAcqGoodsSeat06> listgoodsSeat = cusAcqGoodsSeatService06.listCusAcqGoodsSeat(cusList);
-        Map<String, String> exitGoodsSeat = listgoodsSeat.stream().collect(Collectors.toMap(k->k.getSkuNo()+k.getSeatNo(), v->v.getId()));
+        Map<String, String> exitGoodsSeat = listgoodsSeat.stream().collect(Collectors.toMap(k->k.getSkuNo() + "_" + k.getSeatNo(), v->v.getId()));
 
         List<OmsCusUnitCode> codeList = omsCusUnitCodeMapper.getOmsCusUnitCodeList(gUnitNameList);
         Map<String,OmsCusUnitCode> omsCusUnitCodeMap = codeList.stream().collect(Collectors.toMap(k->k.getgUnitName(), v->v));
@@ -71,12 +68,13 @@ public class AcqGoodsOnSeatCusData implements CusData {
                 seat.setgUnit(omsProductInfo.getgUnitCode());
             }
 
-            String key = seat.getSkuNo() + seat.getSeatNo();
+            String key = seat.getSkuNo() + "_" + seat.getSeatNo();
             if (exitGoodsSeat.containsKey(key)) {
                 if (seat.getgQty().intValue() != 0) {
                     // 存在并且库存不为0, 则更新
                     updateList.add(seat);
                 } else {
+                    // 释放库位
                     // 存在并库存为0，则删除
                     seat.setId(exitGoodsSeat.get(key));
                     deleteList.add(seat);

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatDataConversion.java

@@ -89,16 +89,19 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
                 cusAcqGoodsSeat06.setId(wmsAcqGoodsOnSeat.getId());
                 cusAcqGoodsSeat06.setSeatNo(wmsAcqGoodsOnSeat.getSeatNo());
                 cusAcqGoodsSeat06.setGoodsName(wmsAcqGoodsOnSeat.getGoodsName());
-//                cusAcqGoodsSeat06.setCodeTs(wmsAcqGoodsOnSeat.getCodeTs());
+                cusAcqGoodsSeat06.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqGoodsSeat06.setFormNoDec(wmsAcqGoodsOnSeat.getFormNoDec());
                 cusAcqGoodsSeat06.setFormNo(wmsAcqGoodsOnSeat.getFormNo());
                 cusAcqGoodsSeat06.setSkuNo(wmsAcqGoodsOnSeat.getSkuNo());
                 cusAcqGoodsSeat06.setGoodsId(wmsAcqGoodsOnSeat.getGoodsId());
                 cusAcqGoodsSeat06.setgUnit(wmsAcqGoodsOnSeat.getgUnit());
                 cusAcqGoodsSeat06.setgQty(wmsAcqGoodsOnSeat.getgQty());
-                cusAcqGoodsSeat06.setLegalUnit(wmsAcqGoodsOnSeat.getLegalUnit());
-                cusAcqGoodsSeat06.setLegalQty(wmsAcqGoodsOnSeat.getLegalQty());
-                cusAcqGoodsSeat06.setGoodsModel(wmsAcqGoodsOnSeat.getGoodsModel());
+
+                cusAcqGoodsSeat06.setLegalQty(omsProductInfo.getLegalQty());
+                cusAcqGoodsSeat06.setLegalUnit(omsProductInfo.getLegalUnit());
+                cusAcqGoodsSeat06.setGoodsModel(omsProductInfo.getGoodsModel());
+
                 cusAcqGoodsSeat06.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
                 // TODO: 2018/5/8 此处存在问题：如wms的商户编号数据与oms的商户编号数据不统一，则会报空指针异常
                 cusAcqGoodsSeat06.setOwnerCode(omsMerchInfo.getOwnerCode());
@@ -115,10 +118,7 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
                 cusAcqGoodsSeat06.setCreaterSn(Dict.operater);
                 cusAcqGoodsSeat06.setModerSn(Dict.operater);
                 cusAcqGoodsSeat06.setModTime(LocalDateTime.now());
-                cusAcqGoodsSeat06.setLegalQty(omsProductInfo.getLegalQyt());
-                cusAcqGoodsSeat06.setLegalUnit(omsProductInfo.getLegalUnit());
-                cusAcqGoodsSeat06.setGoodsModel(omsProductInfo.getGoodsModel());
-                cusAcqGoodsSeat06.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqGoodsSeat06List.add(cusAcqGoodsSeat06);
             }catch (Exception e){
                 logger.error("库位货物组装cus数据系统异常", e);

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatOmsShopCusData.java

@@ -0,0 +1,100 @@
+package com.emato.cus.supervise.biz.acqGoodsSeat;
+
+import com.emato.cus.supervise.biz.CusData;
+import com.emato.cus.supervise.domainCus.CusAcqGoodsSeat06;
+import com.emato.cus.supervise.domainOms.OmsCusUnitCode;
+import com.emato.cus.supervise.mapperOms.OmsCusUnitCodeMapper;
+import com.emato.cus.supervise.service.cus.CusAcqGoodsSeatService06;
+import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 门店库位 即oms门店库存 写入海关 CUS
+ * @author Scott Chen
+ * @version 1.0
+ * 2017-10-31 12:38
+ */
+@Component
+public class AcqGoodsOnSeatOmsShopCusData implements CusData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqGoodsOnSeatOmsShopCusData.class);
+
+    @Autowired
+    private CusAcqGoodsSeatService06 cusAcqGoodsSeatService06;
+
+    @Autowired
+    private OmsCusUnitCodeMapper omsCusUnitCodeMapper;
+
+
+    @Override
+    public int writeCus(List<?> list) {
+        logger.info("---------- 门店库位货物数据::写入本次监控数据开始 --------------------");
+
+        List<CusAcqGoodsSeat06> cusList = (List<CusAcqGoodsSeat06>) list;
+
+        // 新增库存list
+        List<CusAcqGoodsSeat06> insertList = new ArrayList<>();
+        // 修改库存list
+        List<CusAcqGoodsSeat06> updateList = new ArrayList<>();
+        // 删除库存list
+        //List<CusAcqGoodsSeat06> deleteList = new ArrayList<>();
+
+        List<String> gUnitNameList = Lists.newArrayList();
+        cusList.forEach(i -> gUnitNameList.add(i.getgUnit()));
+
+        // 查询已有库存信息表对应sku数据
+        List<CusAcqGoodsSeat06> listgoodsSeat = cusAcqGoodsSeatService06.listCusAcqGoodsSeat(cusList);
+        Map<String, String> exitGoodsSeat = listgoodsSeat.stream().collect(Collectors.toMap(k->k.getSkuNo() + "_" + k.getSeatNo(), v->v.getId()));
+
+        for (CusAcqGoodsSeat06 seat:cusList) {
+            if (seat.getgQty() == null) {
+                seat.setgQty(0.0);
+            }
+
+            String key = seat.getSkuNo() + "_" + seat.getSeatNo();
+            if (exitGoodsSeat.containsKey(key)) {
+                if (seat.getgQty().intValue() != 0) {
+                    // 存在并且库存不为0, 则更新
+                    updateList.add(seat);
+                } else {
+                    //// 门店库位数据不能删除，只有在门店出场 即返区下架时，才能删除
+                    // seat.setId(exitGoodsSeat.get(key));
+                    // deleteList.add(seat);
+                }
+            } else {
+                if (seat.getgQty().intValue() != 0) {
+                    // 不存在并且库存不为0, 则插入
+                    insertList.add(seat);
+                }
+            }
+        }
+
+        int insertResult = 0;
+        int updateResult = 0;
+        //int deleteResult = 0;
+
+        if (insertList.size() > 0) {
+            insertResult = cusAcqGoodsSeatService06.addCusAcqGoodsSeat06(insertList);
+        }
+        if (updateList.size() > 0) {
+            updateResult = cusAcqGoodsSeatService06.updateCusAcqGoodsSeat06(updateList);
+        }
+        /*if (deleteList.size() > 0) {
+            deleteResult = cusAcqGoodsSeatService06.deleteCusAcqGoodsSeat06(deleteList);
+        }*/
+
+        //logger.info("--- 门店库位货物数据, 写入监控数据:{} 条, 更新监控数据:{}条, 删除监控数据：{}条", insertResult, updateResult, deleteResult);
+        logger.info("--- 门店库位货物数据, 写入监控数据:{} 条, 更新监控数据:{}条", insertResult, updateResult);
+
+        logger.info("---------- 门店库位货物数据::写入本次监控数据结束 --------------------");
+        //return insertResult + updateResult + deleteResult;
+        return insertResult + updateResult;
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatOmsShopData.java

@@ -17,7 +17,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * 门店在库库存 Oms 门店
+ * 门店库位 即oms门店库存
  * @author Scott Chen
  * @version 1.0
  * 2020-03-30 11:27

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatOmsShopDataConversion.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 门店在库库存 Oms 门店
+ * 门店库位 即oms门店库存
  * @author Scott Chen
  * @version 1.0
  * 2020-03-30 11:27
@@ -26,7 +26,7 @@ public class AcqGoodsOnSeatOmsShopDataConversion implements DataConversion{
     private final static Logger logger = LoggerFactory.getLogger(AcqGoodsOnSeatOmsShopDataConversion.class);
 
     /**
-     * 门店在库库存 Oms 门店
+     * 门店库位 即oms门店库存
      *
      * @param params
      * @return
@@ -71,7 +71,7 @@ public class AcqGoodsOnSeatOmsShopDataConversion implements DataConversion{
                 cusAcqGoodsSeat06.setStoreCompanyName(Dict.storeCompanyName);
                 cusAcqGoodsSeat06.setStoreUscCode(Dict.storeUscCode);
                 cusAcqGoodsSeat06.setStoreCustomsCode(Dict.storeCustomsCode);
-                cusAcqGoodsSeat06.setStoreCode(data.getStoreCode());
+                cusAcqGoodsSeat06.setStoreCode(Dict.storeCodeMap.get(data.getStoreCode()));
 
                 cusAcqGoodsSeat06.setCreateTime(LocalDateTime.now());
                 cusAcqGoodsSeat06.setCreaterSn(Dict.operater);

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsSeatBiz.java

@@ -51,6 +51,9 @@ public class AcqGoodsSeatBiz implements CusWmsTask {
     @Autowired
     private AcqGoodsOnSeatOmsShopDataConversion acqGoodsOnSeatOmsShopDataConversion;
 
+    @Autowired
+    private AcqGoodsOnSeatOmsShopCusData acqGoodsOnSeatOmsShopCusData;
+
 
     private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_GOODS_ON_SEAT.getCode() + "]" + EmtRecordTimeEnum.ACQ_GOODS_ON_SEAT.getName()
             + "，[" + EmtRecordTimeEnum.OMS_SHOP_ACQ_GOODS_ON_SEAT.getCode() + "]" + EmtRecordTimeEnum.OMS_SHOP_ACQ_GOODS_ON_SEAT.getName();
@@ -91,7 +94,7 @@ public class AcqGoodsSeatBiz implements CusWmsTask {
         }
 
 
-        // req_20200430001 门店库存海关监管
+        // req_20200430001 oms门店库存海关监管
         List<OmsShopAcqGoodsSeat> omsShopList = acqGoodsOnSeatOmsShopData.getOmsShopData(oldThisTime);
         boolean omsShopOp = true;
         if (omsShopList == null || omsShopList.size() == 0) {
@@ -179,7 +182,7 @@ public class AcqGoodsSeatBiz implements CusWmsTask {
         List<CusAcqGoodsSeat06> cusList = acqGoodsOnSeatOmsShopDataConversion.conversion(params);
 
         // 写CUS 数据
-        int res = acqGoodsOnSeatCusData.writeCus(cusList);
+        int res = acqGoodsOnSeatOmsShopCusData.writeCus(cusList);
     }
 
 

src/main/java/com/emato/cus/supervise/biz/acqInventoryInfo/AcqInventoryInfoDataConversion.java

@@ -87,6 +87,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
 
                 cusAcqInventoryInfo03.setSkuNo(wmsAcqInventoryInfo.getSkuNo());
                 cusAcqInventoryInfo03.setGoodsId(wmsAcqInventoryInfo.getSkuNo());
+                cusAcqInventoryInfo03.setCodeTs(omsProductInfo.getCodeTs());
 
                 cusAcqInventoryInfo03.setgUnit(omsProductInfo.getgUnitCode());
                 if (wmsAcqInventoryInfo.getgQty() == null) {
@@ -97,14 +98,13 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
                 }
                 cusAcqInventoryInfo03.setgQty(wmsAcqInventoryInfo.getgQty());
 
-                //法定单位，法定数量暂时未查询
-                cusAcqInventoryInfo03.setLegalUnit(wmsAcqInventoryInfo.getLegalUnit());
-                cusAcqInventoryInfo03.setLegalQty(wmsAcqInventoryInfo.getLegalQty());
+                cusAcqInventoryInfo03.setLegalQty(omsProductInfo.getLegalQty());
+                cusAcqInventoryInfo03.setLegalUnit(omsProductInfo.getLegalUnit());
+                cusAcqInventoryInfo03.setGoodsModel(omsProductInfo.getGoodsModel());
 
                 cusAcqInventoryInfo03.setGoodsModel(omsProductInfoMap.get(wmsAcqInventoryInfo.getSkuNo()).getGoodsModel());
-                // TODO 区分不同货主，不同货品对应的不同账册
-                cusAcqInventoryInfo03.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
 
+                cusAcqInventoryInfo03.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
                 cusAcqInventoryInfo03.setOwnerCode(omsMerchInfo.getOwnerCode());
                 cusAcqInventoryInfo03.setOwnerName(omsMerchInfo.getOwnerName());
 
@@ -120,10 +120,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
                 cusAcqInventoryInfo03.setCreaterSn(Dict.operater);
                 cusAcqInventoryInfo03.setModerSn(Dict.operater);
                 cusAcqInventoryInfo03.setModTime(LocalDateTime.now());
-                cusAcqInventoryInfo03.setLegalQty(omsProductInfo.getLegalQyt());
-                cusAcqInventoryInfo03.setLegalUnit(omsProductInfo.getLegalUnit());
-                cusAcqInventoryInfo03.setGoodsModel(omsProductInfo.getGoodsModel());
-                cusAcqInventoryInfo03.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqInventoryInfo03List.add(cusAcqInventoryInfo03);
 
             }catch (Exception e){

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownBiz.java

@@ -22,7 +22,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 上架
+ * 下架
+ * 特别情况，门店出场返区，必须删除在CUS中间表中已经存在的库位（skuNo和seatNo联合唯一）数据
  * @author zengjunlin
  * @version 1.0
  * 2018-02-03 11:25
@@ -57,6 +58,9 @@ public class AcqShelfLoadDownBiz implements CusWmsTask{
     @Autowired
     private AcqShelfLoadSaleDownOmsShopDataConversion acqShelfLoadSaleDownOmsShopDataConversion;
 
+    @Autowired
+    private AcqShelfLoadDownOmsShopCusData acqShelfLoadDownOmsShopCusData;
+
 
     private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName()
             + "，[" + EmtRecordTimeEnum.OMS_SHOP_ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.OMS_SHOP_ACQ_SHELF_LOAD_DOWN.getName();
@@ -202,6 +206,9 @@ public class AcqShelfLoadDownBiz implements CusWmsTask{
 
         // 写CUS 数据
         int res = acqShelfLoadDownCusData.writeCus(cusList);
+
+        // 门店返区出场，必须要删除门店库位数据
+        int delRes = acqShelfLoadDownOmsShopCusData.deteleteCus(cusList);
     }
 
     /**

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownCusData.java

@@ -65,7 +65,7 @@ public class AcqShelfLoadDownCusData implements CusData {
 
         int result = cusAcqShelfLoadService04.addCusAcqShelfLoad04(cusList);
 
-        logger.info("---【" + DATA_TYPE_INFO + "】写入监控数据:{} 条", result);
+        logger.info("---货物上下架数据写入监控数据:{} 条", result);
 
         logger.info("---------- 货物上下架数据::下架::写入本次监控数据结束 --------------------");
         return result;

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownDataConversion.java

@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- *
+ * 门店货物上下架数据 门店出场 即下架
  * @author zengjunlin
  * @version 1.0
  * 2018-02-03 13:40
@@ -32,7 +32,7 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
     private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownDataConversion.class);
 
     /**
-     * 企业货物上下架:下架:
+     * 门店货物上下架数据 门店出场 即下架
      * 外部数据转换
      * @param params
      * @return
@@ -93,7 +93,7 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
                 cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
                 cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
 
-    //            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
+                cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
 
                 cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
                 cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
@@ -101,8 +101,11 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
                 cusAcqShelfLoad04.setGoodsId(wmsAcqShelfLoad.getGoodsId());
                 cusAcqShelfLoad04.setgUnit(wmsAcqShelfLoad.getgUnit());
                 cusAcqShelfLoad04.setgQty(wmsAcqShelfLoad.getgQty());
-                cusAcqShelfLoad04.setLegalUnit(wmsAcqShelfLoad.getLegalUnit());
-                cusAcqShelfLoad04.setLegalQty(wmsAcqShelfLoad.getLegalQty());
+
+                cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQty());
+                cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
+                cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
+
                 cusAcqShelfLoad04.setGoodsModel(wmsAcqShelfLoad.getGoodsModel());
 
                 cusAcqShelfLoad04.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
@@ -121,10 +124,7 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
                 cusAcqShelfLoad04.setCreaterSn(Dict.operater);
                 cusAcqShelfLoad04.setModerSn(Dict.operater);
                 cusAcqShelfLoad04.setModTime(LocalDateTime.now());
-                cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQyt());
-                cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
-                cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
-                cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqShelfLoad04List.add(cusAcqShelfLoad04);
             }catch (Exception e){
                 logger.error("企业货物上下架:下架:信息组装cus数据系统异常", e);

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownOmsShopCusData.java

@@ -0,0 +1,79 @@
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.CusData;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domainCus.CusAcqGoodsSeat06;
+import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
+import com.emato.cus.supervise.domainOms.OmsCusUnitCode;
+import com.emato.cus.supervise.mapperOms.OmsCusUnitCodeMapper;
+import com.emato.cus.supervise.service.cus.CusAcqGoodsSeatService06;
+import com.emato.cus.supervise.service.cus.CusAcqShelfLoadService04;
+import com.emato.cus.supervise.util.snow.SnowflakeUtil;
+import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 门店货物上下架数据 门店出场 即下架 删除门店库位 写入 CUS
+ * @author Scott Chen
+ * @version 1.0
+ * 2017-10-31 12:38
+ */
+@Component
+public class AcqShelfLoadDownOmsShopCusData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownOmsShopCusData.class);
+
+    @Autowired
+    private CusAcqGoodsSeatService06 cusAcqGoodsSeatService06;
+
+
+    public int deteleteCus(List<?> list) {
+        logger.info("---------- 门店返区出场数据::下架::删除门店库位::写入本次监控数据开始 --------------------");
+
+        List<CusAcqShelfLoad04> cusList = (List<CusAcqShelfLoad04>) list;
+
+        List<CusAcqGoodsSeat06> listSeat = Lists.newArrayList();
+
+        cusList.forEach(i -> {
+            CusAcqGoodsSeat06 seat06 = new CusAcqGoodsSeat06();
+            seat06.setSkuNo(i.getSkuNo());
+            seat06.setSeatNo(i.getSeatNo());
+            seat06.setgQty(i.getgQty());
+            seat06.setLocalEmsNo(i.getLocalEmsNo());
+            listSeat.add(seat06);
+        });
+
+        // 查询库位表中对应sku,seatNo,gQty,账册localEmsNo，已经存在的库位数据
+        List<CusAcqGoodsSeat06> listgoodsSeat = cusAcqGoodsSeatService06.listGoodsSeat(listSeat);
+        if (listgoodsSeat == null || listgoodsSeat.size() == 0) {
+            int result = 0;
+            logger.info("---门店返区出场，CUS中间表无对应的库位数据，不执行删除!");
+            logger.info("---------- 门店返区出场数据::下架::::删除门店库位::写入本次监控数据结束 --------------------");
+            return result;
+        }
+
+        // 删除库存list
+        List<CusAcqGoodsSeat06> deleteList = new ArrayList<>();
+
+        listgoodsSeat.forEach(i -> {
+            CusAcqGoodsSeat06 delSeat = new CusAcqGoodsSeat06();
+            delSeat.setId(i.getId());
+            deleteList.add(delSeat);
+        });
+
+
+        int result = cusAcqGoodsSeatService06.deleteCusAcqGoodsSeat06(deleteList);
+
+        logger.info("---门店返区出场，删除门店库位数据写入监控数据:{} 条", result);
+
+        logger.info("---------- 门店返区出场数据::下架::::删除门店库位::写入本次监控数据结束 --------------------");
+        return result;
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadOutDownOmsShopData.java

@@ -38,7 +38,7 @@ public class AcqShelfLoadOutDownOmsShopData {
         }
 
         ImmutableMap param = ImmutableMap.of("thisTime", thisTime);
-        List<OmsShopAcqShelfLoad> resultList = omsShopAcqShelfLoadService.getOmsShopAcqShelfLoadSaleDown(param);
+        List<OmsShopAcqShelfLoad> resultList = omsShopAcqShelfLoadService.getOmsShopAcqShelfLoadDown(param);
 
         if (resultList == null || resultList.size() == 0) {
             String err = "---【" + DATA_TYPE_INFO + "】获取本次监控数据为空.";

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpDataConversion.java

@@ -92,7 +92,12 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
                 CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
                 cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
 
+                cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
+                cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
+                cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
+
                 cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
+                cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
 
                 cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
                 cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
@@ -100,14 +105,12 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
                 cusAcqShelfLoad04.setGoodsId(wmsAcqShelfLoad.getGoodsId());
                 cusAcqShelfLoad04.setgUnit(wmsAcqShelfLoad.getgUnit());
                 cusAcqShelfLoad04.setgQty(wmsAcqShelfLoad.getgQty());
-                cusAcqShelfLoad04.setLegalUnit(wmsAcqShelfLoad.getLegalUnit());
-                cusAcqShelfLoad04.setLegalQty(wmsAcqShelfLoad.getLegalQty());
-                cusAcqShelfLoad04.setGoodsModel(wmsAcqShelfLoad.getGoodsModel());
 
+                cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQty());
+                cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
+                cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
                 cusAcqShelfLoad04.setLocalEmsNo(omsMerchInfo.getCusEmsNo());
-                cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
-                cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
-                cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
+
                 cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
                 cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
                 cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
@@ -120,10 +123,7 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
                 cusAcqShelfLoad04.setCreaterSn(Dict.operater);
                 cusAcqShelfLoad04.setModerSn(Dict.operater);
                 cusAcqShelfLoad04.setModTime(LocalDateTime.now());
-                cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQyt());
-                cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
-                cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
-                cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
+
                 cusAcqShelfLoad04List.add(cusAcqShelfLoad04);
             }catch (Exception e){
                 logger.error("企业货物上下架:上架:信息组装cus数据系统异常", e);

src/main/java/com/emato/cus/supervise/domainOms/OmsProductInfo.java

@@ -14,7 +14,7 @@ public class OmsProductInfo implements Serializable {
     private String merchSn;
     private String legalUnit;
 
-    private Double legalQyt;
+    private Double legalQty;
 
     private String goodsModel;
 
@@ -56,12 +56,12 @@ public class OmsProductInfo implements Serializable {
         this.legalUnit = legalUnit;
     }
 
-    public Double getLegalQyt() {
-        return legalQyt;
+    public Double getLegalQty() {
+        return legalQty;
     }
 
-    public void setLegalQyt(Double legalQyt) {
-        this.legalQyt = legalQyt;
+    public void setLegalQty(Double legalQty) {
+        this.legalQty = legalQty;
     }
 
     public String getGoodsModel() {

src/main/java/com/emato/cus/supervise/domainOmsShop/OmsShopAcqGoodsSeat.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 库位货物数据 Oms 门店
+ * 门店库位 即oms门店库存
  *
  * @author Scott Chen
  * @version 1.0

src/main/java/com/emato/cus/supervise/domainOmsShop/OmsShopAcqInventoryInfo.java

@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
  * @version 1.0
  * 2020-03-30 11:27
  */
+@Deprecated
 public class OmsShopAcqInventoryInfo implements Serializable {
     private static final long serialVersionUID = -1786218576323478234L;
 

src/main/java/com/emato/cus/supervise/mapperCus/CusAcqGoodsSeatMapper06.java

@@ -23,6 +23,8 @@ public interface CusAcqGoodsSeatMapper06 {
 
     List<CusAcqGoodsSeat06> listCusAcqGoodsSeat(List<CusAcqGoodsSeat06> list);
 
+    List<CusAcqGoodsSeat06> listGoodsSeat(List<CusAcqGoodsSeat06> list);
+
     int updateCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
 
     int deleteCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);

src/main/java/com/emato/cus/supervise/mapperOmsShop/OmsShopAcqGoodsSeatMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 门店在库库存 即门店库存
+ * 门店库位 即oms门店库存
  * @author Scott Chen
  * @version 1.0
  * 2020-03-30 11:27

src/main/java/com/emato/cus/supervise/service/cus/CusAcqGoodsSeatService06.java

@@ -26,6 +26,15 @@ public interface CusAcqGoodsSeatService06 {
     List<CusAcqGoodsSeat06> listCusAcqGoodsSeat(List<CusAcqGoodsSeat06> list);
 
     /**
+     * 查询现有库位货物信息
+     * sku, seatNo, gQty, 账册localEmsNo
+     * @param list
+     * @return
+     */
+    List<CusAcqGoodsSeat06> listGoodsSeat(List<CusAcqGoodsSeat06> list);
+
+
+    /**
      * 更新库位货物信息
      * @param list
      * @return

src/main/java/com/emato/cus/supervise/service/cus/impl/CusAcqGoodsMoveSeatServiceImpl06.java

@@ -34,6 +34,11 @@ public class CusAcqGoodsMoveSeatServiceImpl06 implements CusAcqGoodsSeatService0
     }
 
     @Override
+    public List<CusAcqGoodsSeat06> listGoodsSeat(List<CusAcqGoodsSeat06> list) {
+        return cusAcqGoodsSeatMapper06.listGoodsSeat(list);
+    }
+
+    @Override
     @Transactional(value ="secondTransactionManager")
     public int updateCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list) {
         return cusAcqGoodsSeatMapper06.updateCusAcqGoodsSeat06(list);

src/main/java/com/emato/cus/supervise/service/omsshop/OmsShopAcqGoodsSeatService.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 门店在库库存 Oms 门店
+ * 门店库位 即oms门店库存
  * @author Scott Chen
  * @version 1.0
  * 2020-03-30 11:27
@@ -15,7 +15,7 @@ import java.util.Map;
 public interface OmsShopAcqGoodsSeatService {
 
     /**
-     * 在库库存 即门店库存
+     * 门店库位 即oms门店库存
      * @param param
      * @return
      */

src/main/resources/mybatis/mapperCus/cus-acq-goods-seat.xml

@@ -48,6 +48,18 @@
         </where>
     </select>
 
+    <!-- 带sku,seatNo,gQty,账册localEmsNo -->
+    <select id="listGoodsSeat" resultMap="cusAcqGoodsSeat" parameterType="List">
+        select * from acq_goods_on_seat
+        <where>
+            <foreach collection="list" item="i" index="idx" open="(" separator="or" close=")">
+                <if test="i.seatNo !=null and i.seatNo !='' and i.gQty !='' and i.localEmsNo !=''">
+                    sku_no=#{i.skuNo} and seat_no=#{i.seatNo} and g_qyt=#{i.gQty} and local_ems_no=#{i.localEmsNo}
+                </if>
+            </foreach>
+        </where>
+    </select>
+
     <!-- 库位货物数据 -->
     <insert id="addCusAcqGoodsSeat06" parameterType="List">
         INSERT INTO acq_goods_on_seat (

src/main/resources/mybatis/mapperCus/cus-acq-inventory-info.xml

@@ -69,14 +69,14 @@
             <trim prefix="goods_name =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.goodsName !=null and i.goodsName !=''">
-                        when sku_no=#{i.skuNo} then #{i.goodsName, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.goodsName, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="code_ts =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.codeTs !=null and i.codeTs !=''">
-                        when sku_no=#{i.skuNo} then #{i.codeTs, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.codeTs, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
@@ -84,14 +84,14 @@
             <trim prefix="g_unit =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.gUnit !=null and i.gUnit !=''">
-                        when sku_no=#{i.skuNo} then #{i.gUnit, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.gUnit, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="g_qyt =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.gQty !=null and i.gQty !=''">
-                        when sku_no=#{i.skuNo} then #{i.gQty, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.gQty, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
@@ -99,14 +99,14 @@
             <trim prefix="legal_unit =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.legalUnit !=null and i.legalUnit !=''">
-                        when sku_no=#{i.skuNo} then #{i.legalUnit, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.legalUnit, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="legal_qyt =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.legalQty !=null and i.legalQty !=''">
-                        when sku_no=#{i.skuNo} then #{i.legalQty, jdbcType=VARCHAR}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.legalQty, jdbcType=VARCHAR}
                     </if>
                 </foreach>
             </trim>
@@ -114,14 +114,14 @@
             <trim prefix="goods_model =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.goodsModel !=null and i.goodsModel !=''">
-                        when sku_no=#{i.skuNo} then #{i.goodsModel, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.goodsModel, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="owner_code =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.ownerCode !=null and i.ownerCode !=''">
-                        when sku_no=#{i.skuNo} then #{i.ownerCode, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.ownerCode, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
@@ -129,14 +129,14 @@
             <trim prefix="owner_name =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.ownerName !=null and i.ownerName !=''">
-                        when sku_no=#{i.skuNo} then #{i.ownerName, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.ownerName, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="store_company_name =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.storeCompanyName !=null and i.storeCompanyName !=''">
-                        when sku_no=#{i.skuNo} then #{i.storeCompanyName, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.storeCompanyName, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
@@ -145,14 +145,14 @@
             <trim prefix="store_usc_code =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.storeUscCode !=null and i.storeUscCode !=''">
-                        when sku_no=#{i.skuNo} then #{i.storeUscCode, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.storeUscCode, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="store_customs_code =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.storeCustomsCode !=null and i.storeCustomsCode !=''">
-                        when sku_no=#{i.skuNo} then #{i.storeCustomsCode, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.storeCustomsCode, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
@@ -160,7 +160,7 @@
             <trim prefix="store_code =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.storeCode !=null and i.storeCode !=''">
-                        when sku_no=#{i.skuNo} then #{i.storeCode, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.storeCode, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
@@ -168,14 +168,14 @@
             <trim prefix="moder_sn =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.moderSn !=null and i.moderSn !=''">
-                        when sku_no=#{i.skuNo} then #{i.moderSn, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.moderSn, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
             <trim prefix="mod_time =case" suffix="end,">
                 <foreach collection="list" item="i" index="idx">
                     <if test="i.modTime !=null">
-                        when sku_no=#{i.skuNo} then #{i.modTime, jdbcType=DATE}
+                        when sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo} then #{i.modTime, jdbcType=DATE}
                     </if>
                 </foreach>
             </trim>
@@ -183,7 +183,7 @@
         <where>
             <if test="list != null and list.size()>0">
                 <foreach collection="list" item="i" index="index" separator="or" >
-                    sku_no=#{i.skuNo}
+                    sku_no=#{i.skuNo} and local_ems_no=#{i.localEmsNo}
                 </foreach>
             </if>
         </where>

src/main/resources/mybatis/mapperOms/oms-product-info.xml

@@ -9,7 +9,7 @@
             resultType="com.emato.cus.supervise.domainOms.OmsProductInfo">
 		SELECT distinct
 			pr.merch_sn AS merchSn,
-			pr.legal_unit1_qty As legalQyt,
+			pr.legal_unit1_qty As legalQty,
 			pr.cus_decl_ele AS goodsModel,
 			gc.legal_unit1_code AS legalUnit,
 			gc.cus_goods_code AS codeTs,

src/main/resources/mybatis/mapperOms/oms-shop-acq-goods-move.xml

@@ -16,7 +16,7 @@
 			t1.sku as goodsId,
 			t1.unit_code AS gUnit,
 			t.move_num as gQty,
-			t1.legal_unit1_qty as legalQyt,
+			t1.legal_unit1_qty as legalQty,
 			t5.legal_unit1_code as legalUnit,
 			t1.cus_decl_ele AS goodsModel,
 			t2.cus_ems_no as localEmsNo,

src/main/resources/mybatis/mapperOms/oms-shop-acq-goods-on-seat.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.emato.cus.supervise.mapperOmsShop.OmsShopAcqGoodsSeatMapper">
 
-    <!-- 在库库存 即门店库存 -->
+    <!-- 门店库位 即oms门店库存 -->
     <select id="getOmsShopAcqGoodsSeat" parameterType="java.util.Map" resultType="com.emato.cus.supervise.domainOmsShop.OmsShopAcqGoodsSeat">
         SELECT
           t3.shop_name as shopName,
@@ -14,7 +14,7 @@
           t1.sku as goodsId,
           t1.unit_code AS gUnit,
           t.shop_inve as gQty,
-          t1.legal_unit1_qty as legalQyt,
+          t1.legal_unit1_qty as legalQty,
           t5.legal_unit1_code as legalUnit,
           t1.cus_decl_ele AS goodsModel,
           t2.cus_ems_no as localEmsNo,

src/main/resources/mybatis/mapperOms/oms-shop-acq-inventory-info.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.emato.cus.supervise.mapperOmsShop.OmsShopAcqInventoryInfoMapper">
 
 
-    <!-- 门店库存 即库位 -->
+    <!-- ！！！停止使用！！ 在库库存 即门店库存 -->
     <select id="getOmsShopAcqInventoryInfo" parameterType="java.util.Map"
             resultType="com.emato.cus.supervise.domainOmsShop.OmsShopAcqInventoryInfo">
 		SELECT
@@ -15,7 +15,7 @@
 			t1.sku as goodsId,
 			t1.unit_code AS gUnit,
 			t.shop_inve as gQty,
-			t1.legal_unit1_qty as legalQyt,
+			t1.legal_unit1_qty as legalQty,
 			t5.legal_unit1_code as legalUnit,
 			t1.cus_decl_ele AS goodsModel,
 			t2.cus_ems_no as localEmsNo,

src/main/resources/mybatis/mapperOms/oms-shop-acq-shelf-load.xml

@@ -12,7 +12,7 @@
 			t1.sku as goodsId,
 			t1.unit_code AS gUnit,
 			t0.goods_num as gQty,
-			t1.legal_unit1_qty as legalQyt,
+			t1.legal_unit1_qty as legalQty,
 			t5.legal_unit1_code as legalUnit,
 			t1.cus_decl_ele AS goodsModel,
 			t2.cus_ems_no as localEmsNo,
@@ -45,7 +45,7 @@
 			t1.sku as goodsId,
 			t1.unit_code AS gUnit,
 			t0.goods_num as gQty,
-			t1.legal_unit1_qty as legalQyt,
+			t1.legal_unit1_qty as legalQty,
 			t5.legal_unit1_code as legalUnit,
 			t1.cus_decl_ele AS goodsModel,
 			t2.cus_ems_no as localEmsNo,
@@ -78,7 +78,7 @@
 			t1.sku as goodsId,
 			t1.unit_code AS gUnit,
 			t.minus_num as gQty,
-			t1.legal_unit1_qty as legalQyt,
+			t1.legal_unit1_qty as legalQty,
 			t5.legal_unit1_code as legalUnit,
 			t1.cus_decl_ele AS goodsModel,
 			t2.cus_ems_no as localEmsNo,

src/sql/oms-shop-data-2.1.sql

@@ -1,5 +1,5 @@
 
--- 进场 即上架 出区
+-- 锟斤拷锟斤拷 锟斤拷锟较硷拷 锟斤拷锟斤拷
 select t3.shop_name as shopName,
        t1.prod_name AS goodsName,
        t1.cus_goods_code as codeTs,
@@ -7,7 +7,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.in_out_num as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,
@@ -24,7 +24,7 @@ from wb_merch_shop_in t
 where t.in_demand_type='21' and t.shop_type='10' and t.goods_biz_type='01' and t2.ems_class_type='zszc';
 
 
--- 出场  即下架 返区，返回保税区展示账册库位
+-- 锟斤拷锟斤拷  锟斤拷锟铰硷拷 锟斤拷锟斤拷锟斤拷锟斤拷锟截憋拷税锟斤拷展示锟剿诧拷锟轿�
 select t3.shop_name as shopName,
        t1.prod_name AS goodsName,
        t1.cus_goods_code as codeTs,
@@ -32,7 +32,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.in_out_num as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,
@@ -48,7 +48,7 @@ from wb_merch_shop_out t
          left outer join sys_cus_goods_code t5 on t1.cus_goods_code = t5.cus_goods_code
 where t.shop_type='10' and t.goods_biz_type='01' and t2.ems_class_type='zszc';
 
--- 销售 即下架
+-- 锟斤拷锟斤拷 锟斤拷锟铰硷拷
 select t3.shop_name as shopName,
        t1.prod_name AS goodsName,
        t1.cus_goods_code as codeTs,
@@ -56,7 +56,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.minus_num as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,
@@ -74,7 +74,7 @@ where t.goods_biz_type='01' and t2.ems_class_type='zszc';
 
 
 
--- 转移 从一个门店移到另一个门店，对应从一个库位移到另一个库位
+-- 转锟斤拷 锟斤拷一锟斤拷锟脚碉拷锟狡碉拷锟斤拷一锟斤拷锟脚店，锟斤拷应锟斤拷一锟斤拷锟斤拷位锟狡碉拷锟斤拷一锟斤拷锟斤拷位
 select t3.shop_name as shopName,
        t.create_time as shelfLoadTime,
        t.create_time as shelfUnLoadTime,
@@ -86,7 +86,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.move_num as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,
@@ -101,7 +101,7 @@ from wb_merch_shop_move_record t
 where t.shop_type='10' and t.goods_biz_type='01' and t2.ems_class_type='zszc';
 
 
--- 门店库存 即库位
+-- 锟脚碉拷锟斤拷 锟斤拷锟斤拷位
 select t3.shop_name as shopName,
        t1.prod_name AS goodsName,
        t1.cus_goods_code as codeTs,
@@ -109,7 +109,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.shop_inve as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,
@@ -126,7 +126,7 @@ from wb_merch_shop_inve t
 where t.goods_biz_type='01' and t.is_valid='0' and t2.ems_class_type='zszc';
 
 
--- 在库库存 即门店库存
+-- 锟节匡拷锟斤拷 锟斤拷锟脚碉拷锟斤拷
 select t3.shop_name as shopName,
        t3.shop_code as seatNo,
        t1.prod_name AS goodsName,
@@ -135,7 +135,7 @@ select t3.shop_name as shopName,
        t1.sku as goodsId,
        t1.unit_code AS gUnit,
        t.shop_inve as gQty,
-       t1.legal_unit1_qty as legalQyt,
+       t1.legal_unit1_qty as legalQty,
        t5.legal_unit1_code as legalUnit,
        t1.cus_decl_ele AS goodsModel,
        t2.cus_ems_no as localEmsNo,