From cb40163b8374bd4d767ff28a0b4952898fc4a53e Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Fri, 14 Jun 2024 09:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=B8=A9=E6=97=B6=E9=97=B4=20=20?=
 =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E6=97=B6=E9=97=B4=20=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/service/impl/ScheduleServiceImpl.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 33e56d5..7f402d0 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
@@ -85,6 +85,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //公共参数
         String site = inData.getSite();
         String rollNo = inData.getRollNo();
+        String orderNo = inData.getOrderNo();
         String seqNo = inData.getSeqNo();
         //查询当前材料卷的信息
         Map<String, Object> resultPart = scheduleMapper.getRmRollData(inData);
@@ -122,7 +123,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             }
         }
         //3.调用存储过程  检查当前的卷是否已经上机完成了
-        Map<String, Object> resultMap = this.checkScanRmRollNo(site, seqNo, rollNo);
+        Map<String, Object> resultMap = this.checkScanRmRollNo(site, orderNo, rollNo);
         //判断是否继续
         String code = String.valueOf(resultMap.get("result_code"));
         if ("400".equalsIgnoreCase(code)) {
@@ -138,9 +139,10 @@ public class ScheduleServiceImpl implements ScheduleService {
     * @date 2024/6/7 9:20
     * @version 1.0
     */
-    public Map<String, Object> checkScanRmRollNo(String site, String seqNo, String rollNo) {
+    public Map<String, Object> checkScanRmRollNo(String site, String orderNo, String rollNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
+        params.add(orderNo);
         params.add(rollNo);
         //存储过程 调用存储过程  创建分卷
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkDieCuttingScanRmRollNo", params);