From bcdbe6f0d4f83eb7cc180c7b94810ef979a34794 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 11:52:57 +0800
Subject: [PATCH] 修改ID，修改加密方式
---
service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
index c5218ba..32ee08d 100644
--- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
@@ -86,6 +86,80 @@
order by thisTab.id desc
</select>
+ <select id="selectDispatchOrderList2" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" resultMap="DispatchOrderResult">
+ SELECT
+ ts.DISPATCH_NO as 'dispatch_no',
+ ts.TRANSPORT_MODE as 'transport_mode',
+ ts.PRODUCT_ID as 'product_name',
+ bp.`NAME` as 'carrier_name',
+ location_d.NAME_TREE as 'departure_location_name',
+ -- ts.ARRIVAL_LOCATION_ID '鐩殑鍦癐D',
+ location_a.NAME_TREE as 'arrival_location_name',
+ -- ts.VEHICLE_ID '杩愯緭宸ュ叿ID',
+ vhc.LICENSE_PLATE_NUMBER as 'license_plate_number',
+ ts.VEHICLE_PLATE_ID as 'vehicle_plate_id',
+ driver_m.`NAME` as 'main_driver_name',
+ driver_a.`NAME` as 'assistant_driver_name',
+ ts.POINT_NUM as 'point_num',
+ -- ts.ELECTRONIC_LOCK '鐢靛瓙閿�',
+ -- ts.RE_WEIGHING_WEIGHT '澶嶇閲嶉噺',
+ ts.QUANTITY as 'quantity',
+ ts.ACTUAL_DEPARTURE_TIME as'actual_departure_time',
+ ts.REQUIRED_ARRIVAL_TIME as 'required_arrival_time',
+ ts.ACTUAL_ARRIVAL_TIME as 'actual_arrival_time',
+ ts.BE_RETURN as 'be_return',
+ ts.DISPATCH_QUANTITY as 'dispatch_quantity',
+ ts.DISPATCH_WEIGHT as 'dispatch_weight',
+ ts.DISPATCH_VOLUME as 'dispatch_volume',
+ -- ts.EMPTY_MILEAGE '绌鸿浇閲岀▼锛堝叕閲岋級',
+ -- ts.EMPTY_FUEL '绌鸿浇娌硅�楋紙鍗囷級',
+ -- ts.HEAVY_MILEAGE '閲嶈浇閲岀▼锛堝叕閲岋級',
+ -- ts.HEAVY_FUEL '閲嶈浇娌硅�楋紙鍗�)',
+ -- ts.BE_SCHEDULED '鏄惁鎸夌彮娆�',
+ -- ts.TRACKING_NO '蹇�掑崟鍙�',
+ -- ts.SEAL_NO '閾呭皝鍙�',
+ -- ts.SCHEDULE_NO '鐝鍙�',
+ CASE ts.`STATUS`
+ WHEN 'A' THEN '鐢熸晥'
+ WHEN 'O' THEN '鎵撳紑'
+ WHEN 'J' THEN '宸叉帴鍗�'
+ WHEN 'K' THEN '宸插埌搴�'
+ WHEN 'Z' THEN '宸茶杞�'
+ WHEN 'T' THEN '鍦ㄩ��'
+ WHEN 'F' THEN '宸插纾�'
+ WHEN 'D' THEN '宸茶繍鎶�'
+ ELSE '鏈煡鐘舵��'
+ END AS 'remark',
+ -- ts.ESTIMATED_COST '棰勪及璐圭敤',
+ -- ts.ESTIMATED_CARRIER_NUM '棰勪及鎵胯繍鍟嗘暟',
+ -- ts.ESTIMATED_COST_SAVING '棰勪及鑺傜害璐圭敤',
+ -- ts.TRANSPORT_LINE '杩愯緭绾胯矾',
+ ts.REMARK '澶囨敞'
+ -- ts.DISPATCH_PERMISSION_GROUP '璋冨害鏉冮檺鍒嗙粍',
+ -- ts.DISPATCH_GROUP '璋冨害鍒嗙粍',
+ -- ts.ROUTE_CODE '绾胯矾鍙�',
+
+ FROM
+ tms_shipment ts
+ -- 璁㈠崟琛�
+ -- LEFT JOIN oms_order ord ON ts.DISPATCH_NO = ord.DISPATCH_CODE
+ left join tms_vehicle vhc on ts.VEHICLE_ID=vhc.id
+ left join base_provider bp on bp.ID=ts.CARRIER_ID
+ -- 鍙告満琛�
+ left join tms_driver driver_m on driver_m.ID=ts.MAIN_DRIVER_ID
+ -- 鍙告満琛�
+ left join tms_driver driver_a on driver_a.ID=ts.ASSISTANT_DRIVER_ID
+ -- 鍦板尯琛�
+ left join base_location location_a on location_a.ID =ts.ARRIVAL_LOCATION_ID
+ -- 鍦板尯琛�
+ left join base_location location_d on location_d.ID =ts.DEPARTURE_LOCATION_ID
+-- where ts.CREATED_TIME >'2025-07-01 00:00:01'
+ <!-- <where>
+ <include refid="whereCondition"/>
+ </where>-->
+ order by ts.CREATED_TIME desc
+ </select>
+
<!-- 鏂板 -->
<insert id="insertDispatchOrder" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" useGeneratedKeys="true" keyProperty="id">
insert into dispatch_order
--
Gitblit v1.8.0