From 38ce2a8c0060ee5eaab34ac025045e9efbbef87b Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 7 Apr 2022 11:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E5=8C=85=E8=A3=85=202022=E5=B9=B44?= =?UTF-8?q?=E6=9C=887=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/schedule/data/SearchScheduleData.java | 6 +++--- .../modules/schedule/service/ScheduleService.java | 10 +++++----- .../schedule/service/impl/ScheduleServiceImpl.java | 13 ++++++++----- src/main/resources/mapper/app/TransdetailDao.xml | 6 ------ .../mapper/finishedProduct/CRollinfoDao.xml | 10 +++++----- .../resources/mapper/finishedProduct/SapDao.xml | 10 +++++----- 6 files changed, 26 insertions(+), 29 deletions(-) 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 4b19061..7dc6847 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -140,13 +140,13 @@ public class SearchScheduleData extends BaseData { private String directRepackageflag; // 是否是换包装 private String sortField;//排序规则 - private Double rollCount; + private int rollCount; - public Double getRollCount() { + public int getRollCount() { return rollCount; } - public void setRollCount(Double rollCount) { + public void setRollCount(int rollCount) { this.rollCount = rollCount; } 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 e3c30bc..9fa88ee 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -702,11 +702,11 @@ public interface ScheduleService { void otherSwitchSfdcRoll(SearchScheduleData inData); /** - * @Author LR - * @Description 检查是否可以创建分卷 - * @DateTime 2022/2/17 11:45 - * @Param [inData] - * @return com.gaotao.common.utils.R + * @Author sxm + * @Description 其它报工创建分卷校验 + * @Date 2022/3/7 13:56 + * @Param + * @return **/ Map otherCheckCreateSplitSfdcRoll(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 a0935f3..568dc48 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 @@ -3466,8 +3466,10 @@ public class ScheduleServiceImpl implements ScheduleService { boolean newRollFlag = inData.isNewRollFlag(); Float editReportQty = inData.getSfdcReportedQty(); String username = inData.getOperatorId(); + // todo 添加参数 是否是换包装 + String rePackFlag = inData.getParkFlag(); //1.先校验的存储过程 - Map checkMap = this.checkMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, "N"); + Map checkMap = this.checkMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, rePackFlag); //判断是否检验成功 String checkCode = String.valueOf(checkMap.get("resultCode")); if ("400".equalsIgnoreCase(checkCode)) { @@ -3477,7 +3479,7 @@ public class ScheduleServiceImpl implements ScheduleService { //2.存储过程 区分当前卷和参与合并的卷 if (newRollFlag) { - Map resultMap = this.checkMergeSfdcRollQty(site, orderNo, newRollNo, newRollQty, "N"); + Map resultMap = this.checkMergeSfdcRollQty(site, orderNo, newRollNo, newRollQty, rePackFlag); //判断是否检验成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if ("400".equalsIgnoreCase(resultCode)) { @@ -3486,7 +3488,7 @@ public class ScheduleServiceImpl implements ScheduleService { } return resultMap; } else { - Map resultMap = this.checkMergeSfdcRollQty(site, orderNo, rollNo, rollQty, "N"); + Map resultMap = this.checkMergeSfdcRollQty(site, orderNo, rollNo, rollQty, rePackFlag); //判断是否检验成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if ("400".equalsIgnoreCase(resultCode)) { @@ -3559,7 +3561,8 @@ public class ScheduleServiceImpl implements ScheduleService { Float editReportQty = inData.getSfdcReportedQty(); String username = inData.getUsername(); String operatorId = inData.getOperatorId(); - + // todo 添加参数 是否是换包装 + String rePackFlag = inData.getParkFlag(); //1.先校验当前卷 inData.setNewRollFlag(false); Map oldMap = this.checkMergeSfdcRoll(inData); @@ -3568,7 +3571,7 @@ public class ScheduleServiceImpl implements ScheduleService { Map newMap = this.checkMergeSfdcRoll(inData); //校验完成调用存储过程 - Map resultMap = this.processMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, "N", username, operatorId); + Map resultMap = this.processMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, rePackFlag, username, operatorId); //判断是否检验成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if ("400".equalsIgnoreCase(resultCode)) { diff --git a/src/main/resources/mapper/app/TransdetailDao.xml b/src/main/resources/mapper/app/TransdetailDao.xml index 4af7a15..0d9c2e0 100644 --- a/src/main/resources/mapper/app/TransdetailDao.xml +++ b/src/main/resources/mapper/app/TransdetailDao.xml @@ -1,13 +1,7 @@ - diff --git a/src/main/resources/mapper/finishedProduct/SapDao.xml b/src/main/resources/mapper/finishedProduct/SapDao.xml index 2267418..17d8f2f 100644 --- a/src/main/resources/mapper/finishedProduct/SapDao.xml +++ b/src/main/resources/mapper/finishedProduct/SapDao.xml @@ -2,16 +2,16 @@ - update RXE.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15 + update YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15 - update RXE.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15 + update YRTEST.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15 - update RXE.dbo.ODRF set DocStatus='C' where DocEntry = #{orderNo} + update YRTEST.dbo.ODRF set DocStatus='C' where DocEntry = #{orderNo} - DELETE FROM RXE.dbo.ODLN where docDate is null and CardCode is null + DELETE FROM YRTEST.dbo.ODLN where docDate is null and CardCode is null - update RXE.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where DocEntry = #{sapNo} + update YRTEST.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where DocEntry = #{sapNo}