diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java index f35be8d..de80b9a 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -102,6 +102,39 @@ public class SchedulingController { .put("msg", "操作成功!"); } + /** + * TODO 向上移动派工单 + * @author LR + * @date 2022/3/14 15:20 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @PostMapping(value = "moveUpSchedule") + public R moveUpSchedule(@RequestBody SearchScheduleData inData){ + schedulingService.moveUpSchedule(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + + /** + * TODO 向下移动派工单 + * @author LR + * @date 2022/3/14 15:30 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @PostMapping(value = "moveDownSchedule") + public R moveDownSchedule(@RequestBody SearchScheduleData inData){ + schedulingService.moveDownSchedule(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + + + + diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java index 98fffb0..7b04277 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -23,8 +23,8 @@ public class SearchScheduleData extends BaseData { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date scheduleDate; - @DateTimeFormat(pattern = "HH:mm:ss") - @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "HH:mm") + @JsonFormat(pattern = "HH:mm", timezone = "GMT+8") private Date scheduleTime;//排产的时分秒 @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -111,7 +111,11 @@ public class SearchScheduleData extends BaseData { private Float scheduledQty;//排产的数量 private int waitTimes;//等待时间 private boolean currentRollFlag;//是否按照当前卷来查询 - + private String createNewRollFlag;//是否创建当前新卷 + private int scheduleSeqNo;//排产页面的序号 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date planStartTime;//排产页面开始时间 // fqc(其它报工) , 切换卷参数 private String repairOrderFlag; private String checkMultipleRoll; // 切换卷参数 @@ -800,4 +804,28 @@ public class SearchScheduleData extends BaseData { public void setCurrentRollFlag(boolean currentRollFlag) { this.currentRollFlag = currentRollFlag; } + + public String getCreateNewRollFlag() { + return createNewRollFlag; + } + + public void setCreateNewRollFlag(String createNewRollFlag) { + this.createNewRollFlag = createNewRollFlag; + } + + public int getScheduleSeqNo() { + return scheduleSeqNo; + } + + public void setScheduleSeqNo(int scheduleSeqNo) { + this.scheduleSeqNo = scheduleSeqNo; + } + + public Date getPlanStartTime() { + return planStartTime; + } + + public void setPlanStartTime(Date planStartTime) { + this.planStartTime = planStartTime; + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java index c9ee000..1e56121 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -55,4 +55,22 @@ public interface SchedulingService { * @return void **/ void reScheduleWorkOrders(SearchScheduleData inData); + + /** + * TODO 向上移动派工单 + * @author LR + * @date 2022/3/14 15:21 + * @Param [inData] + * @return void + **/ + void moveUpSchedule(SearchScheduleData inData); + + /** + * TODO 向下移动派工单 + * @author LR + * @date 2022/3/14 15:30 + * @Param [inData] + * @return void + **/ + void moveDownSchedule(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java index 8122abd..e6e2534 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java @@ -116,6 +116,8 @@ public class SchedulingServiceImpl implements SchedulingService { Date scheduleDate = inData.getScheduleDate(); Date scheduleTime = inData.getScheduleTime(); String username = inData.getUsername(); + Integer scheduleSeqNo = inData.getScheduleSeqNo(); + Date planStartTime = inData.getPlanStartTime();//开始时间 //调用存储过程 取消排产的派工单 Map resultMap = this.cancelSoSchedule(site, orderNo, itemNo, seqNo, workCenterNo, resourceId, scheduledQty); @@ -126,6 +128,35 @@ public class SchedulingServiceImpl implements SchedulingService { String msg = String.valueOf(resultMap.get("resultMsg")); throw new RRException(msg); } + + //执行存储过程 --刷新排产的时间和序号的存储过程 + Map refreshMap = this.cancelSoScheduleRefreshJob(site, workCenterNo, resourceId, scheduleSeqNo, planStartTime); + //判断是否检验成功 + String refreshCode = String.valueOf(refreshMap.get("resultCode")); + if ("400".equalsIgnoreCase(refreshCode)) { + String msg = String.valueOf(refreshMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * TODO 执行存储过程 --刷新排产的时间和序号的存储过程 + * @author LR + * @date 2022/3/14 15:01 + * @Param [site, workCenterNo, resourceId, scheduleSeqNo, planStartTime] + * @return java.util.Map + **/ + public Map cancelSoScheduleRefreshJob(String site, String workCenterNo, String resourceId, Integer scheduleSeqNo, Date planStartTime) { + List params = new ArrayList<>(); + params.add(site); + params.add(workCenterNo); + params.add(resourceId); + params.add(scheduleSeqNo); + params.add(planStartTime); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("soschedule_resortjob_aftercancel", params); + //处理返回的结果 + return resultList.get(0); } /** @@ -264,4 +295,83 @@ public class SchedulingServiceImpl implements SchedulingService { //处理返回的结果 return resultList.get(0); } + + @Override + @Transactional + public void moveUpSchedule(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String workCenterNo = inData.getWorkCenterNo(); + String resourceId = inData.getResourceId(); + int scheduleSeqNo = inData.getScheduleSeqNo(); + + //调用存储过程 --向上移动派工单 + Map resultMap = this.moveUpSchedule(site, workCenterNo, resourceId, scheduleSeqNo, "S"); + //判断是否检验成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * TODO 向上移动派工单 + * @author LR + * @date 2022/3/14 15:28 + * @Param [site, workCenterNo, resourceId, scheduleSeqNo, direction] + * @return java.util.Map + **/ + public Map moveUpSchedule(String site, String workCenterNo, String resourceId, int scheduleSeqNo, String direction) { + List params = new ArrayList<>(); + params.add(site); + params.add(workCenterNo); + params.add(resourceId); + params.add(scheduleSeqNo); + params.add(direction); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("soschedule_resortjob_normal_Up", params); + //处理返回的结果 + return resultList.get(0); + } + + @Override + @Transactional + public void moveDownSchedule(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String workCenterNo = inData.getWorkCenterNo(); + String resourceId = inData.getResourceId(); + int scheduleSeqNo = inData.getScheduleSeqNo(); + + //调用存储过程 --向下移动派工单 + Map resultMap = this.moveDownSchedule(site, workCenterNo, resourceId, scheduleSeqNo, "D"); + //判断是否检验成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * TODO 调用存储过程 --向下移动派工单 + * @author LR + * @date 2022/3/14 15:32 + * @Param [site, workCenterNo, resourceId, scheduleSeqNo, s] + * @return java.util.Map + **/ + public Map moveDownSchedule(String site, String workCenterNo, String resourceId, int scheduleSeqNo, String direction) { + List params = new ArrayList<>(); + params.add(site); + params.add(workCenterNo); + params.add(resourceId); + params.add(scheduleSeqNo); + params.add(direction); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("soschedule_resortjob_normal_Down", params); + //处理返回的结果 + return resultList.get(0); + } + }