自定义板编号 excel异步/xml异步/webcad同异步 导入订单拆单 房间柜体序号失效、订单序号配置失效修复

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java

@@ -93,8 +93,8 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe
         orderDO.setCustomPlatenoSeq(JSON.toJSONString(orderCustomPlateNoSeqVO));
         orderDO.setCustomPlatenoConfigId(orgCustomPlateNoConfigId);
 //        } else {
-//            // 已有订单更新序号
+        // 已有订单更新序号
-//            orderMapper.update(new LambdaUpdateWrapper<OrderDO>().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO))));
+        orderMapper.update(new LambdaUpdateWrapper<OrderDO>().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO))));
 //        }
         // 机构下序号配置同步
         CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO();

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java

@@ -135,8 +135,9 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService {
         JsonFactory factory = new JsonFactory();
 
         Long cadViewFileId;
-        try (GZIPInputStream gzipInputStream = new GZIPInputStream(file.getInputStream());
+        try (
-             JsonParser parser = factory.createParser(gzipInputStream)) {
+//                GZIPInputStream gzipInputStream = new GZIPInputStream();
+             JsonParser parser = factory.createParser(file.getInputStream())) {
             factory.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
 
             int plateCount = 0;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java

@@ -744,6 +744,8 @@ public class DefaultExcelOrderImportFactory {
                     currentPlateArea = currentPlateArea.add(tempDataDO.getArea());
 
                     // 生成自定义板编号
+                    plateDO.setRoomName(roomName);
+                    plateDO.setBodyName(bodyName);
                     generateCustomPlateNo(plateDO);
 
                     OrderItemDO orderItemDO = OrderItemDO.builder()

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java

@@ -571,6 +571,8 @@ public class DefaultXmlOrderImportFactory {
                         currentPlateArea = currentPlateArea.add(plateDO.getArea());
 
                         // 生成自定义板编号
+                        plateDO.setRoomName(roomCode);
+                        plateDO.setBodyName(bodyCode);
                         generateCustomPlateNo(plateDO);
 
                         OrderItemDO orderItemDO = OrderItemDO.builder()

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java

@@ -843,6 +843,8 @@ public class WebCadOrderImportAsyncFactory {
             return;
         }
         // 生成自定义板编号
+        plateDO.setRoomName(orderBodyDO.getRoomName());
+        plateDO.setBodyName(orderBodyDO.getName());
         generateCustomPlateNo(plateDO, block.getCustBlockNo());
 
         // 更新房间下板件和异形的数量

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java

@@ -1036,6 +1036,8 @@ public class WebCadOrderImportFactory {
             return;
         }
         // 生成自定义板编号
+        plateDO.setRoomName(orderBodyDO.getRoomName());
+        plateDO.setBodyName(orderBodyDO.getName());
         generateCustomPlateNo(plateDO, block.getCustBlockNo());
 
         // 更新房间下板件和异形的数量