Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java

@@ -17,6 +17,7 @@ public enum CommodityCodeEnum {
     DATA_SOURCE_9("9", "引用集团库"),
     DATA_SOURCE_10("10", "克隆公司库"),
     DATA_SOURCE_11("11", "电商接口同步"),
+    DATA_SOURCE_12("12", "mdm同步"),
 
     ;
 

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java

@@ -377,8 +377,12 @@ public class CommodityServiceImpl implements CommodityService {
             }
             num++;
         }
+        R ok = R.ok();
+        if(resultMap.size() > 0){
+            ok = R.error();
+        }
 
-        return R.ok().put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size())
+        return ok.put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size())
                 .put("fail", resultMap.size());
     }
 
@@ -615,15 +619,18 @@ public class CommodityServiceImpl implements CommodityService {
 
                 CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery();
                 commodityCodeCheckQuery.setXmmc(xmmc);
-                String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey();
-                commodityCodeCheckQuery.setZxbm(zxbm);
+                if(StringUtils.isBlank(receiveSpxxReq.getZxbm())){
+                    receiveSpxxReq.setZxbm(baseService.getGenerateShotKey());
+                }
+
+                commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm());
                 commodityCodeCheckQuery.setGgxh(receiveSpxxReq.getGgxh());
                 commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw());
                 commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj());
                 commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl());
                 commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId());
                 Map<String,String> map = new HashMap<>();
-                map.put("zxbm",zxbm);
+                map.put("zxbm",receiveSpxxReq.getZxbm());
                 map.put("entId",receiveSpxxReq.getEntId());
 
                 if(StringUtils.isBlank(receiveSpxxReq.getEntId())){

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java

@@ -13,6 +13,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail;
 import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO;
 import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
+import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum;
 import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper;
 import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper;
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
@@ -344,6 +345,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : "";
             ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(ggxh);
             //调整后不更新公司物料
+            commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_12.getKey());
             if(collect != null && collect.size() > 0){
                 //matchCommodityCode(commodityCodeEntity);
                 commodityCodeEntity.setXmmc(reqBO.getDESC1());
@@ -357,7 +359,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
                     commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
                 }
-                commodityCodeEntity.setDataSource("4");
                 //matchCommodityCode(commodityCodeEntity);
                 List<String> ids = collect.stream().map(t -> t.getId()).collect(Collectors.toList());
                 int updateCommodity = commodityMapper.batchUpdateCommodity(commodityCodeEntity, ids);
@@ -383,7 +384,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
                     commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
                 }
-                commodityCodeEntity.setDataSource("4");
 
                 // sdenergyTaxCodeMatchDao.queryByWlflbm(requestBody.get)
                 commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey());
@@ -422,6 +422,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
         if (codeEntityForMatch != null) {
             // 查找原codeEntityR
             BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity);
+            commodityCodeEntity.setEntId("");
             commodityCodeEntity.setXhfNsrsbh("-1");
             commodityCodeEntity.setHsbz("1");
             return;