From dae1df638c45f3a6dbee7dfef8c9532d22f3ec6a Mon Sep 17 00:00:00 2001 From: ruanqi Date: Sat, 7 Oct 2023 09:53:34 +0800 Subject: [PATCH] 66 --- .../Schedule/controller/ScheduleController.java | 6 ++++++ .../com/jtem/modules/Schedule/dao/ScheduleMapper.java | 2 ++ .../modules/Schedule/service/ScheduleService.java | 11 +++++++++++ .../Schedule/service/impl/ScheduleServiceImpl.java | 9 +++++++++ src/main/resources/mapper/schedule/ScheduleMapper.xml | 3 +++ 5 files changed, 31 insertions(+) diff --git a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java b/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java index 2ce2184..b2010b5 100644 --- a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java +++ b/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java @@ -140,6 +140,12 @@ public class ScheduleController { return R.ok(); } + @PostMapping("/openSchedule") + public R openSchedule(@RequestBody SOScheduledRoutingOutData inData){ + scheduleService.openSchedule(inData); + return R.ok(); + } + /** * @Description TODO * @Title saveGenerateReportForSchedule diff --git a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java index d6c8505..2a1c6df 100644 --- a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java @@ -155,6 +155,8 @@ public interface ScheduleMapper { */ void closeSchedule(SOScheduledRoutingOutData inData); + void openSchedule(SOScheduledRoutingOutData inData); + SORoutingData searchReportedQty(GenerateReportData generateReportData); String getSeqNoSite(int seqNo); diff --git a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java index 4d7eecf..cc4083a 100644 --- a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java +++ b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java @@ -105,6 +105,17 @@ public interface ScheduleService { */ 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); + /** * @Method saveGenerateReport * @Description: 保存报告信息 diff --git a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java index cfaf98a..d9f90bf 100644 --- a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java @@ -173,6 +173,15 @@ public class ScheduleServiceImpl implements ScheduleService { scheduleMapper.closeSchedule(inData); } + @Override + public void openSchedule(SOScheduledRoutingOutData inData){ + SOScheduledRoutingOutData saveData=scheduleMapper.getOldSOScheduledRoutingOutData(inData); + if("N".equals(saveData.getClosedFlag())){ + throw new RuntimeException("派工单是打开状态!"); + } + scheduleMapper.openSchedule(inData); + } + @Override @Transactional public R saveGenerateReportForSchedule(GenerateReportData inData) { diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 69d632f..95492ea 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -200,6 +200,9 @@ update SOScheduledRouting set ClosedFlag='Y' ,ClosedDate=GetDate() where site=#{site} and seqNo=#{seqNo} + + + update SOScheduledRouting set ClosedFlag='N' ,ClosedDate=null where site=#{site} and seqNo=#{seqNo}