Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131_youshen430

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

@@ -210,4 +210,10 @@ public class WaybillOrderStatusResp implements Serializable {
      */
     @Schema(description = "订单余量")
     private BigDecimal orderSurplus;
+
+    /**
+     * 备注（是否空载离场）
+     */
+    @Schema(description = "备注（是否空载离场）")
+    private String remark;
 }

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

@@ -223,6 +223,12 @@ public class WaybillOrderDetailResp implements Serializable {
     @Schema(description = "卸货地址纬度")
     private String unloadLatitude;
 
+    /**
+     * 备注（是否空载离场）
+     */
+    @Schema(description = "备注（是否空载离场）")
+    private String remark;
+
     /**
      * 过磅记录
      */

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

@@ -4603,6 +4603,7 @@ public class KwtWaybillOrderV1Service {
         resp.setLogisticOrderNo(logOrder.getLOrderNo());
         resp.setPriceType(String.valueOf(logOrder.getBillingMode()));
         resp.setPriceTypeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(), logOrder.getBillingMode()));
+        resp.setRemark(billOrder.getRemark());
         // 票据信息
         String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
         KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -847,6 +847,7 @@ public class WaybillOrderService {
         wbOrderResp.setId(wbOrder.getId());
         wbOrderResp.setLogisticsOrderId(Optional.ofNullable(wbOrder.getLOrderId()).map(String::valueOf).orElse(null));
         wbOrderResp.setWaybillNo(wbOrder.getWOrderNo());
+        wbOrderResp.setRemark(wbOrder.getRemark());
         //装货、卸货净重、任务量
         KwtWaybillOrderSubtask subtask = subtaskMap.getOrDefault(wbOrder.getId(), new KwtWaybillOrderSubtask());
         wbOrderResp.setLoadingNetWeight(subtask.getLoadAmount());