提交630物流运单相关逻辑

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

@@ -407,6 +407,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         waybillOrder.setCreateBy(param.getDriverId());
         waybillOrder.setUpdateBy(param.getDriverId());
         waybillOrder.setDispatchWay(logOrder.getDispatchWay());
+        waybillOrder.setAgentFlag(logOrder.getAgentFlag());
         waybillOrderRepository.save(waybillOrder);
         log.info("创建物流运单成功，运单ID：{}", waybillOrder.getId());
 
@@ -430,6 +431,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         subtask.setWOrderNo(waybillOrder.getWOrderNo());
         subtask.setUnit("吨"); //TODO DONGLANG
 
+        subtask.setAgentFlag(waybillOrder.getAgentFlag());
         subtask.setEntrustAmount(truckLoadVolume);
         subtask.setStatus(CarWaybillV1Enum.PENDING_VEHICLE.getCode());
         subtask.setCreateBy(param.getDriverId());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrder.java

@@ -167,6 +167,12 @@ public class KwtWaybillOrder implements Serializable {
     @TableField("task_end_time")
     private Date taskEndTime;
 
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @TableField("agent_flag")
+    private Integer agentFlag;
+
     private static final long serialVersionUID = 1L;
 
     @TableField(exist = false)
@@ -185,4 +191,4 @@ public class KwtWaybillOrder implements Serializable {
     //用于存储动态状态
     @TableField(exist = false)
     private Integer targetStatus;
-}
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderSubtask.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
@@ -90,4 +91,10 @@ public class KwtWaybillOrderSubtask extends BaseModel {
      * 卸货凭证操作人
      */
     private Long unloadOperator;
+
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @TableField("agent_flag")
+    private Integer agentFlag;
 }

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

@@ -102,4 +102,10 @@ public class WaybillOrderReq extends PageReq implements Serializable {
      */
     @Schema(description = "状态")
     private String status;
+
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @Schema(description = "是否代理属性：0-否，1-是")
+    private Integer agentFlag;
 }

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

@@ -179,4 +179,16 @@ public class WaybillOrderResp implements Serializable {
     @Schema(description = "毛重")
     private BigDecimal grossAmount;
 
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @Schema(description = "是否代理属性：0-否，1-是")
+    private Integer agentFlag;
+
+    /**
+     * 是否代理属性描述
+     */
+    @Schema(description = "是否代理属性描述")
+    private String agentFlagDesc;
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -68,12 +68,14 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
     public IPage<KwtWaybillOrderSubtask> queryByPage( Set<Long> logOrderIds, Set<Long> billOrderIds,
                                                      Integer status,
                                                       List<Integer> waybillOrderStatus,
+                                                     Integer agentFlag,
                                                      int pageNum,
                                                      int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                         .eq(BaseModel::getDelFlag,0)
                         .eq(Objects.nonNull( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .eq(Objects.nonNull(agentFlag), KwtWaybillOrderSubtask::getAgentFlag, agentFlag)
                         .notIn(CollectionUtils.isNotEmpty( waybillOrderStatus),KwtWaybillOrderSubtask::getStatus, waybillOrderStatus)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)

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

@@ -3050,7 +3050,7 @@ public class KwtWaybillOrderV1Service {
                 logOrderIds.size(), billOrderIds.size(), status);
         List<Integer> waybillOrderStatus = getWaybillOrderStatus();
         IPage<KwtWaybillOrderSubtask> page = waybillOrderSubtaskRepository.queryByPage(
-                logOrderIds, billOrderIds, status,waybillOrderStatus, req.getPageNum(), req.getPageSize());
+                logOrderIds, billOrderIds, status, waybillOrderStatus, req.getAgentFlag(), req.getPageNum(), req.getPageSize());
 
         List<KwtWaybillOrderSubtask> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
@@ -4098,6 +4098,9 @@ public class KwtWaybillOrderV1Service {
         waybillOrderResp.setLogisticsOrderId(String.valueOf(record.getLOrderId()));
         KwtLogisticsOrder order = finalLogIdAndOrderMap.getOrDefault(record.getLOrderId(), new KwtLogisticsOrder());
         waybillOrderResp.setLogisticsOrderNo(order.getLOrderNo());
+        Integer agentFlag = Objects.nonNull(record.getAgentFlag()) ? record.getAgentFlag() : billOrder.getAgentFlag();
+        waybillOrderResp.setAgentFlag(agentFlag);
+        waybillOrderResp.setAgentFlagDesc(Objects.equals(agentFlag, Global.YES) ? "是" : "否");
         KwtLogisticsOrderUnit consignUnit = finalLogOrderIdUnitTypeKeyAndUnitMap.getOrDefault(record.getLOrderId() + "-" + NumberConstant.ONE,
                 new KwtLogisticsOrderUnit());
         waybillOrderResp.setConsignUnitId(String.valueOf(consignUnit.getEntId()));

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -25,12 +25,13 @@
         <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+        <result column="agent_flag" jdbcType="INTEGER" property="agentFlag"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
         , ent_id, l_order_id, w_order_no, truck_no, driver_id, entrust_amount, unload_amount,
     load_amount, deficit_amount, remark, `status`, create_by, create_time, update_by,
-    update_time, del_flag,start_time,end_time
+    update_time, del_flag,start_time,end_time,agent_flag
     </sql>
 
     <select id="selectWaybillOrderCarList" resultType="com.sckw.transport.model.dto.OrderCarDTO">

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderSubtaskMapper.xml

@@ -7,7 +7,7 @@
         id, ent_id entId, l_order_id lOrderId, w_order_id wOrderId, w_order_no wOrderNo, unit,
         entrust_amount entrustAmount, unload_amount unloadAmount, unload_time unloadTime,
         load_amount loadAmount, load_time loadTime, deficit_amount deficitAmount, deficit_price deficitPrice,
-        remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
+        agent_flag agentFlag, remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
         from kwt_waybill_order_subtask
         where del_flag = 0
         <if test="wOrderId != null">
@@ -20,7 +20,7 @@
         id, ent_id entId, l_order_id lOrderId, w_order_id wOrderId, w_order_no wOrderNo, unit,
         entrust_amount entrustAmount, unload_amount unloadAmount, unload_time unloadTime,
         load_amount loadAmount, load_time loadTime, deficit_amount deficitAmount, deficit_price deficitPrice,
-        remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
+        agent_flag agentFlag, remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
         from kwt_waybill_order_subtask
         where del_flag = 0
         <if test="wOrderId != null and wOrderId != ''">
@@ -43,6 +43,7 @@
                 wos.load_amount loadAmount,
                 wos.deficit_amount deficitAmount,
                 wos.deficit_price deficitPrice,
+                wos.agent_flag agentFlag,
                 wos.id wSubtaskId,
                 wo.w_order_no wOrderNo,
                 wo.driver_id driverId,
@@ -220,4 +221,4 @@
             )
         </if>
     </select>
-</mapper>
+</mapper>

sql/2026/06/2026_06_02_add_waybill_order_agent_flag.sql

@@ -0,0 +1,5 @@
+ALTER TABLE kwt_waybill_order
+    ADD COLUMN agent_flag tinyint NOT NULL DEFAULT 0 COMMENT '是否代理属性：0-否，1-是';
+
+ALTER TABLE kwt_waybill_order_subtask
+    ADD COLUMN agent_flag tinyint NOT NULL DEFAULT 0 COMMENT '是否代理属性：0-否，1-是';