chengang преди 4 години
родител
ревизия
a9431dd813
променени са 2 файла, в които са добавени 58 реда и са изтрити 1 реда
  1. 16 1
      src/main/java/com/aoyang/tms/common/ErrCodeEnum.java
  2. 42 0
      src/main/java/com/aoyang/tms/controller/WorkOrderController.java

+ 16 - 1
src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -329,7 +329,22 @@ public enum ErrCodeEnum {
     /**
      * 该部门下面存在卡车
      */
-    DEPARTMENT_EXIST_TRUCK(2309, "该部门下面存在卡车")
+    DEPARTMENT_EXIST_TRUCK(2309, "该部门下面存在卡车"),
+
+    /**
+     * 该运单状态下不允许中止
+     */
+    NO_STOP(2310, "该运单状态下不允许中止"),
+
+    /**
+     * 已完成运单状态下才允许关闭
+     */
+    NO_CLOSE(2311, "已完成运单状态下才允许关闭"),
+
+    /**
+     * 该运单状态下不修改
+     */
+    NO_UPDATE(2312, "该运单状态下不修改")
     ;
 
     private int code;

+ 42 - 0
src/main/java/com/aoyang/tms/controller/WorkOrderController.java

@@ -78,4 +78,46 @@ public class WorkOrderController {
         return new Result<>(workOrderService.getById(param));
     }
 
+    @ApiOperation(value = "根据id中止运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=60")
+    @PostMapping("/stop")
+    public Result stop(@RequestBody WorkOrder param) {
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/stop,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null || param.getOrderStatus() != 60) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkOrder workOrder = workOrderService.getById(param);
+        if (workOrder.getOrderStatus() != 0 && workOrder.getOrderStatus() != 10 && workOrder.getOrderStatus() != 20) {
+            return new Result<>(ErrCodeEnum.NO_STOP.getCode(), ErrCodeEnum.NO_STOP.getMessage());
+        }
+        return new Result<>(workOrderService.saveOrUpdate(param));
+    }
+
+    @ApiOperation(value = "根据id关闭运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=50")
+    @PostMapping("/close")
+    public Result close(@RequestBody WorkOrder param) {
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/close,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkOrder workOrder = workOrderService.getById(param);
+        if (workOrder.getOrderStatus() != 40) {
+            return new Result<>(ErrCodeEnum.NO_CLOSE.getCode(), ErrCodeEnum.NO_CLOSE.getMessage());
+        }
+        return new Result<>(workOrderService.saveOrUpdate(param));
+    }
+
+    @ApiOperation(value = "根据id修改运单(运单分页列表PC端,已完成40已关闭50运单可改)", notes = "必传参数:id,orderStatus=60")
+    @PostMapping("/pc_update")
+    public Result pcUpdate(@RequestBody WorkOrder param) {
+        log.info("根据id修改运单(运单分页列表PC端,已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkOrder workOrder = workOrderService.getById(param);
+        if (workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
+            return new Result<>(ErrCodeEnum.NO_UPDATE.getCode(), ErrCodeEnum.NO_UPDATE.getMessage());
+        }
+        return new Result<>(workOrderService.saveOrUpdate(param));
+    }
+
 }