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-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

webcad拆单更新自定义版编号、房间板件/异形数量置于导入阈值判断后

Browse Source
This commit is contained in:
gaoqr
2025-05-19 17:36:53 +08:00
parent 5e736bd1c6
commit b736ee7456
2 changed files with 10 additions and 9 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/orderImport/factory/WebCadOrderImportAsyncFactory.java
+3 -3
View File
@@ -755,9 +755,6 @@ public class WebCadOrderImportAsyncFactory {
plateDO.setCreateTime(now); plateDO.setCreateTime(now);
plateDO.setUpdateTime(now); plateDO.setUpdateTime(now);
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
//批量保存板件 //批量保存板件
// 达到板件数量阈值，停止入库，更新全局参数停止后续入库 // 达到板件数量阈值，停止入库，更新全局参数停止后续入库
currentPlateNum += 1; currentPlateNum += 1;
@@ -765,6 +762,9 @@ public class WebCadOrderImportAsyncFactory {
plateNumReachThreshold = true; plateNumReachThreshold = true;
return; return;
} }
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
// 更新房间下板件和异形的数量 // 更新房间下板件和异形的数量
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1); orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape)); orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+7 -6
View File
@@ -578,9 +578,6 @@ public class WebCadOrderImportFactory {
// 是否排孔 // 是否排孔
boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0; boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0;
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
// 柜体长宽深 // 柜体长宽深
orderBodyDO.setWidth(block.getCabinetWidth()); orderBodyDO.setWidth(block.getCabinetWidth());
orderBodyDO.setHeight(block.getCabinetHeight()); orderBodyDO.setHeight(block.getCabinetHeight());
@@ -657,9 +654,6 @@ public class WebCadOrderImportFactory {
plateDO.setCreateTime(now); plateDO.setCreateTime(now);
plateDO.setUpdateTime(now); plateDO.setUpdateTime(now);
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
//批量保存板件 //批量保存板件
// 达到板件数量阈值，停止入库，更新全局参数停止后续入库 // 达到板件数量阈值，停止入库，更新全局参数停止后续入库
currentPlateNum += 1; currentPlateNum += 1;
@@ -667,6 +661,13 @@ public class WebCadOrderImportFactory {
plateNumReachThreshold = true; plateNumReachThreshold = true;
return; return;
} }
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
// 更新房间下板件和异形的数量
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
plateDOS.add(plateDO); plateDOS.add(plateDO);
orderPlateBatchInsertWithinThreshold(plateDOS, false); orderPlateBatchInsertWithinThreshold(plateDOS, false);