From cbe9c63ab192cf75c1310108773c13c01eadd550 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 21 Mar 2024 17:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=8E=B7=E5=8F=96=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=AE=97=E6=B3=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E5=AE=9A=E4=B9=89=E8=8E=B7=E5=8F=96=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AEcfdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/OptimizePlanController.java | 9 ++++++++- .../service/optimizeplan/OptimizePlanServiceImpl.java | 3 ++- 2 files changed, 10 insertions(+), 2 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 370f2398c..ee2b8ff11 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 @@ -62,10 +62,17 @@ public class OptimizePlanController { } @GetMapping("/getOptimizeParam") - @Operation(summary = "获取优化算法参数 (未完成)") + @Operation(summary = "获取优化算法参数") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") public CommonResult getOptimizeParam(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) { return CommonResult.success(optimizePlanService.getOptimizeParam(planId)); } + @GetMapping("/getCfData") + @Operation(summary = "获取cfData") + @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") + public CommonResult getCfData(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) { + return CommonResult.success(optimizePlanService.getCfData(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 929820dd7..46dec29a6 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 @@ -182,7 +182,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .select(GoodsDO::getId ,GoodsDO::getWidth, GoodsDO::getHeight) .leftJoin(PlateDO.class, PlateDO::getGoodsId, GoodsDO::getGoodsId) .leftJoin(OrderItemDO.class, OrderItemDO::getPlanId, PlateDO::getPlateNo) - .leftJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId); + .leftJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId) + .eq(PlanItemDO::getPlanId, planId); GoodsDO goodsDO = goodsMapper.selectJoinOne(GoodsDO.class, wrapper); rawSizes.add(OptimizeParamResVO.RawSize.builder()