2025-10-13

生产派工单列表 上移操作

src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java

@@ -637,4 +637,30 @@ public class SchedulingController extends AbstractController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * @Author AI
+     * @Description 派工单上移
+     * @Date 2025/10/13
+     * @Param inData
+     * @return R
+     **/
+    @PostMapping(value = "resortJobUp")
+    public R resortJobUp(@RequestBody SearchScheduleData inData){
+        schedulingService.resortJobUp(inData);
+        return R.ok("上移成功，请刷新数据！");
+    }
+
+    /**
+     * @Author AI
+     * @Description 派工单下移
+     * @Date 2025/10/13
+     * @Param inData
+     * @return R
+     **/
+    @PostMapping(value = "resortJobDown")
+    public R resortJobDown(@RequestBody SearchScheduleData inData){
+        schedulingService.resortJobDown(inData);
+        return R.ok("下移成功，请刷新数据！");
+    }
+
 }

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

@@ -163,6 +163,8 @@ public class SearchScheduleData extends BaseData {
     private Float lotSize;//具体对应的字段 2022-08-17
 
     private Integer moveScheduleSeqNo; // 移动到的派工单位置
+    
+    private String resortDirection; // 调整方向 S向上 D向下
 
     public String getDirectRepackageflag() {
         return directRepackageflag;
@@ -1146,4 +1148,12 @@ public class SearchScheduleData extends BaseData {
     public void setExportFlag(String exportFlag) {
         this.exportFlag = exportFlag;
     }
+
+    public String getResortDirection() {
+        return resortDirection;
+    }
+
+    public void setResortDirection(String resortDirection) {
+        this.resortDirection = resortDirection;
+    }
 }

src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java

@@ -382,4 +382,22 @@ public interface SchedulingService {
      */
     void saveProductionReportAndDefect(String site, String orderNo, Float itemNo, Integer seqNo, 
                                        String rollNo, String operator, List<ProductionReportData> reportList);
+
+    /**
+     * @Author AI
+     * @Description 派工单上移
+     * @DateTime 2025-10-13
+     * @Param [inData]
+     * @return void
+     **/
+    void resortJobUp(SearchScheduleData inData);
+
+    /**
+     * @Author AI
+     * @Description 派工单下移
+     * @DateTime 2025-10-13
+     * @Param [inData]
+     * @return void
+     **/
+    void resortJobDown(SearchScheduleData inData);
 }

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

@@ -1388,4 +1388,68 @@ public class SchedulingServiceImpl implements SchedulingService {
             schedulingMapper.batchInsertSfdcDefectHist(defectList);
         }
     }
+
+    @Override
+    @Transactional
+    public void resortJobUp(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String workCenterNo = inData.getWorkCenterNo();
+        String resourceId = inData.getResourceId();
+        Integer scheduledSeqNo = inData.getScheduleSeqNo();
+        String resortDirection = "S"; // 向上
+
+        //调用存储过程
+        Map<String, Object> resultMap = this.resortJobNormal(site, workCenterNo, resourceId, scheduledSeqNo, resortDirection);
+        //判断是否检验成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            String objectId = String.valueOf(resultMap.get("objectId"));
+            throw new XJException(msg,objectId);
+        }
+    }
+
+    @Override
+    @Transactional
+    public void resortJobDown(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String workCenterNo = inData.getWorkCenterNo();
+        String resourceId = inData.getResourceId();
+        Integer scheduledSeqNo = inData.getScheduleSeqNo();
+        String resortDirection = "D"; // 向下
+
+        //调用存储过程
+        Map<String, Object> resultMap = this.resortJobNormal(site, workCenterNo, resourceId, scheduledSeqNo, resortDirection);
+        //判断是否检验成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            String objectId = String.valueOf(resultMap.get("objectId"));
+            throw new XJException(msg,objectId);
+        }
+    }
+
+    /**
+     * @Author AI
+     * @Description 调用派工单上移下移存储过程
+     * @DateTime 2025-10-13
+     * @Param [site, workCenterNo, resourceId, scheduledSeqNo, resortDirection]
+     * @return void
+     **/
+    public Map<String, Object> resortJobNormal(String site, String workCenterNo, String resourceId, Integer scheduledSeqNo, String resortDirection) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(workCenterNo);
+        params.add(resourceId);
+        params.add(scheduledSeqNo);
+        params.add(resortDirection);
+        
+        //执行存储过程
+        String procedureName = "S".equals(resortDirection) ? "soschedule_resortjob_normal_Up" : "soschedule_resortjob_normal_Down";
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData(procedureName, params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
 }

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

@@ -263,7 +263,7 @@
                 and T.ClosedFlag = #{closedFlag}
             </if>
         </where>
-        Order by T.PlanStartTime ASC, T.PlanFinishTime desc
+        Order by  E.S_ScheduledSeqNo asc
     </select>
 
     <!--查询操作员信息列表-->

src/main/resources/mapper/shopOrder/ShopOrderMapper.xml

@@ -208,6 +208,7 @@
                 AND dateadd( DAY, 1, #{date6} ) > T.PlanFinishTime
             </if>
             ${sql}
+                order  by d.bu_no, T.S_ResourceID,E.S_ScheduledSeqNo
         </where>
     </select>
     <select id="searchShopOrder" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrder">