车辆管理

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckAxleNumController.java

@@ -5,8 +5,10 @@ import com.sckw.core.web.response.BaseResult;
 import com.sckw.fleet.model.request.TruckAxleNumUpdateParam;
 import com.sckw.fleet.model.vo.TruckAxleNumVO;
 import com.sckw.fleet.service.KwfTruckAxleNumService;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,7 +43,7 @@ public class KwfTruckAxleNumController {
      * @return
      */
     @PostMapping("/updateTruckAxleNum")
-    public BaseResult updateTruckAxleNum(TruckAxleNumUpdateParam param) {
+    public BaseResult updateTruckAxleNum(@RequestBody @Valid TruckAxleNumUpdateParam param) {
         kwfTruckAxleNumService.updateTruckAxleNum(param);
         return BaseResult.success();
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -402,13 +402,13 @@ public class KwfTruckController {
     /**
      * 车辆详情
      *
-     * @param id
+     * @param param
      * @return
      */
     @Operation(summary = "车辆详情", description = "车辆详情")
     @PostMapping("/truckDetail")
-    public BaseResult<TruckDetailResp> truckDetail(Long id){
-        TruckDetailResp truckDetailResp = truckService.truckDetail(id);
+    public BaseResult<TruckDetailResp> truckDetail(@RequestBody @Valid TruckDetailParam param){
+        TruckDetailResp truckDetailResp = truckService.truckDetail(param);
         return BaseResult.success(truckDetailResp);
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruck.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @desc 车辆信息
@@ -162,13 +163,13 @@ public class KwfTruck extends BaseModel {
      * 年审到期时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data annualInspectionTime;
+    private Date annualInspectionTime;
 
     /**
      * 道路运输证有效期
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data transportValidityTime;
+    private Date transportValidityTime;
 
     /**
      * 定位设备

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/enums/TruckTypeEnum.java

@@ -17,7 +17,7 @@ public enum TruckTypeEnum {
     /**
      * 牵引车
      */
-    TRACTOR(1, "牵引车")
+    TRACTOR(2, "牵引车")
 
     ;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/reponse/TruckDetailResp.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author zk
@@ -115,14 +116,14 @@ public class TruckDetailResp implements Serializable {
      */
     @NotNull(message = "年审到期时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data annualInspectionTime;
+    private Date annualInspectionTime;
 
     /**
      * 道路运输证有效期
      */
     @NotNull(message = "道路运输证有效期不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data transportValidityTime;
+    private Date transportValidityTime;
 
     /**
      * 定位设备

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/reponse/TruckResp.java

@@ -90,6 +90,13 @@ public class TruckResp implements Serializable {
     @Schema(description = "目标状态: 0-正常、1-黑名单")
     private Integer blacklist;
 
+    /**
+     * 年审到期时间
+     */
+    @Schema(description = "年审到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date annualInspectionTime;
+
     /**
      * 创建时间
      */
@@ -97,4 +104,12 @@ public class TruckResp implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    /**
+     * 审核驳回理由
+     */
+    @Schema(description = "审核驳回理由")
+    private String remark;
+
+
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckAxleNumUpdateParam.java

@@ -26,7 +26,7 @@ public class TruckAxleNumUpdateParam extends PageReq implements Serializable {
 
 
     @Data
-    public class TruckAxleNumUpdateParamVO implements Serializable {
+    public static class TruckAxleNumUpdateParamVO implements Serializable {
 
         @Serial
         private static final long serialVersionUID = -7905792845847783871L;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckBlacklistParam.java

@@ -2,6 +2,7 @@ package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -18,11 +19,13 @@ public class TruckBlacklistParam extends PageReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -1021090755043784996L;
 
+
+    @NotNull(message = "车辆主键不能为空")
     @Schema(description = "车辆主键")
     private Long id;
 
-
-    @Schema(description = "目标状态: 0-正常、1-黑名单")
+    @NotNull(message = "车辆状态不能为空")
+    @Schema(description = "状态: 0-正常、1-黑名单")
     private Integer blacklist;
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckDetailParam.java

@@ -0,0 +1,29 @@
+package com.sckw.fleet.model.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author zk
+ * @desc 车辆信息
+ * @date 2023/7/11 0011
+ */
+@Data
+public class TruckDetailParam implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7408567583394698831L;
+
+    /**
+     * 车辆主键id
+     */
+    @NotNull(message = "车辆id不能为空")
+    @Schema(description = "车辆主键id")
+    private Long id;
+
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckReviewParam.java

@@ -28,7 +28,7 @@ public class TruckReviewParam extends PageReq implements Serializable {
     private Integer status;
 
     @Schema(description = "驳回理由")
-    private Integer remark;
+    private String remark;
 
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckSaveParam.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author zk
@@ -37,7 +38,7 @@ public class TruckSaveParam implements Serializable {
     /**
      * 车辆类别(牵引车、货车)
      */
-    @NotBlank(message = "车辆类别不能为空")
+    @NotNull(message = "车辆类别不能为空")
     @Schema(description = "车辆类别(牵引车、货车)")
     private Integer type;
 
@@ -63,16 +64,16 @@ public class TruckSaveParam implements Serializable {
     /**
      * 能源类型(1-传统能源车辆、2-新能源车辆)
      */
-    @NotBlank(message = "能源类型不能为空")
+    @NotNull(message = "能源类型不能为空")
     @Schema(description = "能源类型(1-传统能源车辆、2-新能源车辆)")
-    private int energyType;
+    private Integer energyType;
 
     /**
      * 排放标准(1-国四、2-国五、3-国六)
      */
-    @NotBlank(message = "排放标准不能为空")
+    @NotNull(message = "排放标准不能为空")
     @Schema(description = "排放标准(1-国四、2-国五、3-国六)")
-    private int eev;
+    private Integer eev;
 
     /**
      * 发动机号
@@ -86,14 +87,14 @@ public class TruckSaveParam implements Serializable {
      */
     @NotNull(message = "年审到期时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data annualInspectionTime;
+    private Date annualInspectionTime;
 
     /**
      * 道路运输证有效期
      */
     @NotNull(message = "道路运输证有效期不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Data transportValidityTime;
+    private Date transportValidityTime;
 
     /**
      * 定位设备
@@ -125,7 +126,7 @@ public class TruckSaveParam implements Serializable {
     /**
      * 车队id
      */
-    @NotBlank(message = "车队不能为空")
+    @NotNull(message = "车队不能为空")
     @Schema(description = "车队id")
     private Long fleetId;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckUpdateStatusParam.java

@@ -2,6 +2,7 @@ package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -20,7 +21,7 @@ public class TruckUpdateStatusParam extends PageReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -1021090755043784996L;
 
-    @NotNull(message = "车辆ID列表不能为空")
+    @NotEmpty(message = "车辆ID列表不能为空")
     @Schema(description = "车辆ID列表")
     private List<Long> ids;
 

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

@@ -2080,7 +2080,8 @@ public class KwfTruckService {
                 .eq(param.getType() != null, KwfTruck::getType, param.getType())
                 .eq(param.getCarAxis() != null, KwfTruck::getCarAxis, param.getCarAxis())
                 .eq(param.getEnergyType() != null, KwfTruck::getEnergyType, param.getEnergyType())
-                .eq(param.getEev() != null, KwfTruck::getEev, param.getEev());
+                .eq(param.getEev() != null, KwfTruck::getEev, param.getEev())
+                .in(CollectionUtils.isNotEmpty(validTruckIds), KwfTruck::getId, validTruckIds);
         //黑名单
         if (param.getStatus() != null) {
             if (Objects.equals(param.getStatus(), 4)) {
@@ -2090,10 +2091,6 @@ public class KwfTruckService {
             }
         }
 
-        // 查询关联司机
-        if (CollectionUtils.isNotEmpty(validTruckIds)) {
-            wrapper.in(KwfTruck::getId, validTruckIds);
-        }
         wrapper.orderByDesc(KwfTruck::getCreateTime)
                 .orderByDesc(KwfTruck::getId);
 
@@ -2126,6 +2123,8 @@ public class KwfTruckService {
             truckResp.setStatusDesc(TruckStatusEnum.getName(truck.getStatus()));
             truckResp.setCreateTime(truck.getCreateTime());
             truckResp.setBlacklist(truck.getBlacklist());
+            truckResp.setRemark(truck.getRemark());
+            truckResp.setAnnualInspectionTime(truck.getAnnualInspectionTime());
             //查询车辆轴数
             TmsTruckAxleNum axleNum = getCarAxisInfo(truck.getCarAxis());
             truckResp.setCarAxis(truck.getCarAxis());
@@ -2145,10 +2144,10 @@ public class KwfTruckService {
      * @param param
      * @return
      */
-    public TruckDetailResp truckDetail(Long id) {
-        log.info("查询司机详情，id：{}", id);
+    public TruckDetailResp truckDetail(TruckDetailParam param) {
+        log.info("查询司机详情，id：{}", JSON.toJSONString(param));
         KwfTruck truck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(KwfTruck::getId, id));
+                .eq(KwfTruck::getId, param.getId()));
         if (truck == null) {
             return new TruckDetailResp();
         }
@@ -2271,19 +2270,11 @@ public class KwfTruckService {
         log.info("车辆停用/启用，param：{}", JSON.toJSONString(param));
         // 1. 校验状态合法性
         if (param.getStatus() != 0 && param.getStatus() != 1) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "仅支持修改为正常(0)或停用(1)状态");
-        }
-        int targetStatus;
-        if (param.getStatus() == 0) {
-            // 如果当前已经是正常，则操作为“停用”，目标状态设为正常(1)
-            targetStatus = 1;
-        } else {
-            // 如果当前已经是停用，则操作为“正常”，目标状态设为停用(0)
-            targetStatus = 0;
+            throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "仅支持修改为正常或停用状态");
         }
         LambdaUpdateWrapper<KwfTruck> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(KwfTruck::getId, param.getIds());
-        updateWrapper.set(KwfTruck::getStatus, targetStatus);
+        updateWrapper.set(KwfTruck::getStatus, param.getStatus());
         kwfTruckRepository.update(updateWrapper);
 
     }
@@ -2295,17 +2286,16 @@ public class KwfTruckService {
      */
     public void toggleBlacklist(TruckBlacklistParam param) {
         log.info("黑名单业务：{}", JSON.toJSONString(param));
-        int targetBlacklist;
-        if (param.getBlacklist() == 1) {
-            // 如果当前已经是黑名单，则操作为“移出”，黑名单状态设为正常(0)
-            targetBlacklist = 0;
-        } else {
-            // 如果当前不是黑名单，则操作为“加入”，黑名单状态设为黑名单(1)
-            targetBlacklist = 1;
+        // 校验
+        if (param.getBlacklist() != 0 && param.getBlacklist() != 1) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "仅支持修改为正常或黑名单状态");
         }
-        kwfTruckRepository.update(Wrappers.<KwfTruck>lambdaUpdate()
-                .eq(KwfTruck::getId, param.getId())
-                .set(KwfTruck::getBlacklist, targetBlacklist));
+        KwfTruck truck = kwfTruckRepository.getById(param.getId());
+        if (truck == null) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_REVIEW_ERROR, "车辆不存在");
+        }
+        truck.setBlacklist(param.getBlacklist());
+        kwfTruckRepository.updateById(truck);
     }
 
     /**
@@ -2315,15 +2305,23 @@ public class KwfTruckService {
      */
     public void reviewTruck(TruckReviewParam param) {
         log.info("车辆审核：{}", JSON.toJSONString(param));
+        // 校验
+        if (param.getStatus() != 0 && param.getStatus() != 3) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "仅支持修改为正常或审核失败状态");
+        }
         KwfTruck truck = kwfTruckRepository.getById(param.getId());
-        if (truck == null || !Objects.equals(TruckStatusEnum.PENDING_REVIEW.getCode(), param.getStatus())) {
+        if (truck == null || !Objects.equals(TruckStatusEnum.PENDING_REVIEW.getCode(), truck.getStatus())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_REVIEW_ERROR, "车辆审核状态异常：当前状态非待审核");
         }
         if (Objects.equals(TruckStatusEnum.REVIEW_REJECTED.getCode(), param.getStatus())
                 && StringUtils.isBlank(param.getRemark())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_REVIEW_ERROR, "审核理由不能为空");
         }
+
         truck.setStatus(param.getStatus());
+        if (Objects.equals(TruckStatusEnum.REVIEW_REJECTED.getCode(), param.getStatus())){
+            truck.setRemark(param.getRemark());
+        }
         kwfTruckRepository.updateById(truck);
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/AbstractWaybillOrderHandler.java

@@ -16,6 +16,7 @@ import com.sckw.fleet.api.model.dto.RUpdateDriverScoreDto;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
+import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.*;
 import com.sckw.transport.repository.*;
@@ -72,6 +73,8 @@ public abstract class AbstractWaybillOrderHandler<T extends WaybillOrderProcessP
 
     @Autowired
     LogisticsScoreFeignService logisticsScoreFeignService;
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
+    GoodsInfoService goodsInfoService;
 
     /**
      * 模板方法 - 定义处理流程

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -12,6 +12,7 @@ import com.sckw.core.utils.DateUtils;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
+import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.model.*;
@@ -102,13 +103,20 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 forklift.setWOrderId(waybillOrder.getId());
                 forklift.setLOrderId(waybillOrder.getLOrderId());
 
+                //查询字典
+                Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                        Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+                Map<String, String> goodsTypeMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+                Map<String, String> goodsSpecMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+
                 // 查询商品信息
                 KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
-                if (orderGoods != null) {
+                KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
+                if (goods != null) {
                     List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), orderGoods.getGoodsType());
                     forklift.setDictId(CollectionUtils.isNotEmpty(dictResDtoList) ? dictResDtoList.get(0).getId() : -1L);
-                    forklift.setGoodsId(orderGoods.getGoodsId());
-                    forklift.setGoodsName(orderGoods.getGoodsName());
+                    forklift.setGoodsId(goods.getId());
+                    forklift.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
                 }
                 forklift.setLoadingType(0);
                 forklift.setStatus(ForkliftStatusEnum.PENDING_ORDERS.getCode());

sql/2026/01/2026_01_06_donglang_create.sql

@@ -6,7 +6,8 @@ CREATE table kwt_forklift_waybill_order
     ent_id                          bigint          NOT NULL DEFAULT '-1' COMMENT '企业id',
     w_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流运单id',
     l_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流订单id',
-    good_id                         bigint          NOT NULL DEFAULT '-1' COMMENT '商品id',
+    dict_id                         bigint          NOT NULL DEFAULT '-1' COMMENT '商品类型id',
+    goods_id                        bigint          NOT NULL DEFAULT '-1' COMMENT '商品id',
     goods_name                      varchar(20)     NOT NULL default '' COMMENT '商品名称',
     loading_type                    int             NOT NULL DEFAULT '0' COMMENT '装载类型（0装载，1补货）',
     status                          int             NOT NULL DEFAULT '0' COMMENT '状态（1-待接单，5-已接单、10-已装载）',