diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index b9d94a0..cf4df93 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -711,7 +711,11 @@ public class DailyPlanController { dailyPlanService.closeSchedule(inData); return R.ok(); } - + @PostMapping("/openSchedule") + public R openSchedule(@RequestBody SOScheduledRoutingOutData inData){ + dailyPlanService.openSchedule(inData); + return R.ok(); + } /** * @Description 待入库看板 diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java index 9437b3b..5942a03 100644 --- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java +++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java @@ -507,7 +507,7 @@ public interface DailyPlanMapper { * @throw */ SOScheduledRoutingOutData getOldSOScheduledRoutingOutData(SOScheduledRoutingOutData inData); - + void openSchedule(SOScheduledRoutingOutData inData); /** * @Description 流转时关闭旧派工单号 * @Title closeOldSchedule diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java index 0c58aa5..d48e900 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -527,6 +527,16 @@ public interface DailyPlanService { * @throw */ void closeSchedule(SOScheduledRoutingOutData inData); + /** + * @Description TODO + * @Title closeSchedule + * @param inData + * @author rq + * @date 2022/9/23 10:56 + * @return void + * @throw + */ + void openSchedule(SOScheduledRoutingOutData inData); /** * @Description 入库通知单 diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 709aa18..4312936 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -1509,6 +1509,15 @@ public class DailyPlanServiceImpl implements DailyPlanService { dailyPlanMapper.closeSchedule(inData); } + @Override + public void openSchedule(SOScheduledRoutingOutData inData){ + SOScheduledRoutingOutData saveData=dailyPlanMapper.getOldSOScheduledRoutingOutData(inData); + if("N".equals(saveData.getClosedFlag())){ + throw new RuntimeException("派工单是打开状态!"); + } + dailyPlanMapper.openSchedule(inData); + } + @Override public List transFerSearch(SOOpsTransferData inData){ return dailyPlanMapper.transFerSearch(inData); diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 86a0414..16dcd59 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -762,7 +762,9 @@ 0,GetDate(),'N','N',NULL,NULL,NULL,#{matIssueflag},'N','N',#{scheduleType},#{operatorId},#{partNo},#{orderRef1},#{jobType} ,#{previousSeqNo},#{previousBatchNo},#{materSeqNo}) - + + update SOScheduledRouting set ClosedFlag='N' ,ClosedDate=null where site=#{site} and seqNo=#{seqNo} + update SOScheduledRouting set ClosedFlag='Y' where site=#{site} and seqNo=#{seqNo}