采购订单-销售订单-查询车辆列表信息

采购订单-销售订单-查询托运列表

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

@@ -115,7 +115,7 @@ public class LogisticsConsignmentController {
     }
 
     /**
-     * 采购订单-车辆信息-销售订单id
+     * 采购订单-车辆信息-销售订单ids
      *
      * @param ids      销售订单ids
      * @param page
@@ -193,16 +193,16 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-托运订单列表-销售订单id
      *
-     * @param id 销售订单id
+     * @param ids 销售订单id
      * @return
      */
     @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.GET)
-    public HttpResult sellLogisticsOrder(@RequestParam("id") @NotBlank(message = "单据id不能为空") String id,
+    public HttpResult sellLogisticsOrder(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
                                          @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
                                          @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("销售订单-托运订单列表 传递参数信息:{}", id);
+        log.info("销售订单-托运订单列表 传递参数信息:{}", ids);
         try {
-            return logisticsConsignmentService.logisticsOrder(id, page, pageSize, "2");
+            return logisticsConsignmentService.logisticsOrder(ids, page, pageSize, "2");
         } catch (Exception e) {
             log.error("销售订单-托运订单列表 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -230,16 +230,16 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-车辆列表-销售订单id
      *
-     * @param id 销售订单id
+     * @param ids 销售订单ids
      * @return
      */
     @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.GET)
-    public HttpResult sellLogisticsCar(@RequestParam("id") @NotBlank(message = "单据id不能为空") String id,
+    public HttpResult sellLogisticsCar(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
                                        @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
                                        @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("销售订单-车辆列表 传递参数信息:{}", id);
+        log.info("销售订单-车辆列表 传递参数信息:{}", ids);
         try {
-            return logisticsConsignmentService.sellLogisticsCar(id, page, pageSize);
+            return logisticsConsignmentService.sellLogisticsCar(ids, page, pageSize);
         } catch (Exception e) {
             log.error("销售订单-车辆列表 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -255,7 +255,7 @@ public class LogisticsConsignmentController {
     @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.GET)
     @GlobalTransactional(name = "default_tx_group")
     public HttpResult sellCancelConsign(@RequestParam("ids") @NotBlank(message = "单据id不能为空") List<String> ids) {
-        log.info("销售订单-车辆列表 传递参数信息:{}", JSONObject.toJSONString(ids));
+        log.info("销售订单-托运订单列表-撤销托运:{}", JSONObject.toJSONString(ids));
         try {
             return logisticsConsignmentService.cancelConsign(ids, "2");
         } catch (Exception e) {

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

@@ -602,6 +602,7 @@ public class LogisticsConsignmentService {
             return HttpResult.ok();
         }
         List<LogisticsOrderDTO> returnList = new ArrayList<>();
+        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : stringList) {
             OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
             /**
@@ -692,6 +693,7 @@ public class LogisticsConsignmentService {
         if (CollectionUtils.isEmpty(stringList)) {
             return HttpResult.ok();
         }
+        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         List<LogisticsOrderDTO> returnList = new ArrayList<>();
         for (String id : stringList) {
             OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
@@ -768,6 +770,7 @@ public class LogisticsConsignmentService {
             return HttpResult.ok();
         }
         List<OrderCarDTO> returnList = new ArrayList<>();
+        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : stringList) {
             List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
@@ -823,6 +826,7 @@ public class LogisticsConsignmentService {
             return HttpResult.ok();
         }
         List<OrderCarDTO> returnList = new ArrayList<>();
+        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : stringList) {
             List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());