diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 3269b0a..a285c68 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -1626,4 +1626,20 @@ public class ScheduleController { .put("code", 200) .put("msg", "操作成功!"); } + + /** + * @Author LR + * @Description 分切订单校验切换卷 + * @DateTime 2022/4/19 9:23 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "checkSplitScheduleSwitchRoll") + public R checkSplitScheduleSwitchRoll(@RequestBody SearchScheduleData inData) { + scheduleService.checkSplitScheduleSwitchRoll(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index 9fa88ee..fcb8e67 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -964,4 +964,13 @@ public interface ScheduleService { * @return **/ void workbenchCreateslittingrollRepackAction(SearchScheduleData inData); + + /** + * @Author LR + * @Description 分切订单校验切换卷 + * @DateTime 2022/4/19 9:24 + * @Param [inData] + * @return void + **/ + void checkSplitScheduleSwitchRoll(SearchScheduleData inData); } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 568dc48..75e2e1c 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -4337,4 +4337,49 @@ public class ScheduleServiceImpl implements ScheduleService { params.add(scheduleData.getOperatorId()); workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_Repack_action",params); } + + @Override + public void checkSplitScheduleSwitchRoll(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + Integer itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String newRollNo = inData.getNewRollNo(); + String username = inData.getUsername(); + String operatorId = inData.getOperatorId(); + Integer bomItemNo = inData.getBomItemNo(); + String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + + //1. 存储过程 切换卷 校验是否可以继续进行 --顾总写的 + Map checkMap = this.checkSplitScheduleSwitchRol(site, orderNo, itemNo, seqNo, newRollNo, operatorId, bomItemNo); + //判断结果是否成功 + String checkCode = String.valueOf(checkMap.get("resultCode")); + if (!"200".equalsIgnoreCase(checkCode)) { + String msg = String.valueOf(checkMap.get("resultMsg")); + throw new RRException(msg, Integer.parseInt(checkCode)); + } + } + + /** + * @Author LR + * @Description 分切订单切换卷的校验 + * @DateTime 2022/4/19 9:44 + * @Param [site, orderNo, itemNo, seqNo, newRollNo, operatorId, bomItemNo] + * @return java.util.Map + **/ + public Map checkSplitScheduleSwitchRol(String site, String orderNo, Integer itemNo, String seqNo, String newRollNo, String operatorId, Integer bomItemNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(newRollNo); + params.add(operatorId); + params.add(bomItemNo); + //执行存储过程 + List> resultList = procedureMapper.getProcedureData("switchroll_slittingorder_check", params); + //返回执行的结果 + return resultList.get(0); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 3fdc810..e15b50d 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -111,7 +111,10 @@ AND T.Site like '%' + #{site} + '%' - AND T.WorkCenterNo like '%' + #{workCenterNo} + '%' + + AND T.PartNo like '%' + #{partNo} + '%' + + AND T.WorkCenterNo like '%' + #{workCenterNo} + '%' AND Isnull(S1.ScheduledFlag, 'Y') = #{scheduledFlag}