From a580536e1641c6e40d7a5ff5100cd033491ba3d7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 20 Oct 2025 17:22:18 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-20=20=E8=AE=A2=E5=8D=95=E6=8E=92?=
 =?UTF-8?q?=E4=BA=A7=EF=BC=88=E6=97=A0=E9=99=90=E4=BA=A7=E8=83=BD=EF=BC=89?=
 =?UTF-8?q?-=E3=80=8B=E6=8E=92=E4=BA=A7=E6=98=8E=E7=BB=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BA=E5=AE=9A=E8=BD=BD=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/data/SearchScheduleData.java      | 18 ++++++++++++++++++
 .../service/impl/SchedulingServiceImpl.java    | 17 +++++++++++++----
 2 files changed, 31 insertions(+), 4 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 543ecb3..c489501 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -165,6 +165,24 @@ public class SearchScheduleData extends BaseData {
     private Integer moveScheduleSeqNo; // 移动到的派工单位置
     
     private String resortDirection; // 调整方向 S向上 D向下
+    private Integer rowCount;
+    private String carrierNo;
+
+    public Integer getRowCount() {
+        return rowCount;
+    }
+
+    public void setRowCount(Integer rowCount) {
+        this.rowCount = rowCount;
+    }
+
+    public String getCarrierNo() {
+        return carrierNo;
+    }
+
+    public void setCarrierNo(String carrierNo) {
+        this.carrierNo = carrierNo;
+    }
 
     public String getDirectRepackageflag() {
         return directRepackageflag;
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
index 9c8b48e..2db4cba 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
@@ -85,7 +85,8 @@ public class SchedulingServiceImpl implements SchedulingService {
         //设置查询的条件
         String calendarId = String.valueOf(calendarMap.get("calendarId"));
         //调用存储过程 执行排产的方法
-        Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, specifiedTime, scheduleDate, scheduleTime, calendarId, username);
+        Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty,
+                specifiedTime, scheduleDate, scheduleTime, calendarId, username, 0, 0, "*");
         //判断是否检验成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -103,7 +104,7 @@ public class SchedulingServiceImpl implements SchedulingService {
      * @Param [site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, specifiedTime, scheduleDate, scheduleTime, calendarId, username]
      **/
     public Map<String, Object> scheduleWorkOrder(String site, String orderNo, Integer itemNo, String workCenterNo, String resourceId, Float scheduledQty,
-                                                 String specifiedTime, Date scheduleDate, Date scheduleTime, String calendarId, String username) {
+                                                 String specifiedTime, Date scheduleDate, Date scheduleTime, String calendarId, String username, Integer rowCount, Integer rollCount, String carrierNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -116,6 +117,9 @@ public class SchedulingServiceImpl implements SchedulingService {
         params.add(scheduleTime);
         params.add(calendarId);
         params.add(username);
+        params.add(rowCount);
+        params.add(rollCount);
+        params.add(carrierNo);
         //调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("soschedule_newjob", params);
         //处理返回的结果
@@ -779,6 +783,9 @@ public class SchedulingServiceImpl implements SchedulingService {
         boolean checkFlag = inData.isCheckFlag();
         Float scheduledQty = inData.getScheduledQty();
         String calendarId = inData.getCalendarId();
+        Integer rowCount = inData.getRowCount();
+        Integer rollCount = inData.getRollCount();
+        String carrierNo = inData.getCarrierNo();
 
         //判断是否校验总数量
         if (checkFlag) {
@@ -793,7 +800,8 @@ public class SchedulingServiceImpl implements SchedulingService {
             }
         }
         //验证通过 继续执行排产操作
-        Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, specifiedTime, scheduleDate, scheduleTime, calendarId, username);
+        Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty,
+                specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo);
         //判断是否检验成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -1290,7 +1298,8 @@ public class SchedulingServiceImpl implements SchedulingService {
                 }
             }
             //验证通过 继续执行排产操作
-            Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, specifiedTime, scheduleDate, scheduleTime, calendarId, username);
+            Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty,
+                    specifiedTime, scheduleDate, scheduleTime, calendarId, username, 0, 0, "*");
             //判断是否检验成功
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {