Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaoqr
2026-06-11 19:53:42 +08:00
parent 2b64c778ff
commit e689f0a35d
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java
+2 -2
View File
@@ -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
+3 -2
View File
@@ -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;
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
+2
View File
@@ -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
+2
View File
@@ -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
+2
View File
@@ -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
+2
View File
@@ -1036,6 +1036,8 @@ public class WebCadOrderImportFactory {
return;
}
// 生成自定义板编号
plateDO.setRoomName(orderBodyDO.getRoomName());
plateDO.setBodyName(orderBodyDO.getName());
generateCustomPlateNo(plateDO, block.getCustBlockNo());
// 更新房间下板件和异形的数量