feature 1.物料分类编码校验税收分类编码的有效性

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/TaxClassCodeService.java

@@ -28,6 +28,7 @@ public interface TaxClassCodeService {
      * @return
      */
     TaxClassCodeEntity queryTaxClassCodeFromCache(String spbm);
+    TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm);
 
     /**
      * 查询所有商品税编

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java

@@ -73,6 +73,11 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService {
         return taxClassCodeEntity;
     }
 
+    @Override
+    public TaxClassCodeEntity queryTaxClassCodeEntityBySpbm(String spbm) {
+        return taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(spbm);
+    }
+
     @Override
     public List<TaxClassCodeEntity> queryAllTaxClassCode() {
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dxhy.base.file.common.ExcelReadContext;
 import com.dxhy.base.file.exception.ExcelReadException;
 import com.dxhy.base.file.handle.ExcelReadHandle;
+import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
+import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService;
 import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum;
 import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
 import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO;
@@ -46,6 +48,8 @@ public class SdenergyTaxCodeMatchController {
      */
     @Resource
     private SdenergyTaxCodeMatchService sdenergyTaxCodeMatchService;
+    @Resource
+    private TaxClassCodeService taxClassCodeService;
 
     /**
      * 通过主键查询单条数据
@@ -163,13 +167,16 @@ public class SdenergyTaxCodeMatchController {
             if(StringUtils.isBlank(ssflbm)){
                 errorMsgList.add("第" + resultIndex + "行，税收分类编码不能为空");
                 continue;
-            }
+            }else {
-            String ssflmc = taxCodeMatch.getSsflmc();
+                TaxClassCodeEntity entity = taxClassCodeService.queryTaxClassCodeEntityBySpbm(ssflbm);
-            if(StringUtils.isBlank(ssflmc)){
+                if(entity != null){
-                errorMsgList.add("第" + resultIndex + "行，税收分类名称不能为空");
+                    taxCodeMatch.setSsflmc(entity.getSpjc());
+                }else {
+                    errorMsgList.add("第" + resultIndex + "行，税收分类编码有误");
                     continue;
                 }
             }
+        }
         if (ObjectUtil.isNotEmpty(errorMsgList)) {
             return R.error(errorMsgList);
         }