From cc521a4a9f3ff5fc3e1e002fa7b89c6efa7e785d Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 15 Apr 2024 16:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=8D=95=E6=BA=90=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/OptimizePlanController.java | 10 +++++-----
 .../service/optimizeplan/OptimizePlanServiceImpl.java | 11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java
index 1af72516a..f6bf3ceb6 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java
@@ -78,20 +78,20 @@ public class OptimizePlanController {
         return CommonResult.success(null);
     }
 
-    @GetMapping("/getOptimizePlanParam")
+/*    @GetMapping("/getOptimizePlanParam")
     @Operation(summary = "获取优化排单参数 (mock)")
     @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
     @Parameter(name = "planId", description = "排单id", required = false)
     public CommonResult<OptimizeParamRespVO> getOptimizePlanParam (@RequestParam (required = false) Long planId) {
-       /* OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class);
-        return CommonResult.success(data);*/
+       *//* OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class);
+        return CommonResult.success(data);*//*
         //todo
         OptimizeParamRespVO optimizePlanParam = optimizePlanService.getOptimizePlanParam(planId);
         return CommonResult.success(optimizePlanParam);
-    }
+    }*/
 
     @GetMapping("/getOrderSource")
-    @Operation(summary = "获取生产单源数据 - mock")
+    @Operation(summary = "获取生产单源数据")
     @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
     public CommonResult<OrderSource> getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId,
                                                     @Schema(description = "排单id") @RequestParam(required = false) Long planId,
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 6eeebee1d..bf5c10ed4 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
@@ -275,6 +275,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
     @Override
     public OrderSource getOrderSource(Long orderId, Long planId, Long machineId) {
+        if(!Objects.isNull(orderId) && !Objects.isNull(planId)) {
+            throw exception(154112,"生产单id与排单id只能传一个");
+        }
         OrderSource orderSource;
         if(!Objects.isNull(orderId)) {
             orderSource = getOrderSourceByOrderId(orderId);
@@ -286,7 +289,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
             orderSource.setMachineDTO(machineApi.getMachineDetail(machineId).getCheckedData());
             return orderSource;
         }
-        throw exception(154112,"生产单id或排单id不能空");
+        throw exception(154112,"生产单id或排单id不能都空");
 
     }
 
@@ -321,11 +324,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         if(Objects.isNull(planDO)) {
             throw exception(PLAN_NOT_EXISTS);
         }
-        MPJBaseJoin<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>()
+        MPJLambdaWrapper<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>()
                 .select(OrderItemDO::getOrderId)
                 .rightJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId)
+                .eq(PlanItemDO::getPlanId, planId)
                 .isNotNull(OrderItemDO::getId);
-        Set<Long> orderIds = orderItemMapper.selectJoinList(OrderDO.class, wrapper).stream().map(OrganBaseDO::getOrganId).collect(Collectors.toSet());
+        List<OrderItemDO> orderItemDOS = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper);
+        Set<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet());
         List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
         List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>().in(GoodsDO::getOrderId, orderIds));
         List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getOrderId, orderIds));