From 81aa5fe1fbef4c73c4b3f69383a69771808c0668 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 12 Jun 2025 17:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E5=8D=95=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=92=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96=EF=BC=9A1=E3=80=81=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E5=89=8D=E7=AB=AF=E6=97=A0=E7=94=A8=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E7=BB=84=E5=AD=97=E6=AE=B5=EF=BC=9B2=E3=80=81=E6=81=A2?= =?UTF-8?q?=E5=A4=8Dsql=E7=BB=93=E6=9E=9C=E9=9B=86=E4=B8=AD=E7=9A=84groupI?= =?UTF-8?q?d=EF=BC=9B3=E3=80=81cad=E6=8B=86=E5=8D=95order=5Fitem=E6=94=AF?= =?UTF-8?q?=E6=8C=81group=5Fid=E4=B8=BA=E7=A9=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../optimizeplan/OptimizePlanServiceImpl.java | 17 +---------------- .../main/resources/mapper/plate/PlateMapper.xml | 4 ++-- .../factory/WebCadOrderImportAsyncFactory.java | 10 ++++++---- .../factory/WebCadOrderImportFactory.java | 10 ++++++---- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 94324de87..21da45258 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -788,21 +788,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_ERROR); - for (PlateDetailRespVO plateDetailsRespVO : plateDetailRespVOS) { - StringBuilder name = new StringBuilder(); - if (CollUtil.isNotEmpty(plateDetailsRespVO.getProcessGroupLists())) { - for (ProcessGroupList groupNameList : plateDetailsRespVO.getProcessGroupLists()) { - // 去除最后的逗号 - name.append(groupNameList.getGroupName()).append(","); - - } - name = new StringBuilder(name.substring(0, name.length() - 1)); - } - - plateDetailsRespVO.setProcessGroupName(name.toString()); - } - - // todo 数据结构改后，可以增加排单ID作为筛选，只查为 0 的 List orderModelDOS = getOrderModels(orderIds); @@ -853,7 +838,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { )) .source(s -> s .filter(f -> f - .includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id") + .includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id", "plateId") ) ) .trackTotalHits(t -> t.enabled(false)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 01ecae3f1..0fa136e89 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -459,7 +459,7 @@ select distinct - + oi.group_id as groupId, og.name as groupName, ogs.goods_id as plateGoodsId, ogs.goods_name as goodsName, @@ -498,7 +498,7 @@ from order_plate op join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id - left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id + left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id and oi.plate_id != 0 left join order_group og on oi.organ_id = og.organ_id and oi.order_id = og.order_id and oi.group_id = og.id left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id where op.organ_id = #{organId} diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index e61f33044..b88393581 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -72,6 +72,7 @@ import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; +import java.sql.Types; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -858,7 +859,6 @@ public class WebCadOrderImportAsyncFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .plateId(plateId) .packageId(0L) .partsId(0L) @@ -1496,7 +1496,6 @@ public class WebCadOrderImportAsyncFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .partsId(part.getImesPartsId()) .packageId(0L) .plateId(0L) @@ -1513,7 +1512,6 @@ public class WebCadOrderImportAsyncFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .partsId(part.getImesPartsId()) .packageId(0L) .plateId(0L) @@ -1839,7 +1837,11 @@ public class WebCadOrderImportAsyncFactory { ps.setLong(4, item.getRoomId()); ps.setLong(5, item.getBodyId()); ps.setLong(6, item.getPackageId()); - ps.setLong(7, item.getGroupId()); + if (item.getGroupId() != null) { + ps.setLong(7, item.getGroupId()); + } else { + ps.setNull(7, Types.BIGINT); + } ps.setLong(8, item.getPlateId()); ps.setLong(9, item.getPartsId()); ps.setDouble(10, item.getNum()); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 2d1abd956..45959636c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -62,6 +62,7 @@ import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; +import java.sql.Types; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -1178,7 +1179,6 @@ public class WebCadOrderImportFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .plateId(plateId) .packageId(0L) .partsId(0L) @@ -1385,7 +1385,6 @@ public class WebCadOrderImportFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .partsId(part.getImesPartsId()) .packageId(0L) .plateId(0L) @@ -1402,7 +1401,6 @@ public class WebCadOrderImportFactory { .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId) .bodyId(bodyId) - .groupId(0L) .partsId(part.getImesPartsId()) .packageId(0L) .plateId(0L) @@ -1728,7 +1726,11 @@ public class WebCadOrderImportFactory { ps.setLong(4, item.getRoomId()); ps.setLong(5, item.getBodyId()); ps.setLong(6, item.getPackageId()); - ps.setLong(7, item.getGroupId()); + if (item.getGroupId() != null) { + ps.setLong(7, item.getGroupId()); + } else { + ps.setNull(7, Types.BIGINT); + } ps.setLong(8, item.getPlateId()); ps.setLong(9, item.getPartsId()); ps.setDouble(10, item.getNum());