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

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

@@ -27,14 +27,14 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
     private final  static Logger logger = LoggerFactory.getLogger(AcqGoodsMoveUpDataConversion.class);
 
     /**
-     * 外部数据转换
+     * 货物库位移动数据
      *
      * @param params
      * @return
      */
     @Override
     public List conversion(Map params) {
-        logger.info("开始转换oms，wms 组装cus数据===========================");
+        logger.info("货物库位移动数据开始转换oms，wms 组装cus数据===========================");
         List<WmsAcqGoodsMove> wmsList = (List<WmsAcqGoodsMove>) params.get("wmsList");
 
         List<OmsProductInfo> productInfoList = (List<OmsProductInfo>) params.get("productInfoList");
@@ -44,47 +44,57 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
         for (int i = 0; i < wmsList.size(); i++) {
-            WmsAcqGoodsMove wmsAcqGoodsMove = wmsList.get(i);
+            // #20190521001
+            // 未作try catch 导致一个sku数据异常，全部终止
+            try {
+                WmsAcqGoodsMove wmsAcqGoodsMove = wmsList.get(i);
 
-            OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqGoodsMove.getSkuNo());
+                OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqGoodsMove.getSkuNo());
 
-            CusAcqGoodsMove05 cusAcqGoodsMove05 = new CusAcqGoodsMove05();
-            cusAcqGoodsMove05.setId(wmsAcqGoodsMove.getId());
-            if("上架".equals(wmsAcqGoodsMove.getTaskType())){
-                cusAcqGoodsMove05.setShelfLoadTime(wmsAcqGoodsMove.getCreated());
-            }
-            if("批量拣选".equals(wmsAcqGoodsMove.getTaskType())){
-                cusAcqGoodsMove05.setShelfUnloadTime(wmsAcqGoodsMove.getCreated());
-            }
-            cusAcqGoodsMove05.setTargetSeatNo(wmsAcqGoodsMove.getTargetSeatNo());
-            cusAcqGoodsMove05.setOriginSeatNo(wmsAcqGoodsMove.getOriginSeatNo());
-            cusAcqGoodsMove05.setGoodsName(wmsAcqGoodsMove.getGoodsName());
+                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
-//            cusAcqGoodsMove05.setCodeTs(wmsAcqGoodsMove.getCodeTs());
+                CusAcqGoodsMove05 cusAcqGoodsMove05 = new CusAcqGoodsMove05();
+                cusAcqGoodsMove05.setId(wmsAcqGoodsMove.getId());
+                if("上架".equals(wmsAcqGoodsMove.getTaskType())){
+                    cusAcqGoodsMove05.setShelfLoadTime(wmsAcqGoodsMove.getCreated());
+                }
+                if("批量拣选".equals(wmsAcqGoodsMove.getTaskType())){
+                    cusAcqGoodsMove05.setShelfUnloadTime(wmsAcqGoodsMove.getCreated());
+                }
+                cusAcqGoodsMove05.setTargetSeatNo(wmsAcqGoodsMove.getTargetSeatNo());
+                cusAcqGoodsMove05.setOriginSeatNo(wmsAcqGoodsMove.getOriginSeatNo());
+                cusAcqGoodsMove05.setGoodsName(wmsAcqGoodsMove.getGoodsName());
 
-            cusAcqGoodsMove05.setSkuNo(wmsAcqGoodsMove.getSkuNo());
-            cusAcqGoodsMove05.setGoodsId(wmsAcqGoodsMove.getGoodsId());
-            cusAcqGoodsMove05.setgUnit(wmsAcqGoodsMove.getgUnit());
-            cusAcqGoodsMove05.setgQty(wmsAcqGoodsMove.getgQty());
-            cusAcqGoodsMove05.setLegalUnit(wmsAcqGoodsMove.getLegalUnit());
-            cusAcqGoodsMove05.setLegalQty(wmsAcqGoodsMove.getLegalQty());
-            cusAcqGoodsMove05.setGoodsModel(wmsAcqGoodsMove.getGoodsModel());
-            cusAcqGoodsMove05.setLocalEmsNo(Dict.localEmsNo);
-            cusAcqGoodsMove05.setStoreCompanyName(Dict.storeCompanyName);
-            cusAcqGoodsMove05.setStoreUscCode(Dict.storeUscCode);
-            cusAcqGoodsMove05.setStoreCustomsCode(Dict.storeCustomsCode);
-            cusAcqGoodsMove05.setStoreCode(Dict.storeCode);
-            cusAcqGoodsMove05.setCreateTime(LocalDateTime.now());
-            cusAcqGoodsMove05.setCreaterSn("1");
-            cusAcqGoodsMove05.setModerSn("1");
-            cusAcqGoodsMove05.setModTime(LocalDateTime.now());
-            cusAcqGoodsMove05.setLegalQty(omsProductInfo.getLegalQyt());
-            cusAcqGoodsMove05.setLegalUnit(omsProductInfo.getLegalUnit());
-            cusAcqGoodsMove05.setGoodsModel(omsProductInfo.getGoodsModel());
-            cusAcqGoodsMove05.setCodeTs(omsProductInfo.getCodeTs());
-            cusAcqGoodsMove05List.add(cusAcqGoodsMove05);
+    //            cusAcqGoodsMove05.setCodeTs(wmsAcqGoodsMove.getCodeTs());
+
+                cusAcqGoodsMove05.setSkuNo(wmsAcqGoodsMove.getSkuNo());
+                cusAcqGoodsMove05.setGoodsId(wmsAcqGoodsMove.getGoodsId());
+                cusAcqGoodsMove05.setgUnit(wmsAcqGoodsMove.getgUnit());
+                cusAcqGoodsMove05.setgQty(wmsAcqGoodsMove.getgQty());
+                cusAcqGoodsMove05.setLegalUnit(wmsAcqGoodsMove.getLegalUnit());
+                cusAcqGoodsMove05.setLegalQty(wmsAcqGoodsMove.getLegalQty());
+                cusAcqGoodsMove05.setGoodsModel(wmsAcqGoodsMove.getGoodsModel());
+                cusAcqGoodsMove05.setLocalEmsNo(Dict.localEmsNo);
+                cusAcqGoodsMove05.setStoreCompanyName(Dict.storeCompanyName);
+                cusAcqGoodsMove05.setStoreUscCode(Dict.storeUscCode);
+                cusAcqGoodsMove05.setStoreCustomsCode(Dict.storeCustomsCode);
+                cusAcqGoodsMove05.setStoreCode(Dict.storeCode);
+                cusAcqGoodsMove05.setCreateTime(LocalDateTime.now());
+                cusAcqGoodsMove05.setCreaterSn("1");
+                cusAcqGoodsMove05.setModerSn("1");
+                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);
+            }finally {
+                continue;
+            }
         }
