运输服务bugfix

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

@@ -11,6 +11,7 @@ import com.sckw.transport.service.AcceptCarriageOrderService;
 import com.sckw.transport.service.TransportCommonService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,7 +122,7 @@ public class AcceptCarriageOrderController {
      * @return
      */
     @RequestMapping(value = "/subcontractConsignmentOrderDetail", method = RequestMethod.GET)
-    public HttpResult subcontractConsignmentOrderDetail(@NotBlank(message = "物流订单不能为空") @RequestParam("id") String id) {
+    public HttpResult subcontractConsignmentOrderDetail(@NotNull(message = "物流订单不能为空") @RequestParam("id") String id) {
         try {
             return acceptCarriageOrderService.subcontractConsignmentOrderDetail(id);
         } catch (Exception e) {
@@ -138,7 +139,7 @@ public class AcceptCarriageOrderController {
      * @return
      */
     @RequestMapping(value = "/getWaybillData", method = RequestMethod.GET)
-    public HttpResult getWaybillData(@NotBlank(message = "物流订单id不能为空") @RequestParam("wOrderId") String wOrderId) {
+    public HttpResult getWaybillData(@NotNull(message = "物流订单id不能为空") @RequestParam("wOrderId") String wOrderId) {
         try {
             return acceptCarriageOrderService.getWaybillData(wOrderId);
         } catch (Exception e) {
@@ -158,8 +159,8 @@ public class AcceptCarriageOrderController {
      */
     @RequestMapping(value = "/getSubcontractConsignment", method = RequestMethod.GET)
     public HttpResult getSubcontractConsignment(@RequestParam("lOrderId") @NotBlank(message = "单据id不能为空") String lOrderId,
-                                                @RequestParam("page") @NotBlank(message = "分页不能为空") int page,
-                                                @RequestParam("pageSize") @NotBlank(message = "分页条数不能为空") int pageSize) {
+                                                @RequestParam("page") @NotNull(message = "分页不能为空") int page,
+                                                @RequestParam("pageSize") @NotNull(message = "分页条数不能为空") int pageSize) {
         try {
             return acceptCarriageOrderService.getSubcontractConsignment(lOrderId, page, pageSize);
         } catch (Exception e) {
@@ -272,7 +273,7 @@ public class AcceptCarriageOrderController {
      * @return
      */
     @RequestMapping(value = "/getCancelReason", method = RequestMethod.GET)
-    public HttpResult getCancelReason(@Valid @NotBlank(message = "物流订单id不能为空") @RequestParam("id") String id) {
+    public HttpResult getCancelReason(@NotBlank(message = "物流订单id不能为空") @RequestParam("id") String id) {
         try {
             return acceptCarriageOrderService.getCancelReason(id);
         } catch (Exception e) {

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

@@ -70,7 +70,7 @@ public class ConsignOrderController {
      * @return
      */
     @RequestMapping(value = "/getRejectReason", method = RequestMethod.GET)
-    public HttpResult getRejectReasonById(@Validated @NotNull @RequestParam("id") String id) {
+    public HttpResult getRejectReasonById(@Validated @NotBlank @RequestParam("id") String id) {
         return consignOrderService.getRejectReasonById(id);
     }
 
@@ -96,7 +96,7 @@ public class ConsignOrderController {
      * @return
      */
     @RequestMapping(value = "/consignOrderFinishDetail", method = RequestMethod.GET)
-    public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
+    public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
         log.info("托运订单-完结订单-页面数据查询 传递参数信息:{}", orderId);
         try {
             return consignOrderService.consignOrderFinishDetail(orderId);

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

@@ -118,8 +118,8 @@ public class LogisticsConsignmentController {
     @Validated
     @RequestMapping(value = "/purchaseLogisticsCar", method = RequestMethod.GET)
     public HttpResult purchaseLogisticsCar(@RequestParam("id") @NotBlank(message = "单据id不能为空") String id,
-                                           @RequestParam("page") @NotBlank(message = "当前页不能为空") int page,
-                                           @RequestParam("pageSize") @NotBlank(message = "每页条数不能为空") int pageSize) {
+                                           @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
+                                           @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
         log.info("采购订单-车辆详情 传递参数信息:{}", id);
         try {
             return logisticsConsignmentService.purchaseLogisticsCar(id, page, pageSize);
@@ -191,8 +191,8 @@ public class LogisticsConsignmentController {
      */
     @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.GET)
     public HttpResult sellLogisticsOrder(@RequestParam("id") @NotBlank(message = "单据id不能为空") String id,
-                                         @RequestParam("page") @NotBlank(message = "当前页不能为空") int page,
-                                         @RequestParam("pageSize") @NotBlank(message = "每页条数不能为空") int pageSize) {
+                                         @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
+                                         @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
         log.info("销售订单-托运订单列表 传递参数信息:{}", id);
         try {
             return logisticsConsignmentService.logisticsOrder(id, page, pageSize, "2");
@@ -227,8 +227,8 @@ public class LogisticsConsignmentController {
      */
     @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.GET)
     public HttpResult sellLogisticsCar(@RequestParam("id") @NotBlank(message = "单据id不能为空") String id,
-                                       @RequestParam("page") @NotBlank(message = "当前页不能为空") int page,
-                                       @RequestParam("pageSize") @NotBlank(message = "每页条数不能为空") int pageSize) {
+                                       @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
+                                       @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
         log.info("销售订单-车辆列表 传递参数信息:{}", id);
         try {
             return logisticsConsignmentService.sellLogisticsCar(id, page, pageSize);
@@ -264,7 +264,7 @@ public class LogisticsConsignmentController {
      */
     @Validated
     @RequestMapping(value = "/selectSellOrderFinish", method = RequestMethod.GET)
-    public HttpResult selectSellOrderFinish(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
+    public HttpResult selectSellOrderFinish(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
         log.info("销售订单-托运订单列表-订单完结-数据查询 传递参数信息:{}", orderId);
         try {
             return logisticsConsignmentService.selectOrderFinishVo(orderId, "2");

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

@@ -574,7 +574,7 @@ public class LogisticsConsignmentService {
         if (String.valueOf(NumberConstant.ONE).equals(type)) {
             //采购
             httpResult = logisticsOrderList(id, page, pageSize, type);
-        } else if (String.valueOf(NumberConstant.ONE).equals(type)) {
+        } else if (String.valueOf(NumberConstant.TWO).equals(type)) {
             //销售
             httpResult = logisticsOrderList(id, page, pageSize, type);
         } else {