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

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
@@ -755,9 +755,6 @@ public class WebCadOrderImportAsyncFactory {
plateDO.setCreateTime(now);
plateDO.setUpdateTime(now);
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
//批量保存板件
// 达到板件数量阈值,停止入库,更新全局参数停止后续入库
currentPlateNum += 1;
@@ -765,6 +762,9 @@ public class WebCadOrderImportAsyncFactory {
plateNumReachThreshold = true;
return;
}
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
// 更新房间下板件和异形的数量
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
@@ -578,9 +578,6 @@ public class WebCadOrderImportFactory {
// 是否排孔
boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0;
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
// 柜体长宽深
orderBodyDO.setWidth(block.getCabinetWidth());
orderBodyDO.setHeight(block.getCabinetHeight());
@@ -657,9 +654,6 @@ public class WebCadOrderImportFactory {
plateDO.setCreateTime(now);
plateDO.setUpdateTime(now);
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
//批量保存板件
// 达到板件数量阈值,停止入库,更新全局参数停止后续入库
currentPlateNum += 1;
@@ -667,6 +661,13 @@ public class WebCadOrderImportFactory {
plateNumReachThreshold = true;
return;
}
// 生成自定义板编号
generateCustomPlateNo(plateDO, block.getCustBlockNo());
// 更新房间下板件和异形的数量
orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
plateDOS.add(plateDO);
orderPlateBatchInsertWithinThreshold(plateDOS, false);