-        logger.info("转换oms，wms 组装cus数据结束===========================");
+        logger.info("货物库位移动转换oms，wms 组装cus数据结束===========================");
         return cusAcqGoodsMove05List;
     }
 }

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

@@ -27,14 +27,14 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
     private final static Logger logger = LoggerFactory.getLogger(AcqGoodsOnSeatDataConversion.class);
 
     /**
-     * 外部数据转换
+     * 库位货物
      *
      * @param params
      * @return
      */
     @Override
     public List conversion(Map params) {
-        logger.info("开始转换oms，wms 组装cus数据===========================");
+        logger.info("库位货物开始转换oms，wms 组装cus数据===========================");
 
         List<WmsAcqGoodsOnSeat> wmsList = (List<WmsAcqGoodsOnSeat>) params.get("wmsList");
         List<OmsAcqInventoryInfo> omsList = (List<OmsAcqInventoryInfo>) params.get("omsList");
@@ -53,6 +53,8 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
                 OmsAcqInventoryInfo omsAcqInventoryInfo = omsAcqInventoryInfoMap.get(wmsAcqGoodsOnSeat.getMerchSn());
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqGoodsOnSeat.getSkuNo());
 
+                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
+
                 CusAcqGoodsSeat06 cusAcqGoodsSeat06 = new CusAcqGoodsSeat06();
                 cusAcqGoodsSeat06.setId(wmsAcqGoodsOnSeat.getId());
                 cusAcqGoodsSeat06.setSeatNo(wmsAcqGoodsOnSeat.getSeatNo());
