From b440e89f8ae4d8f5dbbf659e3f1ce3fb35e4e3f9 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Wed, 17 Aug 2022 16:42:48 +0800 Subject: [PATCH] =?UTF-8?q?2022-08-17=20=E6=9F=A5=E8=AF=A2-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8E=92=E4=BA=A7=E5=8D=95=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchedulingController.java | 14 ++++ .../schedule/data/SearchScheduleData.java | 10 +++ .../schedule/service/SchedulingService.java | 8 ++ .../service/impl/SchedulingServiceImpl.java | 75 +++++++++++++++++++ 4 files changed, 107 insertions(+) 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 60026a2..2f84d2f 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -570,6 +570,20 @@ public class SchedulingController { .put("authMap", authMap); } + /** + * @Author LR + * @Description 派工单查询--》取消排产操作 + * @DateTime 2022/8/17 13:58 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "cancelScheduleWithScheduleQuery") + public R cancelScheduleWithScheduleQuery(@RequestBody SearchScheduleData inData){ + schedulingService.cancelScheduleWithScheduleQuery(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 8f8253f..be777a0 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -155,6 +155,8 @@ public class SearchScheduleData extends BaseData { private int rollCount; + private Float lotSize;//具体对应的字段 2022-08-17 + public int getRollCount() { return rollCount; } @@ -1093,4 +1095,12 @@ public class SearchScheduleData extends BaseData { public void setToolIssueFlag(String toolIssueFlag) { this.toolIssueFlag = toolIssueFlag; } + + public Float getLotSize() { + return lotSize; + } + + public void setLotSize(Float lotSize) { + this.lotSize = lotSize; + } } \ 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 d8c646e..8fd02bc 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -330,4 +330,12 @@ public interface SchedulingService { Map getScheduleMultiReportSpecialAuth(SearchScheduleData inData); + /** + * @Author LR + * @Description 派工单查询--》取消排产操作 + * @DateTime 2022/8/17 13:58 + * @Param [inData] + * @return void + **/ + void cancelScheduleWithScheduleQuery(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 605573a..f69abc1 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 @@ -1096,4 +1096,79 @@ public class SchedulingServiceImpl implements SchedulingService { return resultList.get(0); } + @Override + @Transactional + public void cancelScheduleWithScheduleQuery(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + int itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String workCenterNo = inData.getWorkCenterNo(); + String resourceId = inData.getResourceId(); + Float lotSize = inData.getLotSize(); + int scheduleSeqNo = inData.getScheduleSeqNo(); + Date planStartTime = inData.getPlanStartTime(); + + //1.调用检查的存储过程 --判断是否可以取消 + Map checkMap = this.checkCancelScheduleWithScheduleQuery(site, orderNo, itemNo, seqNo); + //判断是否通过验证 + String checkCode = String.valueOf(checkMap.get("resultCode")); + if (!"200".equalsIgnoreCase(checkCode)) { + String msg = String.valueOf(checkMap.get("resultMsg")); + throw new XJException(msg, Integer.parseInt(checkCode)); + } + + //2.调用检查的存储过程 --取消排产 + this.cancelScheduleWithScheduleQuery(site, orderNo, itemNo, seqNo, workCenterNo, resourceId, lotSize); + + //3.调用存储过程 处理排序的操作 + //执行存储过程 --刷新排产的时间和序号的存储过程 + 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 XJException(msg); + } + + } + + /** + * @Author LR + * @Description查询派工单--取消排产操作 + * @DateTime 2022/8/17 14:39 + * @Param [site, orderNo, itemNo, seqNo, workCenterNo, resourceId, lotSize] + * @return void + **/ + public void cancelScheduleWithScheduleQuery(String site, String orderNo, int itemNo, String seqNo, String workCenterNo, String resourceId, Float lotSize) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(workCenterNo); + params.add(resourceId); + params.add(lotSize); + //执行存储过程 + procedureMapper.getProcedureData("cancelScheduleWithScheduleQuery", params); + } + + /** + * @Author LR + * @Description 查询派工单--取消排产检查校验 + * @DateTime 2022/8/17 14:26 + * @Param [site, orderNo, itemNo, seqNo] + * @return java.util.Map + **/ + public Map checkCancelScheduleWithScheduleQuery(String site, String orderNo, int itemNo, String seqNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + List> resultList = procedureMapper.getProcedureData("checkCancelScheduleWithScheduleQuery", params); + return resultList.get(0); + } + }