Explorar o código

feat:增加运单中止行车日志

wangweiyu %!s(int64=4) %!d(string=hai) anos
pai
achega
8d1369ec17

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

@@ -105,7 +105,7 @@ public class WorkOrderController {
         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));
+        return new Result<>(workOrderService.cancelWorkOrder(param));
     }
 
     @ApiOperation(value = "根据id关闭运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=50")

+ 3 - 1
src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.common.WorkLogTypeEnum;
 import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.param.WorkManagePageParam;
 import com.aoyang.tms.controller.vo.*;
@@ -49,7 +50,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     @Resource
     private TruckMapper truckMapper;
     @Resource
-    private WorkOrderService workOrderService;
+    private WorkLogService workLogService;
     @Resource
     private WorkOrderMapper workOrderMapper;
     @Resource
@@ -272,6 +273,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         }
 
         order.setOrderStatus(WorkOrderEnum.CONCELED.orderStatus());
+        workLogService.logWorkCycleInfo(workOrder.getType() == 1 ? WorkLogTypeEnum.LOAD_CANCELED : WorkLogTypeEnum.UNLOAD_CANCELED, workOrder);
 
         return new Result<>(updateById(order));
     }