From 12895e990835bdb264353f6743e38073bef5faa7 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Tue, 28 Dec 2021 10:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=81=9C=E6=9C=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScheduleController.java | 17 +++++++- .../schedule/data/SearchScheduleData.java | 27 ++++++++++++ .../schedule/service/ScheduleService.java | 8 ++++ .../service/impl/ScheduleServiceImpl.java | 42 +++++++++++++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) 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 4ed0119..8da15f7 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -628,7 +628,22 @@ public class ScheduleController { return R.ok() .put("resultMap", resultMap); } - // + + /** + * TODO 报告停机代码 + * @author LR + * @date 2021/12/27 17:16 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "reportDownTime") + public R reportDownTime(@RequestBody SearchScheduleData inData){ + scheduleService.reportDownTime(inData); + return R.ok() + .put("code", 200) + .put("success", true) + .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 943aa3b..ac53069 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -61,6 +61,9 @@ public class SearchScheduleData extends BaseData { private Integer bomItemNo;//上机的行号 private Integer histSeqNo;//需要换料的行号 private String downTimeCode;//停机代码 + private String reportDate;//报告的年月日 + private String reportTime;//报告的时分 + private Float totalTime;//报告的时间 public SearchScheduleData() { } @@ -328,4 +331,28 @@ public class SearchScheduleData extends BaseData { public void setDownTimeCode(String downTimeCode) { this.downTimeCode = downTimeCode; } + + public String getReportDate() { + return reportDate; + } + + public void setReportDate(String reportDate) { + this.reportDate = reportDate; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public Float getTotalTime() { + return totalTime; + } + + public void setTotalTime(Float totalTime) { + this.totalTime = totalTime; + } } 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 988f64e..4fdb25c 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -347,4 +347,12 @@ public interface ScheduleService { **/ Map checkDownTimeCode(SearchScheduleData inData); + /** + * TODO 报告停机代码 + * @author LR + * @date 2021/12/27 17:16 + * @param inData + * @return void + **/ + void reportDownTime(SearchScheduleData inData); } 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 119c642..8a8fe39 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 @@ -987,6 +987,28 @@ public class ScheduleServiceImpl implements ScheduleService { return resultMap; } + @Override + @Transactional + public void reportDownTime(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + Integer itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String rollNo = inData.getRollNo(); + String downTimeCode = inData.getDownTimeCode(); + String username = inData.getOperatorId(); + String reportDate = inData.getReportDate(); + String reportTime = inData.getReportTime(); + String operateTime = reportDate+ " "+reportTime.substring(0, 5); + Float totalTime = inData.getTotalTime(); + //首先调用校验的方法 + this.checkDownTimeCode(inData); + + //调用存储过程执行报告停机内容 + this.reportDownTime(site, orderNo, itemNo, seqNo, rollNo, downTimeCode, username, operateTime, totalTime); + } + /** * TODO 调用存储过程返回停机代码的结果 * @author LR @@ -1005,5 +1027,25 @@ public class ScheduleServiceImpl implements ScheduleService { return resultList.get(0); } + /** + * TODO 调用存储过程创建停机的记录 + * @author LR + * @date 2021/12/27 17:26 + * @return void + **/ + public void reportDownTime(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String downTimeCode, String username, String operateTime, Float totalTime) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(rollNo); + params.add(downTimeCode); + params.add(username); + params.add(operateTime); + params.add(totalTime); + procedureMapper.execProduceData("reportDownTime", params); + } + }