From cc91223d245145a878fe266f17f1b59c085bd06f Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Wed, 16 Feb 2022 16:29:58 +0800 Subject: [PATCH] =?UTF-8?q?sfdcRolls=E5=B0=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScheduleController.java | 31 +++++++ .../schedule/data/SearchScheduleData.java | 9 ++ .../schedule/service/ScheduleService.java | 18 ++++ .../service/impl/ScheduleServiceImpl.java | 86 +++++++++++++++++++ 4 files changed, 144 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 2c2a0fb..8213a84 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -983,4 +983,35 @@ public class ScheduleController { .put("msg", "操作成功!"); } + /** + * TODO 重新打开当前下架卷的数据 + * @author LR + * @date 2022/2/16 14:24 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "reopenSfdcRolls") + public R reopenSfdcRolls(@RequestBody SearchScheduleData inData) { + scheduleService.reopenSfdcRolls(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + + /** + * TODO 删除sfdcRolls卷的操作 + * @author LR + * @date 2022/2/16 16:07 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "deleteSfdcRolls") + public R deleteSfdcRolls(@RequestBody SearchScheduleData inData) { + scheduleService.deleteSfdcRolls(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 802c942..3f0886f 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -97,6 +97,7 @@ public class SearchScheduleData extends BaseData { private String showNoFinishedMaterialFlag;//显示材料 private String autoTool;//是否自动处理工具 private Float transQty;//交易的数量 + private String oriRollNo;//原始卷号 public SearchScheduleData() { } @@ -652,4 +653,12 @@ public class SearchScheduleData extends BaseData { public void setTransQty(Float transQty) { this.transQty = transQty; } + + public String getOriRollNo() { + return oriRollNo; + } + + public void setOriRollNo(String oriRollNo) { + this.oriRollNo = oriRollNo; + } } \ 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 1fbc0a3..677b561 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -555,4 +555,22 @@ public interface ScheduleService { * @return void **/ void processCuttingMaterialRoll(SearchScheduleData inData); + + /** + * TODO 重新打开当前下架卷的数据 + * @author LR + * @date 2022/2/16 14:25 + * @param inData + * @return void + **/ + void reopenSfdcRolls(SearchScheduleData inData); + + /** + * TODO 删除sfdcRolls卷的操作 + * @author LR + * @date 2022/2/16 16:08 + * @param inData + * @return void + **/ + void deleteSfdcRolls(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 09c86de..976eadf 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 @@ -2602,4 +2602,90 @@ public class ScheduleServiceImpl implements ScheduleService { procedureMapper.execProduceData("processCuttingMaterialRoll", params); } + @Override + @Transactional + public void reopenSfdcRolls(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"); + //调用存储过程 执行打开卷的操作 根据状态判断是否成功过 + Map resultMap = this.workBenchReopenRoll(site, orderNo, itemNo, seqNo, rollNo, username); + //判断结果是否成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * TODO 执行打开卷的操作 根据状态判断是否成功过 + * @author LR + * @date 2022/2/16 14:30 + * @return java.util.Map + **/ + public Map workBenchReopenRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(rollNo); + params.add(username); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("workbench_reopenroll", params); + //处理返回的结果 + return resultList.get(0); + } + + @Override + @Transactional + public void deleteSfdcRolls(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + Integer itemNo = inData.getItemNo(); + String seqNo = inData.getSeqNo(); + String oriRollNo = inData.getOriRollNo(); + String rollNo = inData.getRollNo(); + String username = inData.getOperatorId(); + String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + + //调用存储过程 执行删除卷的操作 根据状态判断是否成功过 + Map resultMap = this.workBenchDeleteRoll(site, orderNo, itemNo, seqNo, rollNo, oriRollNo, username); + //判断结果是否成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if ("400".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new RRException(msg); + } + } + + /** + * TODO 调用存储过程 执行删除卷的操作 根据状态判断是否成功过 + * @author LR + * @date 2022/2/16 16:19 + * @param [site, orderNo, itemNo, seqNo, rollNo, oriRollNo, username] + * @return java.util.Map + **/ + public Map workBenchDeleteRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String oriRollNo, String username) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(itemNo); + params.add(seqNo); + params.add(rollNo); + params.add(oriRollNo); + params.add(username); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("workbench_deleteroll", params); + //处理返回的结果 + return resultList.get(0); + } + } \ No newline at end of file