diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java index eafe9b6b9..000ea5608 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java @@ -308,6 +308,9 @@ public class PlanController { planDO.setStatus(PlanStatusEnum.已入库.getValue()); planService.createPlanStockIn(statusUpdateVO, planDO); } + else if ("commence".equals(statusUpdateVO.getCode())) { + planDO.setStatus(PlanStatusEnum.已开工.getValue()); + } planMapper.updateById(planDO); return success(true); } @@ -387,7 +390,14 @@ public class PlanController { List proList = planService.getPlanByStatus(statusList); List planRespVOList = planService.buildVOList(proList); return success(planRespVOList); - } else { + }else if(status ==8){ + List statusList = new ArrayList<>(); + statusList.add(PlanStatusEnum.已开工.getValue()); + List proList = planService.getPlanByStatus(statusList); + List planRespVOList = planService.buildVOList(proList); + return success(planRespVOList); + } + else { return success(Collections.emptyList()); } } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanStatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanStatusEnum.java index a2216c650..97d3de60a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanStatusEnum.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanStatusEnum.java @@ -14,7 +14,8 @@ public enum PlanStatusEnum { 完工(4), 已入库(5), 试产 (6), - 待入库(7); + 待入库(7), + 已开工(8); private final int value; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java index 91265f802..e4c6ebcea 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java @@ -99,4 +99,9 @@ public class ZjTaskRespVO { @ExcelProperty("取消原因") private String cancelReason; + + @Schema(description = "工单类型1-生产过程 2-产品入库") + private Integer ticketType; + + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java index cb4b55516..9431514f5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java @@ -68,4 +68,7 @@ public class ZjTaskSaveReqVO { @Schema(description = "取消原因") private String cancelReason; + @Schema(description = "工单类型 1-生产过程 2-产品入库") + private Integer ticketType; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java index 3ef2681fc..27409345e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java @@ -96,5 +96,10 @@ public class ZjTaskDO extends BaseDO { * 取消原因 */ private String cancelReason; + /** + * 工单类型 + */ + private Integer ticketType; + } \ No newline at end of file