分切报工

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -138,6 +138,7 @@ public class SearchScheduleData extends BaseData {
     private Double qtytoSchedule; // 排产数量
     private Double timeRequired;  // 预计重检时长
     private boolean directRepackageflag; // 是否是换包装
+    private String sortField;//排序规则
 
     private Double rollCount;
 
@@ -975,4 +976,12 @@ public class SearchScheduleData extends BaseData {
     public void setCheckFlag(boolean checkFlag) {
         this.checkFlag = checkFlag;
     }
+
+    public String getSortField() {
+        return sortField;
+    }
+
+    public void setSortField(String sortField) {
+        this.sortField = sortField;
+    }
 }

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

@@ -1955,7 +1955,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
         //判断是否有主材上机
         if (sfdcMaterialList.size() == 0) {
-            throw new RRException("为扫描主材不可结束卷!");
+            throw new RRException("未扫描主材不可结束卷!");
         }
         //1.调用存储过程 校验工单 派工单 上机卷 信息是否符合条件
         Map<String, Object> checkMap1 = this.checkFinishRollWithScheduleOpsShift(site, orderNo, itemNo, seqNo, rollNo, scheduledDate, shiftNo);
@@ -3123,7 +3123,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         this.checkCreateSplitSfdcRoll(inData);
 
         //存储过程 调用存储过程  创建分卷
-        Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, username);
+        Map<String, Object> resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId);
         //判断结果是否成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {
@@ -3139,7 +3139,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @DateTime 2022/2/17 14:51
      * @Param [site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, username]
      **/
-    public Map<String, Object> workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String username) {
+    public Map<String, Object> workBenchCreateSlittingRollAction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float rollQty, Integer rollNums, String operatorId) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -3148,7 +3148,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(rollNo);
         params.add(rollQty);
         params.add(rollNums);
-        params.add(username);
+        params.add(operatorId);
         //调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_action", params);
         //处理返回的结果
@@ -3325,7 +3325,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
         //判断是否有主材上机
         if (sfdcMaterialList.size() == 0) {
-            throw new RRException("为扫描主材不可结束卷!");
+            throw new RRException("未扫描主材不可结束卷!");
         }
         //1.调用存储过程 校验工单 派工单 上机卷 信息是否符合条件
         Map<String, Object> checkMap1 = this.checkFinishRollWithScheduleOpsShift(site, orderNo, itemNo, seqNo, rollNo, scheduledDate, shiftNo);
@@ -4049,7 +4049,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
         //判断是否有主材上机
         if (sfdcMaterialList.size() == 0) {
-            throw new RRException("为扫描主材不可结束卷!");
+            throw new RRException("未扫描主材不可结束卷!");
         }
         //1.调用存储过程 校验工单 派工单 上机卷 信息是否符合条件
         Map<String, Object> checkMap1 = this.checkFinishRollWithScheduleOpsShift(site, orderNo, itemNo, seqNo, rollNo, scheduledDate, shiftNo);

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -117,7 +117,19 @@
             </if>
             AND dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) like '%' + #{resourceId} + '(%'
         </where>
-        Order by D.NeedDate
+        /*设置排序规则*/
+        <if test="sortField == null || sortField == ''">
+            Order by D.NeedDate
+        </if>
+        <if test="sortField != null and sortField == 'needDate'">
+            Order by D.NeedDate
+        </if>
+        <if test="sortField != null and sortField == 'orderNo'">
+            Order by T.OrderNo
+        </if>
+        <if test="sortField != null and sortField == 'partNo'">
+            Order by T.PartNo
+        </if>
     </select>
 
     <!--按照条件查询工单的数据-->

src/main/resources/mapper/schedule/SchedulingMapper.xml

@@ -202,7 +202,19 @@
             </if>
             AND T.WorkCenterNo <![CDATA[<>]]> 'FQC'
         </where>
-        Order by D.NeedDate
+        /*设置排序规则*/
+        <if test="sortField == null || sortField == ''">
+            Order by D.NeedDate
+        </if>
+        <if test="sortField != null and sortField == 'needDate'">
+            Order by D.NeedDate
+        </if>
+        <if test="sortField != null and sortField == 'orderNo'">
+            Order by T.OrderNo
+        </if>
+        <if test="sortField != null and sortField == 'partNo'">
+            Order by T.PartNo
+        </if>
     </select>