From 8d31c5cd70ba5af6fe93383ebeca3886744c55ac Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Tue, 5 Apr 2022 17:11:25 +0800 Subject: [PATCH] repackage 2022-04-05 sxm --- .../controller/ScheduleController.java | 44 +++++++++++++ .../schedule/data/SearchScheduleData.java | 19 ++++++ .../schedule/service/ScheduleService.java | 27 ++++++++ .../service/impl/ScheduleServiceImpl.java | 62 ++++++++++++++++++- .../mapper/finishedProduct/CRollinfoDao.xml | 10 +-- .../mapper/finishedProduct/SapDao.xml | 10 +-- 6 files changed, 161 insertions(+), 11 deletions(-) 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 7de9968..3269b0a 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -1582,4 +1582,48 @@ public class ScheduleController { .put("msg", "操作成功!"); } + /** + * @Author sxm + * @Description 切换卷校验 + * @Date 2022/4/5 16:05 + * @Param + * @return + **/ + @RequestMapping(value = "switchrollRepackCheck") + public R switchrollRepackCheck(@RequestBody SearchScheduleData scheduleData){ + Map resultMap = scheduleService.switchrollRepackCheck(scheduleData); + return R.ok() + .put("resultMap", resultMap); + } + + /** + * @Author sxm + * @Description 换包装 切换卷 + * @Date 2022/3/30 16:30 + * @Param + * @return + **/ + @RequestMapping(value = "switchrollRepackAction") + public R switchrollRepackAction(@RequestBody SearchScheduleData inData) { + scheduleService.switchrollRepackAction(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } + + + /** + * @Author sxm + * @Description 换包装创建分卷 + * @Date 2022/4/5 16:54 + * @Param + * @return + **/ + @RequestMapping(value = "workbench_createslittingroll_Repack_action") + public R workbenchCreateslittingrollRepackAction(@RequestBody SearchScheduleData inData) { + scheduleService.workbenchCreateslittingrollRepackAction(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } } \ No newline at end of file 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 ea8e169..760679b 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -137,6 +137,25 @@ public class SearchScheduleData extends BaseData { private String repairSOFlag; // 印版已发状态 private Double qtytoSchedule; // 排产数量 private Double timeRequired; // 预计重检时长 + private boolean directRepackageflag; // 是否是换包装 + + private Double rollCount; + + public Double getRollCount() { + return rollCount; + } + + public void setRollCount(Double rollCount) { + this.rollCount = rollCount; + } + + public boolean isDirectRepackageflag() { + return directRepackageflag; + } + + public void setDirectRepackageflag(boolean directRepackageflag) { + this.directRepackageflag = directRepackageflag; + } public Double getTimeRequired() { return timeRequired; 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 199f5f9..e3c30bc 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -937,4 +937,31 @@ public interface ScheduleService { * @return **/ String getShopOrderType(SearchScheduleData inData); + + /** + * @Author sxm + * @Description 换包装校验切换卷 + * @Date 2022/4/5 16:05 + * @Param + * @return + **/ + Map switchrollRepackCheck(SearchScheduleData scheduleData); + + /** + * @Author sxm + * @Description 换包装切换卷 + * @Date 2022/4/5 16:15 + * @Param + * @return + **/ + void switchrollRepackAction(SearchScheduleData inData); + + /** + * @Author sxm + * @Description 换包装创建分卷 + * @Date 2022/4/5 16:54 + * @Param + * @return + **/ + void workbenchCreateslittingrollRepackAction(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 bf8dfb7..ccac779 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 @@ -465,7 +465,13 @@ public class ScheduleServiceImpl implements ScheduleService { Map resultMap = this.getScheduleDateShif(site, resourceId, currentDate); Date scheduledDate = (Date) resultMap.get("scheduleddate"); - String scheduleTime = DateUtil.getStringDate(scheduledDate, "yyyy-MM-dd"); + // todo 判空 2022-04-05 sxm + String scheduleTime = ""; + if(scheduledDate == null){ + scheduleTime = ""; + }else { + scheduleTime = DateUtil.getStringDate(scheduledDate, "yyyy-MM-dd"); + } String shiftNo = String.valueOf(resultMap.get("ShiftNo")); result.put("shiftDesc", shiftNo); result.put("shiftNo", shiftNo); @@ -4249,4 +4255,58 @@ public class ScheduleServiceImpl implements ScheduleService { public String getShopOrderType(SearchScheduleData inData) { return scheduleMapper.getShopOrderType(inData); } + + @Override + public Map switchrollRepackCheck(SearchScheduleData scheduleData) { + List params = new ArrayList<>(); + params.add(scheduleData.getSite()); + params.add(scheduleData.getOrderNo()); + params.add(scheduleData.getItemNo()); + params.add(scheduleData.getSeqNo()); + params.add(scheduleData.getRollNo()); + params.add(scheduleData.isDirectRepackageflag()); + return workbenchCreateslittingrollFqcCheck("switchroll_repack_check",params); + } + + @Override + public void switchrollRepackAction(SearchScheduleData scheduleData) { + Map checkMap = switchrollRepackCheck(scheduleData); + if (checkMap == null) { + throw new RRException("存储过程未返回信息", 400); + } + //判断结果是否成功 + String checkCode = String.valueOf(checkMap.get("resultCode")); + if ("400".equalsIgnoreCase(checkCode)) { + String msg = String.valueOf(checkMap.get("resultMsg")); + throw new RRException(msg, 400); + } + List params = new ArrayList<>(); + params.add(scheduleData.getSite()); + params.add(scheduleData.getOrderNo()); + params.add(scheduleData.getItemNo()); + params.add(scheduleData.getSeqNo()); + params.add(scheduleData.getRollNo()); + params.add(scheduleData.getOperatorId()); + params.add(scheduleData.isDirectRepackageflag()); + params.add(scheduleData.getCurrentDate()); + params.add(scheduleData.getWorkCenterNo()); + params.add(scheduleData.getResourceId()); + params.add(scheduleData.getShiftNo()); + params.add(scheduleData.getScheduleDate()); + workbenchCreateslittingrollFqcCheck("switchroll_repack_action",params); + } + + @Override + public void workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) { + List params = new ArrayList<>(); + params.add(scheduleData.getSite()); + params.add(scheduleData.getOrderNo()); + params.add(scheduleData.getItemNo()); + params.add(scheduleData.getSeqNo()); + params.add(scheduleData.getRollQty()); + params.add(scheduleData.getRollNo()); + params.add(scheduleData.getRollCount()); + params.add(scheduleData.getOperatorId()); + workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_Repack_action",params); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml index e4f394b..5a5e5a3 100644 --- a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml +++ b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml @@ -177,7 +177,7 @@ diff --git a/src/main/resources/mapper/finishedProduct/SapDao.xml b/src/main/resources/mapper/finishedProduct/SapDao.xml index 17d8f2f..2267418 100644 --- a/src/main/resources/mapper/finishedProduct/SapDao.xml +++ b/src/main/resources/mapper/finishedProduct/SapDao.xml @@ -2,16 +2,16 @@ - update YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15 + update RXE.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15 - update YRTEST.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15 + update RXE.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15 - update YRTEST.dbo.ODRF set DocStatus='C' where DocEntry = #{orderNo} + update RXE.dbo.ODRF set DocStatus='C' where DocEntry = #{orderNo} - DELETE FROM YRTEST.dbo.ODLN where docDate is null and CardCode is null + DELETE FROM RXE.dbo.ODLN where docDate is null and CardCode is null - update YRTEST.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where DocEntry = #{sapNo} + update RXE.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where DocEntry = #{sapNo}