diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java index 69dd8f717..3ac3ff648 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java +++ b/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().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO)))); + // 已有订单更新序号 + orderMapper.update(new LambdaUpdateWrapper().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO)))); // } // 机构下序号配置同步 CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO(); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java index 8df2f5647..a20bcb6f7 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java +++ b/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()); - JsonParser parser = factory.createParser(gzipInputStream)) { + try ( +// GZIPInputStream gzipInputStream = new GZIPInputStream(); + JsonParser parser = factory.createParser(file.getInputStream())) { factory.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE); int plateCount = 0; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java index d8e54fd82..974c7ff91 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java +++ b/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() diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java index c7c76cb61..942a25389 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java +++ b/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() diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index e158e14f9..f8930c854 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/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()); // 更新房间下板件和异形的数量 diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 8dfc80e60..85a5be197 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/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()); // 更新房间下板件和异形的数量