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

cad拆单造型判定修正

Browse Source
This commit is contained in:
gaoqr
2026-06-11 11:20:12 +08:00
parent 8b019a155d
commit 9e191c5730
3 changed files with 10 additions and 11 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/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java
-5
View File
@@ -84,7 +84,6 @@ public class WebCadDataBlockReqVO {
private boolean has2DModel; private boolean has2DModel;
private boolean has3DModel; private boolean has3DModel;
private String boardTypeName; private String boardTypeName;
private boolean isModel;
private boolean isSideModel; private boolean isSideModel;
private boolean hasSide2DModel; private boolean hasSide2DModel;
@@ -106,10 +105,6 @@ public class WebCadDataBlockReqVO {
isSideModel = sideModel; isSideModel = sideModel;
} }
public void setIsModel(boolean model) {
isModel = model;
}
@NoArgsConstructor @NoArgsConstructor
@Data @Data
public static class FrontBackHolesDTO { public static class FrontBackHolesDTO {
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+5 -3
View File
@@ -743,7 +743,9 @@ public class WebCadOrderImportAsyncFactory {
// 是否有侧面二维刀路 // 是否有侧面二维刀路
boolean hasSide2DModel = block.isHasSide2DModel(); boolean hasSide2DModel = block.isHasSide2DModel();
// 是否造型 // 是否造型
boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel(); Integer frontModelCount = block.getFrontModelCount();
Integer backModelCount = block.getBackModelCount();
boolean isModel = frontModelCount > 0 || backModelCount > 0 || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
// 是否排孔 // 是否排孔
Integer frontHoleCount = block.getFrontHoleCount(); Integer frontHoleCount = block.getFrontHoleCount();
Integer backHoleCount = block.getBackHoleCount(); Integer backHoleCount = block.getBackHoleCount();
@@ -810,8 +812,8 @@ public class WebCadOrderImportAsyncFactory {
.frontHoleCount(block.getFrontHoleCount()) .frontHoleCount(block.getFrontHoleCount())
.backHoleCount(block.getBackHoleCount()) .backHoleCount(block.getBackHoleCount())
.sideHoleCount(block.getSideHoleCount()) .sideHoleCount(block.getSideHoleCount())
.frontModelCount(block.getFrontModelCount()) .frontModelCount(frontModelCount)
.backModelCount(block.getBackModelCount()) .backModelCount(backModelCount)
.offsetX(getBigDecimalOrNull(block.getOffsetX())) .offsetX(getBigDecimalOrNull(block.getOffsetX()))
.offsetY(getBigDecimalOrNull(block.getOffsetY())) .offsetY(getBigDecimalOrNull(block.getOffsetY()))
.isArcAcross(getDefaultFalse(block.getIsArcBase())) .isArcAcross(getDefaultFalse(block.getIsArcBase()))
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+5 -3
View File
@@ -937,7 +937,9 @@ public class WebCadOrderImportFactory {
// 是否有侧面二维刀路 // 是否有侧面二维刀路
boolean hasSide2DModel = block.isHasSide2DModel(); boolean hasSide2DModel = block.isHasSide2DModel();
// 是否造型 // 是否造型
boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel(); Integer frontModelCount = block.getFrontModelCount();
Integer backModelCount = block.getBackModelCount();
boolean isModel = frontModelCount > 0 || backModelCount > 0 || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
// 是否排孔 // 是否排孔
Integer frontHoleCount = block.getFrontHoleCount(); Integer frontHoleCount = block.getFrontHoleCount();
Integer backHoleCount = block.getBackHoleCount(); Integer backHoleCount = block.getBackHoleCount();
@@ -1003,8 +1005,8 @@ public class WebCadOrderImportFactory {
.frontHoleCount(block.getFrontHoleCount()) .frontHoleCount(block.getFrontHoleCount())
.backHoleCount(block.getBackHoleCount()) .backHoleCount(block.getBackHoleCount())
.sideHoleCount(block.getSideHoleCount()) .sideHoleCount(block.getSideHoleCount())
.frontModelCount(block.getFrontModelCount()) .frontModelCount(frontModelCount)
.backModelCount(block.getBackModelCount()) .backModelCount(backModelCount)
.offsetX(getBigDecimalOrNull(block.getOffsetX())) .offsetX(getBigDecimalOrNull(block.getOffsetX()))
.offsetY(getBigDecimalOrNull(block.getOffsetY())) .offsetY(getBigDecimalOrNull(block.getOffsetY()))
.isArcAcross(getDefaultFalse(block.getIsArcBase())) .isArcAcross(getDefaultFalse(block.getIsArcBase()))