Merge remote-tracking branch 'origin/release' into release

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

@@ -317,13 +317,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
         CommodityCodeEntity codeEntityForMatch = groupCommodityCodeMapper.queryCommodityCodeByXmmcInChildCompany(xmmc);
         if (codeEntityForMatch != null) {
             // 查找原codeEntity
-            CommodityCodeEntity parentCodeEntity = groupCommodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(codeEntityForMatch.getZxbm(), "-1");
             BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity);
-            if (parentCodeEntity != null) {
-                commodityCodeEntity.setCommodityId(parentCodeEntity.getCommodityId()); // 要把原commodityId维护回去
-                commodityCodeEntity.setId(parentCodeEntity.getId());
-            }
             commodityCodeEntity.setXhfNsrsbh("-1");
+            commodityCodeEntity.setHsbz("1");
             return;
         }
         // 2.　若根据物料名称未匹配到子公司库的税编时，根据物料编码匹配“物料分类编码”库中的税编；
@@ -333,9 +329,14 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(taxCodeMatch.getSsflbm());
             commodityCodeEntity.setSpsm(taxClassCodeEntity.getSm());
             commodityCodeEntity.setSpjm(taxClassCodeEntity.getSpjc());
+            commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
+            commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl());
+            commodityCodeEntity.setHsbz("1");
             commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
-            if (!StringUtils.isBlank(taxClassCodeEntity.getYhzcmc())) {
+            commodityCodeEntity.setYhzcbs("0");
+            if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
                 commodityCodeEntity.setYhzcbs("1");
+                commodityCodeEntity.setZzstsgl(taxClassCodeEntity.getYhzcmc());
             }
             commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
             commodityCodeEntity.setSsflMc(taxCodeMatch.getSsflmc());
@@ -450,7 +451,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             return R.error("未查询到数据！");
         }
         SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class);
-        if(baseBO == null || baseBO.getESB() == null || "S".equals(baseBO.getESB().getRESULT())){
+        if(baseBO == null || baseBO.getESB() == null || !"S".equals(baseBO.getESB().getRESULT())){
             return R.error("未查询到数据！");
         }
         List<MdmSyncGroupTaxCodeReqBO> mdmGmfxxtbReqBOS = (List<MdmSyncGroupTaxCodeReqBO>) Optional.of(baseBO)

order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@@ -151,7 +151,7 @@
     <select id="queryCommodityCodeByXmmcInChildCompany" resultMap="commodityCodeResultMap">
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
-        where cc.merchandise_name = #{xmmc}  limit 1
+        where cc.merchandise_name = #{xmmc}  and cc.xhf_nsrsbh != -1 limit 1
     </select>
 
     <select id="queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId" resultMap="commodityCodeResultMap">