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

1、新增cad拆单支持部件不加工状态判定；2、加工/恢复部件顶级部分加工状态判定处理；

Browse Source
This commit is contained in:
gaoqr
2026-05-29 17:57:59 +08:00
parent a1fbe33063
commit a1b5c12d0a
12 changed files with 875 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/assemblyconfig/dto/AssemblyConfigRespDTO.java
+3
View File
@@ -25,4 +25,7 @@ public class AssemblyConfigRespDTO {
@Schema(description = "结构Json")
private String structureJson;
@Schema(description = "是否不加工")
private Boolean notProcess;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/vo/AssemblyConfigRespVO.java
+3
View File
@@ -30,4 +30,7 @@ public class AssemblyConfigRespVO {
@Schema(description = "结构json")
private String structureJson;
@Schema(description = "是否不加工")
private Boolean notProcess;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java
+1 -1
View File
@@ -513,7 +513,7 @@ public class AssemblyConfigServiceImpl implements AssemblyConfigService {
.eq(AssemblyConfigDO::getStatus, AssemblyConfigStatusEnum.CONFIGURED.getStatus())
.eq(AssemblyConfigDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus())
.eq(AssemblyConfigDO::getNotProcess, true)
.select(AssemblyConfigDO::getComponentName, AssemblyConfigDO::getStructureHash, AssemblyConfigDO::getStructureJson)
.select(AssemblyConfigDO::getComponentName, AssemblyConfigDO::getStructureHash, AssemblyConfigDO::getStructureJson, AssemblyConfigDO::getNotProcess)
);
return BeanUtil.copyToList(assemblyConfigDOS, AssemblyConfigRespVO.class);