From 5dc6eb089e11df09db3aee082b3b191be5e65e6a Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Fri, 18 Feb 2022 17:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E9=87=8F=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScheduleController.java | 30 +++++++ .../schedule/service/ScheduleService.java | 18 ++++ .../service/impl/ScheduleServiceImpl.java | 90 +++++++++++++++++++ 3 files changed, 138 insertions(+) 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 ac2ac37..4de1178 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -1091,5 +1091,35 @@ public class ScheduleController { .put("row", resultRow); } + /** + * @Author LR + * @Description 处理结束工具使用的方法 + * @DateTime 2022/2/18 9:53 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "processFinishTool") + public R processFinishTool(@RequestBody SearchScheduleData inData){ + scheduleService.processFinishTool(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + + /** + * @Author LR + * @Description 材料卷结束使用 且没有剩余 + * @DateTime 2022/2/18 10:50 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "processFinishMaterialWithNoRemainder") + public R processFinishMaterialWithNoRemainder(@RequestBody SearchScheduleData inData){ + scheduleService.processFinishMaterialWithNoRemainder(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + } 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 ad28b4e..1b3a2a6 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -617,4 +617,22 @@ public interface ScheduleService { * @Param [inData] **/ Map getMergeRollPageData(SearchScheduleData inData); + + /** + * @Author LR + * @Description 处理结束工具使用的方法 + * @DateTime 2022/2/18 9:59 + * @Param [inData] + * @return void + **/ + void processFinishTool(SearchScheduleData inData); + + /** + * @Author LR + * @Description 材料卷结束使用 且没有剩余 + * @DateTime 2022/2/18 10:50 + * @Param [inData] + * @return void + **/ + void processFinishMaterialWithNoRemainder(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 fa9cd25..3d2f184 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 @@ -2980,4 +2980,94 @@ public class ScheduleServiceImpl implements ScheduleService { return resultList.get(0); } + @Override + @Transactional + public void processFinishTool(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + Integer itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String rollNo = inData.getRollNo(); + String username = inData.getOperatorId(); + String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + int histSeqNo = inData.getHistSeqNo(); + String toolInstanceId = inData.getToolInstanceId(); + + //执行存储过程 处理结束工具使用的方法 + Map resultMap = this.workBenchFinishTool(site, orderNo, itemNo, seqNo, histSeqNo, toolInstanceId); + //判断结果是否成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * @Author LR + * @Description 执行存储过程 处理结束工具使用的方法 + * @DateTime 2022/2/18 10:29 + * @Param [site, orderNo, itemNo, seqNo, histSeqNo, toolInstanceId] + * @return java.util.Map + **/ + public Map workBenchFinishTool(String site, String orderNo, Integer itemNo, String seqNo, int histSeqNo, String toolInstanceId) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(histSeqNo); + params.add(toolInstanceId); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("workbench_finishtool", params); + //处理返回的结果 + return resultList.get(0); + } + + @Override + @Transactional + public void processFinishMaterialWithNoRemainder(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + Integer itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String rollNo = inData.getRollNo(); + String username = inData.getOperatorId(); + String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + int histSeqNo = inData.getHistSeqNo(); + + //存储过程 执行材料卷结束使用 且无剩余 + Map resultMap = this.processFinishMaterialWithNoRemainder(site, orderNo, itemNo, seqNo, histSeqNo, rollNo); + //判断结果是否成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * @Author LR + * @Description 执行材料使用结束 且无剩余 + * @DateTime 2022/2/18 11:05 + * @Param [site, orderNo, itemNo, seqNo, histSeqNo, rollNo] + * @return java.util.Map + **/ + public Map processFinishMaterialWithNoRemainder(String site, String orderNo, Integer itemNo, String seqNo, int histSeqNo, String rollNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(histSeqNo); + params.add(rollNo); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("workbench_finishmaterial_usage", params); + //处理返回的结果 + return resultList.get(0); + } + + } \ No newline at end of file