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-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

webcad拆单补充加工组类型id

Browse Source
This commit is contained in:
gaoqr
2026-06-29 16:16:46 +08:00
parent e9191e8fb2
commit 69a1bd3e89
3 changed files with 9 additions and 4 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/WebCadDataGroupInfoReqVO.java
+1
View File
@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
@Data @Data
public class WebCadDataGroupInfoReqVO { public class WebCadDataGroupInfoReqVO {
private String groupTypeName; private String groupTypeName;
private Long groupTypeId;
private String groupName; private String groupName;
private Double width; private Double width;
private Double height; private Double height;
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+4 -2
View File
@@ -527,6 +527,7 @@ public class WebCadOrderImportAsyncFactory {
while (reader.hasNext()) { while (reader.hasNext()) {
WebCadDataProcessGroupReqVO processGroup = reader.readObject(WebCadDataProcessGroupReqVO.class); WebCadDataProcessGroupReqVO processGroup = reader.readObject(WebCadDataProcessGroupReqVO.class);
String groupTypeName = processGroup.getType(); String groupTypeName = processGroup.getType();
Long groupTypeId = (Long) snowFlakeGenerator.nextId(null);
List<WebCadDataProcessGroupReqVO.ProjectsDTO> projects = processGroup.getProjects(); List<WebCadDataProcessGroupReqVO.ProjectsDTO> projects = processGroup.getProjects();
if (CollUtil.isNotEmpty(projects)) { if (CollUtil.isNotEmpty(projects)) {
for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) { for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) {
@@ -534,6 +535,7 @@ public class WebCadOrderImportAsyncFactory {
WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO(); WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO();
processGroupInfo.setGroupName(project.getProjName()); processGroupInfo.setGroupName(project.getProjName());
processGroupInfo.setGroupTypeName(groupTypeName); processGroupInfo.setGroupTypeName(groupTypeName);
processGroupInfo.setGroupTypeId(groupTypeId);
processGroupInfo.setHeight(project.getBoxSize().getHeight()); processGroupInfo.setHeight(project.getBoxSize().getHeight());
processGroupInfo.setWidth(project.getBoxSize().getWidth()); processGroupInfo.setWidth(project.getBoxSize().getWidth());
processGroupInfo.setDepth(project.getBoxSize().getDepth()); processGroupInfo.setDepth(project.getBoxSize().getDepth());
@@ -904,7 +906,7 @@ public class WebCadOrderImportAsyncFactory {
.organId(organId) .organId(organId)
.orderId(orderId) .orderId(orderId)
.bodyId(bodyId) .bodyId(bodyId)
.groupTypeId((Long) snowFlakeGenerator.nextId(null)) .groupTypeId(groupInfo.getGroupTypeId())
.groupTypeName(groupInfo.getGroupTypeName()) .groupTypeName(groupInfo.getGroupTypeName())
.name(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName())
.width(groupInfo.getWidth()) .width(groupInfo.getWidth())
@@ -1554,7 +1556,7 @@ public class WebCadOrderImportAsyncFactory {
.organId(organId) .organId(organId)
.orderId(orderId) .orderId(orderId)
.bodyId(bodyId) .bodyId(bodyId)
.groupTypeId((Long) snowFlakeGenerator.nextId(null)) .groupTypeId(groupInfo.getGroupTypeId())
.groupTypeName(groupInfo.getGroupTypeName()) .groupTypeName(groupInfo.getGroupTypeName())
.name(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName())
.width(groupInfo.getWidth()) .width(groupInfo.getWidth())
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+4 -2
View File
@@ -452,6 +452,7 @@ public class WebCadOrderImportFactory {
if (CollUtil.isNotEmpty(processGroupList)) { if (CollUtil.isNotEmpty(processGroupList)) {
for (WebCadDataProcessGroupReqVO processGroup : processGroupList) { for (WebCadDataProcessGroupReqVO processGroup : processGroupList) {
String groupTypeName = processGroup.getType(); String groupTypeName = processGroup.getType();
Long groupTypeId = (Long) snowFlakeGenerator.nextId(null);
List<WebCadDataProcessGroupReqVO.ProjectsDTO> projects = processGroup.getProjects(); List<WebCadDataProcessGroupReqVO.ProjectsDTO> projects = processGroup.getProjects();
if (CollUtil.isNotEmpty(projects)) { if (CollUtil.isNotEmpty(projects)) {
for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) { for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) {
@@ -459,6 +460,7 @@ public class WebCadOrderImportFactory {
WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO(); WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO();
processGroupInfo.setGroupName(project.getProjName()); processGroupInfo.setGroupName(project.getProjName());
processGroupInfo.setGroupTypeName(groupTypeName); processGroupInfo.setGroupTypeName(groupTypeName);
processGroupInfo.setGroupTypeId(groupTypeId);
processGroupInfo.setHeight(project.getBoxSize().getHeight()); processGroupInfo.setHeight(project.getBoxSize().getHeight());
processGroupInfo.setWidth(project.getBoxSize().getWidth()); processGroupInfo.setWidth(project.getBoxSize().getWidth());
processGroupInfo.setDepth(project.getBoxSize().getDepth()); processGroupInfo.setDepth(project.getBoxSize().getDepth());
@@ -1514,7 +1516,7 @@ public class WebCadOrderImportFactory {
.organId(organId) .organId(organId)
.orderId(orderId) .orderId(orderId)
.bodyId(bodyId) .bodyId(bodyId)
.groupTypeId((Long) snowFlakeGenerator.nextId(null)) .groupTypeId(groupInfo.getGroupTypeId())
.groupTypeName(groupInfo.getGroupTypeName()) .groupTypeName(groupInfo.getGroupTypeName())
.name(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName())
.width(groupInfo.getWidth()) .width(groupInfo.getWidth())
@@ -1740,7 +1742,7 @@ public class WebCadOrderImportFactory {
.organId(organId) .organId(organId)
.orderId(orderId) .orderId(orderId)
.bodyId(bodyId) .bodyId(bodyId)
.groupTypeId((Long) snowFlakeGenerator.nextId(null)) .groupTypeId(groupInfo.getGroupTypeId())
.groupTypeName(groupInfo.getGroupTypeName()) .groupTypeName(groupInfo.getGroupTypeName())
.name(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName())
.width(groupInfo.getWidth()) .width(groupInfo.getWidth())