fix: 批量导入补全问题修复

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

@@ -27,11 +27,11 @@ public enum DownloadExcelEnum {
     EXCEL_JDC("JdcImportExcel.xlsx", "机动车销售统一发票订单导入模板"),
     EXCEL_ESC("EscImportExcel.xlsx", "二手车销售统一发票订单导入模板"),
     EXCEL_DICTIONARY("DictionaryExcel.xlsx", "字典表导入模板"),
-    EXCEL_ORDER("OrderExcel.xlsx", "订单导入模板"),
+    EXCEL_ORDER("OrderExcel.xlsx", "结算单导入模板"),
     EXCEL_INVOICE_COUNT("InvoiceCountExcel.xlsx", "批量下架模板"),
     EXCEL_VEHICLE_CODE("VehiclesCodeExcel.xlsx", "车辆税编模板"),
     EXCEL_HZXXB("SpecialInvoiceReversalsExcel.xlsx", "红字信息表模板"),
-    EXCEL_QDFP("QdfpImportExcel.xlsx", "全电发票订单导入模板"),
+    EXCEL_QDFP("QdfpImportExcel.xlsx", "全电发票导入模板"),
     EXCEL_TAX_CODE_MATCH("SdenergyTaxCodeMatch.xlsx", "物料分类编码表");
 
     /**

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

@@ -263,7 +263,8 @@ public class ReceiveOrderController {
             @ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh,
             @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc,
             @ApiParam(name = "entId", value = "数据组织Id", required = false) @RequestParam(value = "entId", required = false) String entId,
-            @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId") String userId) {
+            @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId") String userId,
+            @ApiParam(name = "gsdm", value = "组织编码", required = true) @RequestParam(value = "gsdm") String gsdm) {
         //导入的明细条数
         int count = 0;
         try {
@@ -372,6 +373,7 @@ public class ReceiveOrderController {
             long t5 = System.currentTimeMillis();
             log.debug("excel转换开始,当前时间{}", t5);
             List<CommonOrderInfo> orderExcel2OrderInfo = orderExcelReadService.excelToOrderInfo(orderExcelMap, paramMap,terminalCode);
+            orderExcel2OrderInfo.stream().forEach(f -> {f.getOrderInfo().setGsdm(gsdm);});
             long t6 = System.currentTimeMillis();
             log.debug("excel转换结束,当前时间{},耗时:{}", t6, t6 - t5);
             // 将数据插入数据库\

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java

@@ -643,6 +643,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder
                 OrderProcessInfo orderProcessInfoY = orderProcessInfoMapper.selectOrderProcessInfoByProcessId(orderInvoiceInfoY.getOrderProcessInfoId(), null);
                 orderProcessInfo.setGsdm(orderProcessInfoY.getGsdm());
             }
+            if(StrUtil.isBlank(orderProcessInfo.getGsdm())){
+                orderProcessInfo.setGsdm(orderInfo.getGsdm());
+            }
 
 
             //原始订单到最终订单的关系

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java

@@ -1893,7 +1893,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
             }
             commonInterfaceService.dealOrderItem(orderExcel2CommonOrderInfo.getOrderItemInfo(), paramMap.get("xhfNsrsbh"),
                     orderExcel2CommonOrderInfo.getOrderInfo().getQdBz(), orderExcel2CommonOrderInfo.getOrderInfo().getFpzlDm(),
-                    terminalCode, "");
+                    terminalCode, "",paramMap.get("entId"));
             // 补齐开票项目
             orderExcel2CommonOrderInfo.getOrderInfo().setKpxm(orderExcel2CommonOrderInfo.getOrderItemInfo().get(0).getXmmc());
             //数据价税分离

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

@@ -94,7 +94,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
     @Resource
     private BaseServiceConfig baseServiceConfig;
 
-    @Autowired
+    @Resource
     private GroupCommodityCodeMapper commodityCodeMapper;
 
     @Resource
@@ -519,6 +519,12 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
         StringBuilder errorStr = new StringBuilder();
         for (int i = 0; i < orderItemInfo.size(); i++) {
             OrderItemInfo item = orderItemInfo.get(i);
+            if(StrUtil.isNotBlank(item.getSpbm())){
+                item.setZnfm(ConfigureConstant.STRING_0);
+                item.setTswl(ConfigureConstant.STRING_0);
+                log.info("{},第{}行税编:{}不为空,不进行补全",LOGGER_MSG,i+1,item.getSpbm());
+                continue;
+            }
             //rowIndex excel导入时为行坐标，其他业务时为明细行在集合中的索引值
             String indexStr = StringUtils.isBlank(item.getRowIndex()) ? String.valueOf(i + 1) : item.getRowIndex();
             //如果是清单红字发票的话,不进行明细行补全