2025-10-20

订单排产（无限产能）-》排产明细增加固定载具

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;

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)) {