2026-04-13

1、机台工作台增加“当前工序”、“任务备注”字段；
2、订单排产（无限产能）的 本次排产明细增加“任务备注”字段

src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java

@@ -90,7 +90,7 @@ 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, 0, 0, "*", "有限产能");
+                specifiedTime, scheduleDate, scheduleTime, calendarId, username, 0, 0, "*", "", "有限产能");
         //判断是否检验成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -108,7 +108,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, Integer rowCount, Integer rollCount, String carrierNo, String type) {
+                                                 String specifiedTime, Date scheduleDate, Date scheduleTime, String calendarId, String username, Integer rowCount, Integer rollCount, String carrierNo, String remark, String type) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -125,6 +125,7 @@ public class SchedulingServiceImpl implements SchedulingService {
         params.add(rollCount);
         params.add(carrierNo);
         params.add(type);
+        params.add(remark);
         //调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("soschedule_newjob", params);
         //处理返回的结果
@@ -791,6 +792,7 @@ public class SchedulingServiceImpl implements SchedulingService {
         Integer rowCount = inData.getRowCount();
         Integer rollCount = inData.getRollCount();
         String carrierNo = inData.getCarrierNo();
+        String remark = inData.getRemark();
 
         //判断是否校验总数量
         if (checkFlag) {
@@ -806,7 +808,7 @@ public class SchedulingServiceImpl implements SchedulingService {
         }
         //验证通过 继续执行排产操作
         Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty,
-                specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo, "无限产能");
+                specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo, remark, "无限产能");
         //判断是否检验成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -1292,6 +1294,7 @@ public class SchedulingServiceImpl implements SchedulingService {
             Integer rowCount = inData.getRowCount() != null ? inData.getRowCount() : 0;
             Integer rollCount = inData.getRollCount();
             String carrierNo = inData.getCarrierNo();
+            String remark = inData.getRemark();
             if (carrierNo == null || carrierNo.isEmpty()) {
                 carrierNo = "*";
             }
@@ -1310,7 +1313,7 @@ public class SchedulingServiceImpl implements SchedulingService {
             }
             //验证通过 继续执行排产操作
             Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty,
-                    specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo, "无限产能");
+                    specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo, remark, "无限产能");
             //判断是否检验成功
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {