提交物流订单相关接口

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfFleetService.java

@@ -244,8 +244,9 @@ public class KwfFleetService {
         }
 
         Map<Long, List<KwfFleetTruck>> finalFleetIdAndKwfFleetTruckList = fleetIdAndKwfFleetTruckList;
+        Map<Long, KwfTruck> finalTruckIdAndTruckMap = truckIdAndTruckMap;
         List<QueryFleetResp> fleets = records.stream()
-                .map(item -> getQueryFleetResp(item, userIdAndUserCacheResDtoMap, finalFleetIdAndKwfFleetTruckList,truckIdAndTruckMap))
+                .map(item -> getQueryFleetResp(item, userIdAndUserCacheResDtoMap, finalFleetIdAndKwfFleetTruckList, finalTruckIdAndTruckMap))
                 .toList();
         return PageDataResult.of(page, fleets);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/KwsEnterpriseRepository.java

@@ -23,22 +23,22 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
     public IPage<KwsEnterprise> pageEnt(int pageNum, int pageSize, Long entId) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
+                .eq(BaseModel::getStatus,0)
                 .eq(Objects.nonNull(entId),KwsEnterprise::getId, entId));
     }
 
     public List<KwsEnterprise> queryByEntIdAndName(String entId, String entName) {
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
-                .and(StringUtils.isNotBlank(entId), wrapper -> wrapper
-                        .eq(BaseModel::getId, entId)
-                        .or()
-                        .eq(KwsEnterprise::getId, entId))
+                .eq(BaseModel::getStatus, 0)
+                .eq(StringUtils.isNotBlank(entId), KwsEnterprise::getId, entId)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }
 
     public List<KwsEnterprise> queryByEntIds(Set<Long> entIds,String entName) {
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
+                .eq(BaseModel::getStatus, 0)
                 .in(KwsEnterprise::getId, entIds)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }

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

@@ -175,4 +175,12 @@ public class KwtLogisticsOrderController {
         return BaseResult.success(logisticsConsignmentService.closeCapacity(req));
     }
 
+    /**
+     * 派车
+     */
+    @PostMapping("/dispatchCar")
+    @Operation(summary = "派车", description = "派车")
+    public BaseResult<DispatchCarResp> dispatchCar(@RequestBody @Valid DispatchCarReq req) {
+        return BaseResult.success(logisticsConsignmentService.dispatchCar(req));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.sckw.transport.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -28,7 +29,7 @@ public class DeleteCapacityReq implements Serializable {
     /**
      * 物流订单id
      */
-    @NotNull(message = "物流订单id")
+    @NotEmpty(message = "物流订单id不能为空")
     @Schema(description = "物流订单id")
     private List<String> logisticsOrderIds;
     /**

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

@@ -0,0 +1,40 @@
+package com.sckw.transport.model.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description : 派车请求参数
+ * @create :2025-11-14 10:01:00
+ */
+@Data
+public class DispatchCarReq implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -8280142385536425018L;
+    /**
+     * 物流订单id
+     */
+    @Schema(description = "物流订单id")
+    @NotBlank(message = "物流订单id不能为空")
+    private String logisticOrderId;
+    /**
+     * 企业id
+     */
+    @Schema(description = "企业id")
+    @NotBlank(message = "企业id不能为空")
+    private String entId;
+    /**
+     * 车辆id列表
+     */
+    @Schema(description = "车辆id")
+    @NotEmpty(message = "车辆id列表")
+    private List<String> truckId;
+}

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

@@ -0,0 +1,19 @@
+package com.sckw.transport.model.vo;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description :
+ * @create :2025-11-14 10:23:00
+ */
+public class DispatchCarResp implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 5084673710895915098L;
+    /**
+     * 成功条数
+     */
+    private String successCount;
+}

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

@@ -2770,4 +2770,9 @@ public class KwtLogisticsConsignmentService {
 
         return logisticsOrderCirculateRepository.updateCirculates(orderCirculates);
     }
+
+    public DispatchCarResp dispatchCar(@Valid DispatchCarReq req) {
+
+        return null;
+    }
 }