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

webcad导入排孔空异常处理

Browse Source
This commit is contained in:
gaoqr
2025-12-17 17:14:02 +08:00
parent 89cc926634
commit fc188bd209
2 changed files with 8 additions and 2 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
+4 -1
View File
@@ -770,7 +770,10 @@ public class WebCadOrderImportAsyncFactory {
// 是否造型 // 是否造型
boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel(); boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
// 是否排孔 // 是否排孔
boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0; Integer frontHoleCount = block.getFrontHoleCount();
Integer backHoleCount = block.getBackHoleCount();
boolean isRawHole = ((frontHoleCount != null ? frontHoleCount : 0) + (backHoleCount != null ? backHoleCount : 0)) > 0;
// 柜体长宽深 // 柜体长宽深
orderBodyDO.setWidth(block.getCabinetWidth()); orderBodyDO.setWidth(block.getCabinetWidth());
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+4 -1
View File
@@ -626,7 +626,10 @@ public class WebCadOrderImportFactory {
// 是否造型 // 是否造型
boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel(); boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
// 是否排孔 // 是否排孔
boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0; Integer frontHoleCount = block.getFrontHoleCount();
Integer backHoleCount = block.getBackHoleCount();
boolean isRawHole = ((frontHoleCount != null ? frontHoleCount : 0) + (backHoleCount != null ? backHoleCount : 0)) > 0;
Double area = block.getArea(); Double area = block.getArea();
// 柜体长宽深 // 柜体长宽深