diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 14b0b29c9..d26b46a31 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -43,6 +43,16 @@ public class ProOrderWorkorderController extends BaseController { @Autowired private IProWetMaterialPlanDetailService proWetMaterialPlanDetailService; + /** + * 通过子工单code查询并返回所有级联工单 + * @param code + * @return + */ + @GetMapping("/getWorkOrders/{code}") + public AjaxResult getWorkOrders(@PathVariable("code") String code) { + return proOrderWorkorderService.getWorkOrders(code); + } + /** * 校验工单是否可以修改 * 如果工单已生成湿料计划则不允许修改 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 8edf5ecee..f96b5a8b2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -109,4 +109,10 @@ public interface IProOrderWorkorderService { */ public List selectProOrderWorkorderByWorkIds(String[] workerIds); + /** + * 通过子工单id查询并返回所有级联工单 + * @param code + * @return + */ + AjaxResult getWorkOrders(String code); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index ad2555ae5..ed725c1a3 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -528,6 +528,31 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return proOrderWorkorderMapper.selectProOrderWorkerderByWorkerIds(workerIds); } + /** + * 通过子工单code查询并返回所有级联工单 + * @param code + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getWorkOrders(String code) { + // 创建返回工单列表 + List proOrderWorkorderList = new ArrayList(); + // 查询该工单信息 + ProOrderWorkorder proOrderWorkorder = proOrderWorkorderMapper.selectWorkOrderByCode(code); + boolean flag = true; + while (flag) { + proOrderWorkorderList.add(proOrderWorkorder); + ProOrderWorkorder workorder = proOrderWorkorderMapper.selectWorkOrderByCode(proOrderWorkorder.getParentOrder()); + if (workorder != null) { + BeanUtils.copyProperties(workorder,proOrderWorkorder); + } else { + flag = false; + } + } + return success(proOrderWorkorderList); + } + /** * 格式化工单信息(递归处理) *