@@ -90,7 +92,7 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
                 continue;
             }
         }
-        logger.info("转换oms，wms 组装cus数据结束===========================");
+        logger.info("库位货物组装转换oms，wms 组装cus数据结束===========================");
         return cusAcqGoodsSeat06List;
     }
 }

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

@@ -28,7 +28,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
     private static final Logger logger = LoggerFactory.getLogger(AcqInventoryInfoDataConversion.class);
 
     /**
-     * 外部数据转换
+     * 货物库存
      * 将oms，和wms查询处理的数据进行转换
      *
      * @param params
@@ -36,7 +36,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
      */
     @Override
     public List conversion(Map params) {
-        logger.info("开始转换oms，wms 组装cus数据===========================");
+        logger.info("货物库存开始转换oms，wms 组装cus数据===========================");
 
         List<WmsAcqInventoryInfo> wmsList = (List<WmsAcqInventoryInfo>) params.get("wmsList");
         List<OmsAcqInventoryInfo> omsList = (List<OmsAcqInventoryInfo>) params.get("omsList");
@@ -55,6 +55,8 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
 
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqInventoryInfo.getCodeTs());
 
+                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
+
                 CusAcqInventoryInfo03 cusAcqInventoryInfo03 = new CusAcqInventoryInfo03();
                 cusAcqInventoryInfo03.setGoodsName(wmsAcqInventoryInfo.getGoodsName());
                 //wms codeTs（商品编码） = 料件号，sku
@@ -96,7 +98,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
                 continue;
             }
         }
-        logger.info("转换oms，wms 组装cus数据结束===========================");
+        logger.info("货物库存组装转换oms，wms 组装cus数据结束===========================");
         return cusAcqInventoryInfo03List;
     }
 }

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

@@ -28,14 +28,14 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
     private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownDataConversion.class);
 
     /**
-     * 企业货物上下架信息组装
+     * 企业货物上下架:下架:
      * 外部数据转换
      * @param params
      * @return
      */
     @Override
     public List conversion(Map params) {
-        logger.info("开始转换oms，wms 组装cus数据===========================");
+        logger.info("企业货物上下架:下架:开始转换oms，wms 组装cus数据===========================");
         List<WmsAcqShelfLoad> wmsList = (List<WmsAcqShelfLoad>) params.get("wmsList");
         List<CusAcqShelfLoad04> cusAcqShelfLoad04List = Lists.newArrayList();
 
@@ -43,44 +43,54 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
         final Map<String,OmsProductInfo> omsProductInfoMap = productInfoList.stream().collect(Collectors.toMap(k->k.getSkuNo(), v->v));
 
         for (int i = 0; i < wmsList.size(); i++) {
-            WmsAcqShelfLoad wmsAcqShelfLoad = wmsList.get(i);
+            // #20190521001
+            // 未作try catch 导致一个sku数据异常，全部终止
+            try {
+                WmsAcqShelfLoad wmsAcqShelfLoad = wmsList.get(i);
 
-            OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
+                OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
 
-            CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
-            cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
-            cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
+                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
-//            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
+                CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
+                cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
+                cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
 
-            cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
-            cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
-            cusAcqShelfLoad04.setSkuNo(wmsAcqShelfLoad.getSkuNo());
-            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.setLocalEmsNo(Dict.localEmsNo);
-            cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
-            cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
-            cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
-            cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
-            cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
-            cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
-            cusAcqShelfLoad04.setStoreCode(Dict.storeCode);
-            cusAcqShelfLoad04.setCreateTime(LocalDateTime.now());
-            cusAcqShelfLoad04.setCreaterSn("1");
-            cusAcqShelfLoad04.setModerSn("1");
-            cusAcqShelfLoad04.setModTime(LocalDateTime.now());
-            cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQyt());
-            cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
-            cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
-            cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
-            cusAcqShelfLoad04List.add(cusAcqShelfLoad04);
+    //            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
+
+                cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
+                cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
+                cusAcqShelfLoad04.setSkuNo(wmsAcqShelfLoad.getSkuNo());
+                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.setLocalEmsNo(Dict.localEmsNo);
+                cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
+                cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
+                cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
+                cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
+                cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
+                cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
+                cusAcqShelfLoad04.setStoreCode(Dict.storeCode);
+                cusAcqShelfLoad04.setCreateTime(LocalDateTime.now());
+                cusAcqShelfLoad04.setCreaterSn("1");
+                cusAcqShelfLoad04.setModerSn("1");
+                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);
+            }finally {
+                continue;
+            }
         }
