diff --git a/src/main/java/com/spring/modules/schedule/data/BaseRollData.java b/src/main/java/com/spring/modules/schedule/data/BaseRollData.java index cc8332c..efac689 100644 --- a/src/main/java/com/spring/modules/schedule/data/BaseRollData.java +++ b/src/main/java/com/spring/modules/schedule/data/BaseRollData.java @@ -31,6 +31,7 @@ public class BaseRollData extends BaseData { private String rollType; private String rollTypeDb; private String remark; + private String rmRollNo;//材料卷号 public BaseRollData() { } @@ -146,4 +147,12 @@ public class BaseRollData extends BaseData { public void setRemark(String remark) { this.remark = remark; } + + public String getRmRollNo() { + return rmRollNo; + } + + public void setRmRollNo(String rmRollNo) { + this.rmRollNo = rmRollNo; + } } diff --git a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java index a0cabd2..702e133 100644 --- a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -274,6 +274,7 @@ public class ScheduleServiceImpl
implements ScheduleService { //公共参数 String site = inData.getSite(); String orderNo = inData.getOrderNo(); + String rmRollNo = inData.getRmRollNo(); int itemNo = inData.getItemNo(); String seqNo = inData.getSeqNo(); int rollNums = inData.getRollNums(); @@ -284,7 +285,7 @@ public class ScheduleServiceImpl
implements ScheduleService { ScheduleData schedule = scheduleMapper.getScheduleDataBySeqNo(seqNo); String partNo = schedule.getPartNo(); //首先调用存储过程 检查当前创建分卷是否合适 - Map checkMap = this.checkMultiFinalRoll(site, orderNo, partNo, rollNums, rollQty); + Map checkMap = this.checkMultiFinalRoll(site, orderNo, partNo, rmRollNo, rollNums, rollQty); //判断是否继续 String code = String.valueOf(checkMap.get("result_code")); if ("400".equalsIgnoreCase(code)) { @@ -295,7 +296,7 @@ public class ScheduleServiceImpl
implements ScheduleService { //2.校验成功 调用存储过程创建分卷 for(int i = 0; i < rollNums; i++){ - Map rollMap = this.createSingleFinalRoll(site, orderNo, partNo, seqNo, rollQty, username, currentTime); + Map rollMap = this.createSingleFinalRoll(site, orderNo, partNo, seqNo, rmRollNo, rollQty, username, currentTime); String rollNo = String.valueOf(rollMap.get("roll_no")); //查询当前的数据卷号信息对应的打印信息 Map printMap = this.getSingleFinalRollPrintMap(site, rollNo); @@ -327,13 +328,14 @@ public class ScheduleServiceImpl
implements ScheduleService { * @date 2024/6/8 15:26 * @version 1.0 */ - public Map createSingleFinalRoll(String site, String orderNo, String partNo, String seqNo, + public Map createSingleFinalRoll(String site, String orderNo, String partNo, String seqNo, String rmRollNo, Integer rollQty, String username, String currentTime) { List params = new ArrayList<>(); params.add(site); params.add(orderNo); params.add(partNo); params.add(seqNo); + params.add(rmRollNo); params.add(rollQty); params.add(username); params.add(currentTime); @@ -349,11 +351,12 @@ public class ScheduleServiceImpl
implements ScheduleService { * @date 2024/6/8 15:22 * @version 1.0 */ - public Map checkMultiFinalRoll(String site, String orderNo, String partNo, int rollNums, int rollQty) { + public Map checkMultiFinalRoll(String site, String orderNo, String partNo, String rmRollNo, int rollNums, int rollQty) { List params = new ArrayList<>(); params.add(site); params.add(orderNo); params.add(partNo); + params.add(rmRollNo); params.add(rollNums); params.add(rollQty); //存储过程 调用存储过程 创建分卷