代码新提交controller定义

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageLogisticsController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/acceptCarriageLogistics")
+@RequestMapping(value = "/kwtAcceptCarriageLogistics")
 public class AcceptCarriageLogisticsController {
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/acceptCarriageOrder")
+@RequestMapping(value = "/kwtAcceptCarriageOrder")
 public class AcceptCarriageOrderController {
 
     @Autowired
@@ -30,7 +30,7 @@ public class AcceptCarriageOrderController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/kwtList", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderList(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.list(query);
@@ -44,7 +44,7 @@ public class AcceptCarriageOrderController {
      * 承运订单首页统计查询
      * @return
      */
-    @RequestMapping(value = "/count", method = RequestMethod.GET)
+    @RequestMapping(value = "/kwtCount", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderCount(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.count(query);
@@ -59,7 +59,7 @@ public class AcceptCarriageOrderController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
+    @RequestMapping(value = "/kwtSubcontractConsignment", method = RequestMethod.POST)
     public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.subcontractConsignment(query);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignLogisticsController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/consignLogistics")
+@RequestMapping(value = "/kwtConsignLogistics")
 public class ConsignLogisticsController {
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/consignOrder")
+@RequestMapping(value = "/kwtConsignOrder")
 public class ConsignOrderController {
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -13,27 +13,42 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author lfdc
- * @description 托运订单/承运订单-物流托运Controller
+ * @description 采购订单/销售订单-物流托运Controller
  * @date 2023-06-28 11:06:06
  */
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/logisticsConsignment")
+@RequestMapping(value = "/kwtLogisticsConsignment")
 public class LogisticsConsignmentController {
 
     @Autowired
     LogisticsConsignmentService logisticsConsignmentService;
 
     /**
-     * 托运订单/承运订单-物流托运
+     * 采购订单-物流托运
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
-    public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
+    @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
+    public HttpResult purchaseLogisticsConsignment(AcceptCarriageOrderQuery query) {
         try {
-            return logisticsConsignmentService.subcontractConsignment(query);
+            return logisticsConsignmentService.purchaseLogisticsConsignment(query);
+        } catch (Exception e) {
+            log.error("物流托运 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+    /**
+     * 销售订单-物流托运
+     * @param query 查询参数
+     * @return
+     */
+    @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
+    public HttpResult sellLogisticsConsignment(AcceptCarriageOrderQuery query) {
+        try {
+            return logisticsConsignmentService.sellLogisticsConsignment(query);
         } catch (Exception e) {
             log.error("物流托运 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/WaybillManagementController.java

@@ -0,0 +1,20 @@
+package com.sckw.transport.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 运单管理controller
+ * @date 2023-07-05 10:07:50
+ */
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/kwtWaybillManagement")
+public class WaybillManagementController {
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/AcceptCarriageOrderQuery.java

@@ -4,6 +4,7 @@ import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lfdc
@@ -12,6 +13,7 @@ import java.io.Serializable;
  */
 @Data
 public class AcceptCarriageOrderQuery extends PageRequest implements Serializable {
+    private List<String> ids;
     /**
      * 订单id
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVo.java

@@ -102,7 +102,7 @@ public class AcceptCarriageOrderVo {
     /**
      * 计划收货时间
      */
-    private String ReceiveGoodsDate;
+    private String receiveGoodsDate;
     /**
      * 合同
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVo.java

@@ -15,9 +15,9 @@ public class CarWaybillVo {
      */
     private String waybillNumber;
     /**
-     * 车辆
+     * 车牌号
      */
-    private String carNumber;
+    private String truckNo;
     /**
      * 状态
      */
@@ -29,7 +29,7 @@ public class CarWaybillVo {
     /**
      * 司机
      */
-    private String driver;
+    private String driverName;
     /**
      * 承运车队
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignmentVo.java

@@ -105,7 +105,7 @@ public class ConsignmentVo {
     /**
      * 计划收货时间
      */
-    private String ReceiveGoodsDate;
+    private String receiveGoodsDate;
     /**
      * 承运订单号
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -13,8 +13,11 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class LogisticsConsignmentService {
+    public HttpResult purchaseLogisticsConsignment(AcceptCarriageOrderQuery query) {
+        return null;
+    }
 
-    public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
+    public HttpResult sellLogisticsConsignment(AcceptCarriageOrderQuery query) {
         return null;
     }