2022-08-17 查询-生产排产单 取消排产操作

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

@@ -570,6 +570,20 @@ public class SchedulingController {
                 .put("authMap", authMap);
     }
 
+    /**
+     * @Author LR
+     * @Description 派工单查询--》取消排产操作
+     * @DateTime  2022/8/17 13:58
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "cancelScheduleWithScheduleQuery")
+    public R cancelScheduleWithScheduleQuery(@RequestBody SearchScheduleData inData){
+        schedulingService.cancelScheduleWithScheduleQuery(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
 
 
 }

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

@@ -155,6 +155,8 @@ public class SearchScheduleData extends BaseData {
 
     private int rollCount;
 
+    private Float lotSize;//具体对应的字段 2022-08-17
+
     public int getRollCount() {
         return rollCount;
     }
@@ -1093,4 +1095,12 @@ public class SearchScheduleData extends BaseData {
     public void setToolIssueFlag(String toolIssueFlag) {
         this.toolIssueFlag = toolIssueFlag;
     }
+
+    public Float getLotSize() {
+        return lotSize;
+    }
+
+    public void setLotSize(Float lotSize) {
+        this.lotSize = lotSize;
+    }
 }

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

@@ -330,4 +330,12 @@ public interface SchedulingService {
     Map<String, Object> getScheduleMultiReportSpecialAuth(SearchScheduleData inData);
 
 
+    /**
+     * @Author LR
+     * @Description 派工单查询--》取消排产操作
+     * @DateTime  2022/8/17 13:58
+     * @Param [inData]
+     * @return void
+     **/
+    void cancelScheduleWithScheduleQuery(SearchScheduleData inData);
 }

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

@@ -1096,4 +1096,79 @@ public class SchedulingServiceImpl implements SchedulingService {
         return resultList.get(0);
     }
 
+    @Override
+    @Transactional
+    public void cancelScheduleWithScheduleQuery(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        int itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String workCenterNo = inData.getWorkCenterNo();
+        String resourceId = inData.getResourceId();
+        Float lotSize = inData.getLotSize();
+        int scheduleSeqNo = inData.getScheduleSeqNo();
+        Date planStartTime = inData.getPlanStartTime();
+
+         //1.调用检查的存储过程 --判断是否可以取消
+        Map<String, Object> checkMap = this.checkCancelScheduleWithScheduleQuery(site, orderNo, itemNo, seqNo);
+        //判断是否通过验证
+        String checkCode = String.valueOf(checkMap.get("resultCode"));
+        if (!"200".equalsIgnoreCase(checkCode)) {
+            String msg = String.valueOf(checkMap.get("resultMsg"));
+            throw new XJException(msg, Integer.parseInt(checkCode));
+        }
+
+        //2.调用检查的存储过程 --取消排产
+        this.cancelScheduleWithScheduleQuery(site, orderNo, itemNo, seqNo, workCenterNo, resourceId, lotSize);
+
+        //3.调用存储过程  处理排序的操作
+        //执行存储过程  --刷新排产的时间和序号的存储过程
+        Map<String, Object> refreshMap = this.cancelSoScheduleRefreshJob(site, workCenterNo, resourceId, scheduleSeqNo, planStartTime);
+        //判断是否检验成功
+        String refreshCode = String.valueOf(refreshMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(refreshCode)) {
+            String msg = String.valueOf(refreshMap.get("resultMsg"));
+            throw new XJException(msg);
+        }
+
+    }
+
+    /**
+     * @Author LR
+     * @Description查询派工单--取消排产操作
+     * @DateTime  2022/8/17 14:39
+     * @Param [site, orderNo, itemNo, seqNo, workCenterNo, resourceId, lotSize]
+     * @return void
+     **/
+    public void cancelScheduleWithScheduleQuery(String site, String orderNo, int itemNo, String seqNo, String workCenterNo, String resourceId, Float lotSize) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(workCenterNo);
+        params.add(resourceId);
+        params.add(lotSize);
+        //执行存储过程
+        procedureMapper.getProcedureData("cancelScheduleWithScheduleQuery", params);
+    }
+
+    /**
+     * @Author LR
+     * @Description 查询派工单--取消排产检查校验
+     * @DateTime  2022/8/17 14:26
+     * @Param [site, orderNo, itemNo, seqNo]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    public Map<String, Object> checkCancelScheduleWithScheduleQuery(String site, String orderNo, int itemNo, String seqNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkCancelScheduleWithScheduleQuery", params);
+        return resultList.get(0);
+    }
+
 }