From eec185f0cf9e7f9ce9fcbf094f61876a965e749f Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Thu, 10 Nov 2022 17:00:21 +0800 Subject: [PATCH] =?UTF-8?q?2022-11-10=20=E6=B7=BB=E5=8A=A0=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=8B=E4=B8=80=E9=81=93=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchedulingController.java | 15 +++++++++ .../schedule/service/SchedulingService.java | 8 +++++ .../service/impl/SchedulingServiceImpl.java | 33 +++++++++++++++++++ 3 files changed, 56 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 2f84d2f..5d8af7c 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -585,5 +585,20 @@ public class SchedulingController { .put("msg", "操作成功!"); } + /** + * @description: 获取派工单的下一道工序 + * @author LR + * @date 2022/11/10 16:55 + * @version 1.0 + */ + @RequestMapping(value = "getScheduleNextItemNo") + public R getScheduleNextItemNo(@RequestBody SearchScheduleData inData){ + int nextItemNo = schedulingService.getScheduleNextItemNo(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!") + .put("nextItemNo", nextItemNo); + } + } 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 8fd02bc..6563454 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -338,4 +338,12 @@ public interface SchedulingService { * @return void **/ void cancelScheduleWithScheduleQuery(SearchScheduleData inData); + + /** + * @description: 获取派工单的下一道工序 + * @author LR + * @date 2022/11/10 16:56 + * @version 1.0 + */ + int getScheduleNextItemNo(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 f69abc1..44db976 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 @@ -1171,4 +1171,37 @@ public class SchedulingServiceImpl implements SchedulingService { return resultList.get(0); } + + @Override + public int getScheduleNextItemNo(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + int itemNo = inData.getItemNo(); + return this.getScheduleNextItemNo(site, orderNo, itemNo); + } + + /** + * TODO 获取派工单的后道工序 + * + * @param site + * @param orderNo + * @param itemNo + * @return java.lang.Integer + * @author LR + * @date 2021/12/13 16:46 + **/ + public Integer getScheduleNextItemNo(String site, String orderNo, int itemNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + //执行存储过程获取结果 + List> resultList = procedureMapper.getProcedureData("getScheduleNextItemNo", params); + //处理结果集 + Map resultMap = resultList.get(0); + String strItemNo = String.valueOf(resultMap.get("nextItemNo")); + return Integer.parseInt(strItemNo); + } + }