-        logger.info("转换oms，wms 组装cus数据结束===========================");
+        logger.info("企业货物上下架:下架:转换oms，wms 组装cus数据结束===========================");
         return cusAcqShelfLoad04List;
     }
 }

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

@@ -28,14 +28,14 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
     private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpDataConversion.class);
 
     /**
-     * 企业货物上下架信息组装
+     * 企业货物上下架信息组装:上架:
      * 外部数据转换
      * @param params
      * @return
      */
     @Override
     public List conversion(Map params) {
-        logger.info("开始转换oms，wms 组装cus数据===========================");
+        logger.info("企业货物上下架信息组装:上架:开始转换oms，wms 组装cus数据===========================");
         List<WmsAcqShelfLoad> wmsList = (List<WmsAcqShelfLoad>) params.get("wmsList");
         //List<OmsAcqInventoryInfo> omsList = (List<OmsAcqInventoryInfo>) params.get("omsList");
         //final Map<String,OmsAcqInventoryInfo> omsAcqInventoryInfoMap = omsList.stream().collect(Collectors.toMap(k->k.getMerchSn(), v->v));
@@ -45,45 +45,55 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
 
         List<CusAcqShelfLoad04> cusAcqShelfLoad04List = Lists.newArrayList();
         for (int i = 0; i < wmsList.size(); i++) {
-            WmsAcqShelfLoad wmsAcqShelfLoad = wmsList.get(i);
+            // #20190521001
+            // 未作try catch 导致一个sku数据异常，全部终止
+            try {
+                WmsAcqShelfLoad wmsAcqShelfLoad = wmsList.get(i);
 
-            OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
+                OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
 
-            CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
-            cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
+                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
-//            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
+                CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
+                cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
 
-            cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
+    //            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
 
-            cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
-            cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
-            cusAcqShelfLoad04.setSkuNo(wmsAcqShelfLoad.getSkuNo());
-            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.setLocalEmsNo(Dict.localEmsNo);
-            cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
-            cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
-            cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
-            cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
-            cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
-            cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
-            cusAcqShelfLoad04.setStoreCode(Dict.storeCode);
-            cusAcqShelfLoad04.setCreateTime(LocalDateTime.now());
-            cusAcqShelfLoad04.setCreaterSn("1");
-            cusAcqShelfLoad04.setModerSn("1");
-            cusAcqShelfLoad04.setModTime(LocalDateTime.now());
-            cusAcqShelfLoad04.setLegalQty(omsProductInfo.getLegalQyt());
-            cusAcqShelfLoad04.setLegalUnit(omsProductInfo.getLegalUnit());
-            cusAcqShelfLoad04.setGoodsModel(omsProductInfo.getGoodsModel());
-            cusAcqShelfLoad04.setCodeTs(omsProductInfo.getCodeTs());
-            cusAcqShelfLoad04List.add(cusAcqShelfLoad04);
+                cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
+
+                cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
+                cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
+                cusAcqShelfLoad04.setSkuNo(wmsAcqShelfLoad.getSkuNo());
+                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.setLocalEmsNo(Dict.localEmsNo);
+                cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
+                cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
+                cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
+                cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
+                cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
+                cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
+                cusAcqShelfLoad04.setStoreCode(Dict.storeCode);
+                cusAcqShelfLoad04.setCreateTime(LocalDateTime.now());
+                cusAcqShelfLoad04.setCreaterSn("1");
+                cusAcqShelfLoad04.setModerSn("1");
+                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);
+            }finally {
+                continue;
+            }
         }
-        logger.info("转换oms，wms 组装cus数据结束===========================");
+        logger.info("企业货物上下架:上架:转换oms，wms 组装cus数据结束===========================");
         return cusAcqShelfLoad04List;
     }