物流订单详情查询

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcLogisticsContractController.java

@@ -9,6 +9,8 @@ import com.sckw.contract.model.vo.res.QueryLogisticListResp;
 import com.sckw.contract.service.operateService.KwcContractLogisticsService;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("logisticsContract")
 @RequiredArgsConstructor
+@Tag(name = "物流合同接口")
 public class KwcLogisticsContractController {
     private final KwcContractLogisticsService kwcContractLogisticsService;
 
@@ -35,12 +38,14 @@ public class KwcLogisticsContractController {
      * @return HttpResult
      */
     @PostMapping("/queryListByPage")
+    @Operation(summary = "分页查询物流合同")
     public BaseResult<PageDataResult<QueryLogisticListResp>> queryListByPage(@RequestBody QueryLogisticListReq req) {
         return BaseResult.success(kwcContractLogisticsService.queryLogisticsContractListByPage(req));
     }
     /**
      * 新增物流合同
      */
+    @Operation(summary = "新增或者修改物流合同")
     @PostMapping("/addOrUpdateLogisticsContract")
     public BaseResult<Boolean> addOrUpdateLogisticsContract(@RequestBody LogisticListReq req) {
         return BaseResult.success(kwcContractLogisticsService.addOrUpdateLogisticsContract(req));
@@ -50,6 +55,7 @@ public class KwcLogisticsContractController {
      * 查询物流合同明细
      */
     @PostMapping("/queryLogisticsContractDetail")
+    @Operation(summary = "查询物流合同明细")
     public BaseResult<QueryLogisticDetailResp> queryLogisticsContractDetail(@RequestBody ContractDetailReq req) {
        return BaseResult.success(kwcContractLogisticsService.queryLogisticsContractDetail(req)) ;
     }
@@ -58,6 +64,7 @@ public class KwcLogisticsContractController {
      * 修改合同状态
      */
     @PostMapping("/updateLogistics")
+    @Operation(summary = "手动完结")
     public BaseResult<Boolean> updateLogistics(@RequestBody UpdateLogisticsReq req) {
         return BaseResult.success(kwcContractLogisticsService.updateLogistics(req));
     }

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

@@ -15,8 +15,11 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.model.ValiList;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.param.WaybillOrderReq;
+import com.sckw.transport.model.param.WaybillOrderResp;
 import com.sckw.transport.model.vo.WaybillOrderDetailVo;
 import com.sckw.transport.model.vo.WaybillOrderExportVo;
 import com.sckw.transport.model.vo.WaybillOrderSelectVo;
@@ -654,7 +657,12 @@ public class KwtWaybillOrderController {
         return BaseResult.success(orderDetailVo);
     }
 
-
-
+    /**
+     * 分页查询运单信息
+     */
+    @PostMapping("/findBillOrderListPage")
+    public BaseResult<PageDataResult<WaybillOrderResp>> findBillOrderListPage(@RequestBody WaybillOrderReq req) {
+        return waybillOrderV1Service.findBillOrderListPage(req);
+    }
 
 }

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

@@ -0,0 +1,92 @@
+package com.sckw.transport.model.param;
+
+import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description : 分页查询运单信息请求参数
+ * @create :2025-11-11 20:15:00
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class WaybillOrderReq extends PageReq implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 5288474055629950242L;
+    /**
+     * 物流订单id 订单模块调整的时候会用
+     */
+    @Schema(description = "物流订单id")
+    private String logisticsOrderId;
+    /**
+     * 物流订单编号
+     */
+    @Schema(description = "物流订单编号")
+    private String logisticsOrderNo;
+    /**
+     * 运单号
+     */
+    @Schema(description = "运单号")
+    private String waybillNo;
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+    /**
+     * 司机名称
+     */
+    @Schema(description = "司机名称")
+    private String driverName;
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    private String truckNo;
+    /**
+     * 托运单位id
+     */
+    @Schema(description = "托运单位id")
+    private String consignorId;
+    /**
+     * 承运单位 id
+     */
+    @Schema(description = "承运单位 id")
+    private String carrierId;
+    /**
+     * 计费方式
+     */
+    @Schema(description = "计费方式")
+    private String billingMethod;
+    /**
+     * 装货开始时间
+     */
+    @Schema(description = "装货开始时间")
+    private String loadStartTime;
+    /**
+     * 装货结束时间
+     */
+    @Schema(description = "装货结束时间")
+    private String loadEndTime;
+    /**
+     * 卸货开始时间
+     */
+    @Schema(description = "卸货开始时间")
+    private String unloadStartTime;
+    /**
+     * 卸货结束时间
+     */
+    @Schema(description = "卸货结束时间")
+    private String unloadEndTime;
+}

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

@@ -0,0 +1,114 @@
+package com.sckw.transport.model.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description : 分页查询运单信息详情响应参数
+ * @create :2025-11-11 20:16:00
+ */
+@Data
+public class WaybillOrderResp implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 7947970154893311217L;
+    /**
+     * 运单id
+     */
+    @Schema(description = "运单id")
+    private String waybillOrderId;
+    /**
+     * 运单号
+     */
+    @Schema(description = "运单号")
+    private String waybillOrderNo;
+    /**
+     * 托运单位id
+     */
+    @Schema(description = "托运单位id")
+    private String consignUnitId;
+    /**
+     * 托运单位名称
+     */
+    @Schema(description = "托运单位名称")
+    private String consignUnitName;
+    /**
+     * 承运单位id
+     */
+    @Schema(description = "承运单位id")
+    private String carriageUnitId;
+    /**
+     * 承运单位名称
+     */
+    @Schema(description = "承运单位名称")
+    private String carriageUnitName;
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    private String truckNo;
+    /**
+     * 司机名称
+     */
+    @Schema(description = "司机名称")
+    private String driverName;
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String driverPhone;
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+    /**
+     * 任务量
+     */
+    @Schema(description = "任务量")
+    private Integer taskNum;
+    /**
+     * 装货净重
+     */
+    @Schema(description = "装货净化重")
+    private Double loadingNetWeight;
+    /**
+     * 装货地址
+     */
+    @Schema(description = "装货地址")
+    private String loadingAddress;
+    /**
+     * 卸货净重
+     */
+    @Schema(description = "卸货净重")
+    private Double unloadingNetWeight;
+    /**
+     * 卸货地址
+     */
+    @Schema(description = "卸货地址")
+    private String unloadingAddress;
+    /**
+     * 接单时间
+     */
+    @Schema(description = "接单时间")
+    private String acceptTime;
+    /**
+     * 装货时间
+     */
+    @Schema(description = "装货时间")
+    private String loadingTime;
+    /**
+     * 离场时间
+     */
+    @Schema(description = "离场时间")
+    private String offsiteTime;
+    /**
+     * 状态
+     */
+    @Schema(description = "状态")
+    private String status;
+}

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

@@ -17,7 +17,9 @@ import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.CommonConstants;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.vo.*;
@@ -37,6 +39,8 @@ import com.sckw.transport.model.enuma.ApproveStatusEnum;
 import com.sckw.transport.model.enuma.CarWaybillDetailEnum;
 import com.sckw.transport.model.enuma.CarWaybillNdexTopEnum;
 import com.sckw.transport.model.enuma.CarWaybillTableTopEnum;
+import com.sckw.transport.model.param.WaybillOrderReq;
+import com.sckw.transport.model.param.WaybillOrderResp;
 import com.sckw.transport.model.vo.*;
 import com.sckw.transport.repository.KwtWaybillOrderAddressRepository;
 import com.sckw.transport.repository.KwtWaybillOrderTrackRepository;
@@ -2910,4 +2914,9 @@ public class KwtWaybillOrderV1Service {
 
         return orderDetailVo;
     }
+
+    public BaseResult<PageDataResult<WaybillOrderResp>> findBillOrderListPage(WaybillOrderReq req) {
+        //
+        return null;
+    }
 }