mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
webcad拆单更新自定义版编号、房间板件/异形数量置于导入阈值判断后
This commit is contained in:
+3
-3
@@ -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));
|
||||
|
||||
+7
-6
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user