11

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -410,4 +410,15 @@ public class DailyPlanController {
 
         return dailyPlanService.saveGenerateReportForSchedule(generateReportData);
     }
+
+    /**
+     * 取消派工单
+     * @param inData
+     * @return
+     */
+    @PostMapping("/cancelJob")
+    public R cancelJob(@RequestBody SOScheduledRoutingOutData inData){
+       dailyPlanService.cancelJob(inData);
+        return R.ok();
+    }
 }

src/main/java/com/heai/modules/production/service/DailyPlanService.java

@@ -327,4 +327,16 @@ public interface DailyPlanService  {
      * @throw
      */
     List<SOScheduledRoutingOutData> getSOScheduleRoutingData(SOScheduledRoutingOutData inData);
+
+    /**
+     * @Description 取消派工单
+     * @Title cancelJob
+     * @param inData
+     * @author rq
+     * @date 2022/8/3 15:19
+     * @return List<SOScheduledRoutingOutData>
+     * @throw
+     */
+    void cancelJob(SOScheduledRoutingOutData inData);
+
 }

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -656,4 +656,24 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     public List<SOScheduledRoutingOutData> getSOScheduleRoutingData(SOScheduledRoutingOutData inData){
         return dailyPlanMapper.getSOScheduleRoutingData(inData);
     }
+
+    @Override
+    public void cancelJob(SOScheduledRoutingOutData inData){
+        List<Object> params = new ArrayList<>();
+        params.add(inData.getSite());
+        params.add(inData.getOrderRef1());
+        params.add(inData.getItemNo());
+        params.add(inData.getSeqNo());
+        params.add(inData.getsWorkCenterNo());
+        params.add(inData.getsResourceID());
+        params.add(inData.getQtyRequired());
+
+        List<Map<String, Object>> resultList = functionMapper.getProcedureData("soschedule_canceljob", params);
+        Map<String ,Object> map = resultList.get(0);
+        if(map == null){
+            throw new RuntimeException("返回结果错误！");
+        }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  != 200) {
+            throw new RuntimeException(String.valueOf(map.get("resultMsg")));
+        }
+    }
 }

src/main/java/com/heai/modules/sys/entity/SysRoleEntity.java

@@ -39,7 +39,6 @@ public class SysRoleEntity implements Serializable {
 	 * 备注
 	 */
 	private String remark;
-	
 	/**
 	 * 创建者ID
 	 */