0820-需求变更

ktg-weixin/src/main/java/com/ktg/weixin/controller/ApiProController.java

@@ -6,6 +6,7 @@ import com.ktg.common.core.domain.entity.SysUser;
 import com.ktg.common.utils.SecurityUtils;
 import com.ktg.mes.dv.service.IDvMachineryService;
 import com.ktg.mes.dv.vo.res.DvMachineryResponse;
+import com.ktg.mes.pro.domain.ProMachineryJob;
 import com.ktg.mes.pro.service.IProMachineryJobService;
 import com.ktg.mes.pro.service.IProWorkorderService;
 import com.ktg.mes.pro.vo.req.*;
@@ -102,6 +103,25 @@ public class ApiProController extends BaseController {
         }
     }
 
+    /**
+     * 撤销
+     * @param jobId
+     * @return
+     */
+    @GetMapping("/cancel/{jobId}")
+    public AjaxResult cancelWorkorder(@PathVariable Long jobId) {
+        try {
+            SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+            int result = proMachineryJobService.cancel(jobId, currentUser);
+            if (result > 0) {
+                return AjaxResult.success("撤销成功");
+            }
+            return AjaxResult.success("撤销失败");
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
     /**
      * 步骤1-加料
      */
@@ -349,5 +369,4 @@ public class ApiProController extends BaseController {
         }
     }
 
-
 }