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

Revert "cad拆单造型判定修正"

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