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 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增获取生产单源数据接口

Browse Source
This commit is contained in:
yangsb
2024-04-15 16:19:12 +08:00
parent 38b7e70c5f
commit cc521a4a9f
2 changed files with 13 additions and 8 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
+5 -5
View File
@@ -78,20 +78,20 @@ public class OptimizePlanController {
return CommonResult.success(null); return CommonResult.success(null);
} }
@GetMapping("/getOptimizePlanParam") /* @GetMapping("/getOptimizePlanParam")
@Operation(summary = "获取优化排单参数 (mock)") @Operation(summary = "获取优化排单参数 (mock)")
@PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
@Parameter(name = "planId", description = "排单id", required = false) @Parameter(name = "planId", description = "排单id", required = false)
public CommonResult<OptimizeParamRespVO> getOptimizePlanParam (@RequestParam (required = false) Long planId) { public CommonResult<OptimizeParamRespVO> getOptimizePlanParam (@RequestParam (required = false) Long planId) {
/* OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class); *//* OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class);
return CommonResult.success(data);*/ return CommonResult.success(data);*//*
//todo //todo
OptimizeParamRespVO optimizePlanParam = optimizePlanService.getOptimizePlanParam(planId); OptimizeParamRespVO optimizePlanParam = optimizePlanService.getOptimizePlanParam(planId);
return CommonResult.success(optimizePlanParam); return CommonResult.success(optimizePlanParam);
} }*/
@GetMapping("/getOrderSource") @GetMapping("/getOrderSource")
@Operation(summary = "获取生产单源数据 - mock") @Operation(summary = "获取生产单源数据")
@PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
public CommonResult<OrderSource> getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId, public CommonResult<OrderSource> getOrderSource(@Schema(description = "生产单id") @RequestParam(required = false) Long orderId,
@Schema(description = "排单id") @RequestParam(required = false) Long planId, @Schema(description = "排单id") @RequestParam(required = false) Long planId,
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+8 -3
View File
@@ -275,6 +275,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
@Override @Override
public OrderSource getOrderSource(Long orderId, Long planId, Long machineId) { public OrderSource getOrderSource(Long orderId, Long planId, Long machineId) {
if(!Objects.isNull(orderId) && !Objects.isNull(planId)) {
throw exception(154112,"生产单id与排单id只能传一个");
}
OrderSource orderSource; OrderSource orderSource;
if(!Objects.isNull(orderId)) { if(!Objects.isNull(orderId)) {
orderSource = getOrderSourceByOrderId(orderId); orderSource = getOrderSourceByOrderId(orderId);
@@ -286,7 +289,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
orderSource.setMachineDTO(machineApi.getMachineDetail(machineId).getCheckedData()); orderSource.setMachineDTO(machineApi.getMachineDetail(machineId).getCheckedData());
return orderSource; 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)) { if(Objects.isNull(planDO)) {
throw exception(PLAN_NOT_EXISTS); throw exception(PLAN_NOT_EXISTS);
} }
MPJBaseJoin<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>() MPJLambdaWrapper<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>()
.select(OrderItemDO::getOrderId) .select(OrderItemDO::getOrderId)
.rightJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId) .rightJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId)
.eq(PlanItemDO::getPlanId, planId)
.isNotNull(OrderItemDO::getId); .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<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>().in(GoodsDO::getOrderId, 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)); List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getOrderId, orderIds));