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

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

@@ -6,6 +6,7 @@ import com.emato.cus.supervise.domain.WmsAcqGoodsMove;
 import com.emato.cus.supervise.domainCus.CusAcqGoodsMove05;
 import com.emato.cus.supervise.domainOms.OmsProductInfo;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -51,7 +52,12 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
 
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqGoodsMove.getSkuNo());
 
-                logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
+                String osku = omsProductInfo.getSkuNo();
+                if (StringUtils.isBlank(osku)) {
+                    logger.error("当前转换的sku为: {}, 对应的产品备案数据异常", osku);
+                    continue;
+                }
+                logger.debug("当前转换的sku为: {}", osku);
 
                 CusAcqGoodsMove05 cusAcqGoodsMove05 = new CusAcqGoodsMove05();
                 cusAcqGoodsMove05.setId(wmsAcqGoodsMove.getId());

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

@@ -7,6 +7,7 @@ import com.emato.cus.supervise.domainCus.CusAcqGoodsSeat06;
 import com.emato.cus.supervise.domainOms.OmsAcqInventoryInfo;
 import com.emato.cus.supervise.domainOms.OmsProductInfo;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -53,6 +54,11 @@ public class AcqGoodsOnSeatDataConversion implements DataConversion{
                 OmsAcqInventoryInfo omsAcqInventoryInfo = omsAcqInventoryInfoMap.get(wmsAcqGoodsOnSeat.getMerchSn());
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqGoodsOnSeat.getSkuNo());
 
+                String osku = omsProductInfo.getSkuNo();
+                if (StringUtils.isBlank(osku)) {
+                    logger.error("当前转换的sku为: {}, 对应的产品备案数据异常", osku);
+                    continue;
+                }
                 logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
                 CusAcqGoodsSeat06 cusAcqGoodsSeat06 = new CusAcqGoodsSeat06();

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

@@ -8,6 +8,7 @@ import com.emato.cus.supervise.domainOms.OmsAcqInventoryInfo;
 import com.emato.cus.supervise.domainOms.OmsProductInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -55,6 +56,11 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
 
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqInventoryInfo.getCodeTs());
 
+                String osku = omsProductInfo.getSkuNo();
+                if (StringUtils.isBlank(osku)) {
+                    logger.error("当前转换的sku为: {}, 对应的产品备案数据异常", osku);
+                    continue;
+                }
                 logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
                 CusAcqInventoryInfo03 cusAcqInventoryInfo03 = new CusAcqInventoryInfo03();

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

@@ -6,6 +6,7 @@ import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
 import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
 import com.emato.cus.supervise.domainOms.OmsProductInfo;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -50,6 +51,11 @@ public class AcqShelfLoadDownDataConversion implements DataConversion {
 
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
 
+                String osku = omsProductInfo.getSkuNo();
+                if (StringUtils.isBlank(osku)) {
+                    logger.error("当前转换的sku为: {}, 对应的产品备案数据异常", osku);
+                    continue;
+                }
                 logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
                 CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();

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

@@ -6,6 +6,7 @@ import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
 import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
 import com.emato.cus.supervise.domainOms.OmsProductInfo;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -52,6 +53,11 @@ public class AcqShelfLoadUpDataConversion implements DataConversion {
 
                 OmsProductInfo omsProductInfo = omsProductInfoMap.get(wmsAcqShelfLoad.getSkuNo());
 
+                String osku = omsProductInfo.getSkuNo();
+                if (StringUtils.isBlank(osku)) {
+                    logger.error("当前转换的sku为: {}, 对应的产品备案数据异常", osku);
+                    continue;
+                }
                 logger.debug("当前转换的sku为: {}", omsProductInfo.getSkuNo());
 
                 CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();

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

@@ -14,7 +14,7 @@
 		gc.cus_goods_code AS codeTs,
 		sku AS skuNo
 		FROM
-		pd_product_record pr inner join sys_cus_goods_code gc on pr.cus_goods_code = gc.cus_goods_code where sku IN
+		pd_product_record pr left outer join sys_cus_goods_code gc on pr.cus_goods_code = gc.cus_goods_code where sku IN
 		<foreach collection="list" item="sku" index="index"
 				 open="(" close=")" separator=",">
 			#{sku}