From f7971c72091631d84fb1dc634077d6c35e45f6b0 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 18 May 2024 10:01:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95-?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf/imes/module/executor/dal/mysql/plan/PlanMapper.java | 7 +++++++ .../imes/module/executor/dal/mysql/plate/PlateMapper.java | 2 +- .../service/optimizeplan/OptimizePlanServiceImpl.java | 4 +++- .../src/main/resources/mapper/plate/PlateMapper.xml | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index 91efe22f7..74d5c02e4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -67,4 +67,11 @@ public interface PlanMapper extends BaseMapperX { OptimizeParamRespVO getOptimizePlanParam(Long planId); + + + default PlanDO selectByOrderId(Long orderId) { + return selectOne(new MPJLambdaWrapperX() + .eqIfPresent(PlanDO::getOrderNos, orderId)); + + } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 7b413c9be..6670139d8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -95,5 +95,5 @@ public interface PlateMapper extends BaseMapperX { List selectPlateDetialList(@Param("orderId") Long orderId); - List selectPlateDetialListByIds(@Param("orderIds") Set orderIds); + List selectPlateDetialListByIds(@Param("orderIds") List orderIds); } \ No newline at end of file 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 5bbe8b170..a76da8f85 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 @@ -304,10 +304,12 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) ); + PlanDO planDO = planMapper.selectByOrderId(orderId); List plateDOS = plateMapper.selectPlateDetialList(orderId); List orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL); + orderSource.setPlan(planDO); orderSource.setOrderList(Collections.singletonList(orderDO)); orderSource.setPlateList(plateDOS); orderSource.setGoodsList(goodsDOS); @@ -330,7 +332,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .eq(PlanItemDO::getPlanId, planId) .isNotNull(OrderItemDO::getId); List orderItemDOS = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper); - Set orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet()); + List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); List orderDOS = orderMapper.selectBatchIds(orderIds); List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX().in(GoodsDO::getOrderId, orderIds)); 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 84254de21..5530064eb 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 @@ -153,7 +153,7 @@ join order_body ob on oi.body_id = ob.id left join order_group og on oi.group_id = og.id where op.order_id in - + #{id} From 70dece2d79928107c0825568ce89ab709f0ca0c4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 18 May 2024 10:48:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95-?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B92.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/optimizeplan/OptimizePlanServiceImpl.java | 2 ++ .../src/main/resources/mapper/plate/PlateMapper.xml | 4 ++++ 2 files changed, 6 insertions(+) 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 a76da8f85..96905b79d 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 @@ -333,7 +333,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .isNotNull(OrderItemDO::getId); List orderItemDOS = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper); List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); + List orderDOS = orderMapper.selectBatchIds(orderIds); + List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX().in(GoodsDO::getOrderId, orderIds)); List plateDOS = plateMapper.selectPlateDetialListByIds(orderIds); 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 5530064eb..aa745972e 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 @@ -152,9 +152,13 @@ join order_item oi on op.id = oi.plate_id join order_body ob on oi.body_id = ob.id left join order_group og on oi.group_id = og.id + where op.order_id in + + #{id} + From 27eea2dd24d125c6f36215ef78a2762545885f15 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 18 May 2024 14:19:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95-?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E5=AD=94=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/PlateDetialRespVO.java | 3 +++ .../service/optimizeplan/OptimizePlanServiceImpl.java | 2 ++ .../src/main/resources/mapper/plate/PlateMapper.xml | 11 +++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java index a1356bb23..e56504579 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java @@ -84,6 +84,9 @@ public class PlateDetialRespVO { @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") private Integer openDoorType; + @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Boolean hasHole; + @Schema(description = "生产单明细ID", requiredMode = Schema.RequiredMode.REQUIRED) private Long itemId; 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 96905b79d..4924e632d 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 @@ -304,7 +304,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) ); + PlanDO planDO = planMapper.selectByOrderId(orderId); + List plateDOS = plateMapper.selectPlateDetialList(orderId); List orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL); 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 aa745972e..9d0730fa2 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 @@ -119,6 +119,7 @@ +