Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -428,12 +428,38 @@ public class CommodityController {
 
             String prefix = "第" + (1 + num) + "行,";
             num++;
+            if (StringUtils.isBlank(commodityExcel.getXhfNsrsbh())){
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL6));
+                continue;
+            }
+            if (StringUtils.isBlank(commodityExcel.getXhfMc())){
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL7));
+                continue;
+            }
+            if (StringUtils.isBlank(commodityExcel.getXmmc())){
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL8));
+                continue;
+            }
+            if (StringUtils.isBlank(commodityExcel.getSpbm())){
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL9));
+                continue;
+            }
+            if (StringUtils.isBlank(commodityExcel.getHsbz())){
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL10));
+                continue;
+            }
 
             if (StringUtils.isNotBlank(commodityExcel.getXhfNsrsbh()) && !taxpayerCodeList.contains(commodityExcel.getXhfNsrsbh())) {
-                resultMap.add(CheckParamUtil.generateErrorMap("", prefix,
-                        OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL4));
+                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL4));
                 continue;
             }
+            if (StringUtils.isNotBlank(commodityExcel.getXhfMc())) {
+                DeptEntity deptEntity = userInfoService.querySysDeptEntityByTaxplayercode(commodityExcel.getXhfNsrsbh());
+                if(!commodityExcel.getXhfMc().equals(deptEntity.getName())){
+                    resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL5));
+                    continue;
+                }
+            }
 
         }
 

order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java

@@ -2284,6 +2284,12 @@ public enum OrderInfoContentEnum {
     COMMODITY_MESSAGE_SYNC_NULL2("173994", "商品信息校验不通过"),
     COMMODITY_MESSAGE_SYNC_NULL3("173993", "未查询到当前商品编码对应数据"),
     COMMODITY_MESSAGE_SYNC_NULL4("173993", "当前用户没有该税号权限"),
+    COMMODITY_MESSAGE_SYNC_NULL5("173993", "企业名称与税号不匹配"),
+    COMMODITY_MESSAGE_SYNC_NULL6("173993", "企业名称不能为空"),
+    COMMODITY_MESSAGE_SYNC_NULL7("173993", "企业税号不能为空"),
+    COMMODITY_MESSAGE_SYNC_NULL8("173993", "商品名称不能为空"),
+    COMMODITY_MESSAGE_SYNC_NULL9("173993", "税收编码不能为空"),
+    COMMODITY_MESSAGE_SYNC_NULL10("173993", "含税价标志不能为空"),
     COMMODITY_MESSAGE_SYNC_SPID_ERROR_173001("173001", "商品ID", 1, 50, true, true),
     COMMODITY_MESSAGE_SYNC_SPID_ERROR_1730011("173001", "商品ID", 0, 50, true, false),
     COMMODITY_MESSAGE_SYNC_XHFSBH_ERROR_173002("173002", "销货方纳税人识别号", 6, 20, true, true),

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

@@ -448,11 +448,11 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
         String resp = response.body();
         log.info("[MDM主动同步物料]响应结果：{}", resp);
         if(StringUtils.isBlank(resp)){
-            return R.error("未查询到数据！");
+            return R.error("获取物料信息失败，请检查客户编码是否正确");
         }
         SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class);
         if(baseBO == null || baseBO.getESB() == null || !"S".equals(baseBO.getESB().getRESULT())){
-            return R.error("未查询到数据！");
+            return R.error("获取物料信息失败，请检查客户编码是否正确");
         }
         List<MdmSyncGroupTaxCodeReqBO> mdmGmfxxtbReqBOS = (List<MdmSyncGroupTaxCodeReqBO>) Optional.of(baseBO)
                 .map(SDEnergyMdmBaseBO::getESB)
@@ -469,7 +469,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
 
         AjaxResult syncResult = this.syncMdmGroupTax(mdmGmfxxtbReqBOS, resp);
         if (syncResult.isSuccess()) {
-            return R.ok();
+            return R.ok("获取物料信息成功");
         } else {
             return R.error(syncResult.getMsg());
         }
@@ -536,8 +536,13 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 .execute();
         String resp = response.body();
         log.info("[MDM主动同步客商]响应结果：{}", resp);
-
+        if(StringUtils.isBlank(resp)){
+            return R.error("获取客户信息失败，请检查客户编码是否正确");
+        }
         SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class);
+        if(baseBO == null || baseBO.getESB() == null || !"S".equals(baseBO.getESB().getRESULT())){
+            return R.error("获取客户信息失败，请检查客户编码是否正确");
+        }
         List<MdmGmfxxtbReqBO> mdmGmfxxtbReqBOS = (List<MdmGmfxxtbReqBO>) Optional.of(baseBO)
                 .map(SDEnergyMdmBaseBO::getESB)
                 .map(ESBBO::getDATA)
@@ -553,7 +558,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
 
         AjaxResult syncResult = this.syncBuyerMessage(mdmGmfxxtbReqBOS, resp);
         if (syncResult.isSuccess()) {
-            return R.ok();
+            return R.ok("获取客户信息成功");
         } else {
             return R.error(syncResult.getMsg());
         }