feat：运力调度装卸车派单接口

src/main/java/com/aoyang/tms/controller/WorkOrderController.java

@@ -78,25 +78,4 @@ public class WorkOrderController {
         return new Result<>(workOrderService.getById(param));
     }
 
-
-    @ApiOperation(value = "派单", notes = "调度员派单操作")
-    @PostMapping("/add")
-    public Result add(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "修改派单", notes = "根据id修改派单")
-    @PostMapping("/update")
-    public Result update(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.updateById(workOrder);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "取消派单", notes = "取消派单")
-    @PostMapping("/delete")
-    public Result delete(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.updateById(workOrder);
-        return new Result<>(flag);
-    }
 }

src/main/java/com/aoyang/tms/controller/WorkOrderManageController.java

@@ -5,11 +5,17 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
-import com.aoyang.tms.controller.param.Truck;
+import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.param.WorkManagePageParam;
 import com.aoyang.tms.controller.vo.TruckOrderManageVO;
 import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
+import com.aoyang.tms.entity.Truck;
+import com.aoyang.tms.entity.TruckDriver;
+import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.service.TruckDriverService;
+import com.aoyang.tms.service.TruckEscortService;
+import com.aoyang.tms.service.TruckService;
 import com.aoyang.tms.service.WorkOrderService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -21,6 +27,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -39,6 +49,12 @@ public class WorkOrderManageController {
 
     @Resource
     private WorkOrderService workOrderService;
+    @Resource
+    private TruckService truckService;
+    @Resource
+    private TruckEscortService truckEscortService;
+    @Resource
+    private TruckDriverService truckDriverService;
 
     @ApiOperation(value = "获取运力调度列表",notes="")
     @PostMapping("/list")
@@ -58,4 +74,66 @@ public class WorkOrderManageController {
         return new Result<>(workOrderService.getTruckOrderStatistics(orgId));
     }
 
+    @ApiOperation(value = "新增装卸车派单", notes = "调度员派单操作")
+    @PostMapping("/add_order")
+    public Result add(@RequestHeader(value = "orgId") Long orgId,
+                      @RequestHeader(value = "userId") Long userId,
+                      @RequestHeader("userName") String userName,
+                      @RequestBody WorkOrder workOrder) {
+        log.info("运力调度派单，调用/tms/work_order_manage/add_order param:{} ", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getDeptId() == null || workOrder.getSpotId() == null ||
+                workOrder.getTruckId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        workOrder.setOrderStatus(WorkOrderEnum.TODO.orderStatus());
+        workOrder.setOrgId(orgId);
+        Truck truck = truckService.getById(workOrder.getTruckId());
+        workOrder.setOrgId(truck.getOrgId());
+        workOrder.setOrgName(truck.getOrgName());
+        workOrder.setOrgShortName(truck.getOrgShortName());
+        workOrder.setCarNumber(truck.getCarNumber());
+        workOrder.setTrailerNumber(truck.getTrailerNumber());
+        TruckEscort query = new TruckEscort();
+        query.setTruckId(truck.getTruckId());
+        TruckEscort truckEscort = truckEscortService.findTruckEscort(query);
+        if (truckEscort != null) {
+            workOrder.setEscortId(truckEscort.getEscortId());
+            workOrder.setEscortName(truckEscort.getEscortName());
+        }
+        List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(truck.getTruckId());
+        if (truckDrivers != null && truckDrivers.size() > 0) {
+            workOrder.setDriverIdOne(truckDrivers.get(0).getDriverId());
+            workOrder.setDriverNameOne(truckDrivers.get(0).getDriverName());
+            if (truckDrivers.size() > 1) {
+                workOrder.setDriverIdTwo(truckDrivers.get(1).getDriverId());
+                workOrder.setDriverNameOne(truckDrivers.get(1).getDriverName());
+            }
+        }
+        // 创建者信息
+        try {
+            userName = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        workOrder.setCreater(userId);
+        workOrder.setCreaterName(userName);
+        workOrder.setCreateDate(LocalDateTime.now());
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+//    @ApiOperation(value = "修改派单", notes = "根据id修改派单")
+//    @PostMapping("/update_order")
+//    public Result update(@RequestBody WorkOrder workOrder) {
+//        Boolean flag = workOrderService.updateById(workOrder);
+//        return new Result<>(flag);
+//    }
+//
+//    @ApiOperation(value = "取消派单", notes = "取消派单")
+//    @PostMapping("/cancel_order")
+//    public Result delete(@RequestBody WorkOrder workOrder) {
+//        Boolean flag = workOrderService.updateById(workOrder);
+//        return new Result<>(flag);
+//    }
+
+
 }