From d87721bf2b5cbbdc8088c9f9e0bfbba61b125a0f Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 04 九月 2025 14:12:21 +0800
Subject: [PATCH] 修改接口

---
 service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index 4215519..6c711f7 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -87,11 +87,12 @@
         driver_m.`NAME` as driverName,
         driver_m.MOBILE as driverMobile,
         vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
+        vhc.NAME as boxNum,
         ord.ORDER_TIME as orderTime,
         ord.CREATED_TIME as orderCreatedTime,
         ts.CREATED_TIME as dispatchCreatedTime,
         now() as keyCollectionTime, -- 鏀捐姹傛煡璇㈠埌鐨勬椂闂�
-        ord.ESTIMATED_DEPARTURE_TIME as estimatedDepartureTime,
+        ord.REQUIRED_DEPARTURE_TIME as estimatedDepartureTime,
         ord.CONSIGNOR_ADDRESS_ADDR_INFO as consignorAddress,
         ord.CONSIGNEE_ADDRESS_ADDR_INFO as consigneeAddress,
         driver_m.`NAME` as mainDriver,
@@ -103,7 +104,7 @@
         ts.DISPATCH_QUANTITY as dispatchQuantity,
         ts.REMARK as remark,
         TIMESTAMPDIFF(HOUR, ord.ORDER_TIME, ord.CREATED_TIME) as schedulingTimeout,
-        TIMESTAMPDIFF(HOUR, ord.ESTIMATED_DEPARTURE_TIME, NOW()) as keyTimeout
+        TIMESTAMPDIFF(HOUR, ord.REQUIRED_DEPARTURE_TIME, NOW()) as keyTimeout
 
         FROM
         tms_shipment ts

--
Gitblit v1.8.0