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 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

测试获取优化算法接口，初步定义获取优化数据cfdata

Browse Source
This commit is contained in:
yangsb
2024-03-21 17:40:49 +08:00
parent 872b8ac3c3
commit cbe9c63ab1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java
+8 -1
View File
@@ -62,10 +62,17 @@ public class OptimizePlanController {
} }
@GetMapping("/getOptimizeParam") @GetMapping("/getOptimizeParam")
@Operation(summary = "获取优化算法参数 (未完成)") @Operation(summary = "获取优化算法参数")
@PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
public CommonResult<OptimizeParamResVO> getOptimizeParam(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) { public CommonResult<OptimizeParamResVO> getOptimizeParam(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) {
return CommonResult.success(optimizePlanService.getOptimizeParam(planId)); return CommonResult.success(optimizePlanService.getOptimizeParam(planId));
} }
@GetMapping("/getCfData")
@Operation(summary = "获取cfData")
@PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
public CommonResult<OptimizeParamResVO> getCfData(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) {
return CommonResult.success(optimizePlanService.getCfData(planId));
}
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+2 -1
View File
@@ -182,7 +182,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
.select(GoodsDO::getId ,GoodsDO::getWidth, GoodsDO::getHeight) .select(GoodsDO::getId ,GoodsDO::getWidth, GoodsDO::getHeight)
.leftJoin(PlateDO.class, PlateDO::getGoodsId, GoodsDO::getGoodsId) .leftJoin(PlateDO.class, PlateDO::getGoodsId, GoodsDO::getGoodsId)
.leftJoin(OrderItemDO.class, OrderItemDO::getPlanId, PlateDO::getPlateNo) .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); GoodsDO goodsDO = goodsMapper.selectJoinOne(GoodsDO.class, wrapper);
rawSizes.add(OptimizeParamResVO.RawSize.builder() rawSizes.add(OptimizeParamResVO.RawSize.builder()