From 4d9eeaa5bc6c47feeac930f2af73e7d210572921 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 15:36:34 +0800
Subject: [PATCH] 新增查看费用接口
---
service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 133 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 115 insertions(+), 18 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
index 32ee08d..6884b7c 100644
--- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
@@ -64,6 +64,28 @@
<if test="status != null and status != ''"> and thisTab.status = #{status}</if>
<if test="isDeleted != null "> and thisTab.is_deleted = #{isDeleted}</if>
</sql>
+ <sql id="whereCondition2">
+ <if test="dispatchNo != null and dispatchNo != ''"> and ts.DISPATCH_NO = #{dispatchNo}</if>
+ <if test="transportMode != null and transportMode != ''"> and ts.TRANSPORT_MODE = #{transportMode}</if>
+ <if test="productName != null and productName != ''"> and ts.PRODUCT_ID like concat('%', #{productName}, '%')</if>
+ <if test="carrierName != null and carrierName != ''"> and bp.NAME like concat('%', #{carrierName}, '%')</if>
+ <if test="departureLocationName != null and departureLocationName != ''"> and location_d.NAME_TREE like concat('%', #{departureLocationName}, '%')</if>
+ <if test="arrivalLocationName != null and arrivalLocationName != ''"> and location_a.NAME_TREE like concat('%', #{arrivalLocationName}, '%')</if>
+ <if test="licensePlateNumber != null and licensePlateNumber != ''"> and vhc.LICENSE_PLATE_NUMBER = #{licensePlateNumber}</if>
+ <if test="vehiclePlateId != null and vehiclePlateId != ''"> and ts.VEHICLE_PLATE_ID = #{vehiclePlateId}</if>
+ <if test="mainDriverName != null and mainDriverName != ''"> and driver_m.NAME like concat('%', #{mainDriverName}, '%')</if>
+ <if test="assistantDriverName != null and assistantDriverName != ''"> and driver_a.NAME like concat('%', #{assistantDriverName}, '%')</if>
+ <if test="pointNum != null "> and ts.POINT_NUM = #{pointNum}</if>
+ <if test="quantity != null "> and ts.QUANTITY = #{quantity}</if>
+ <if test="actualDepartureTime != null "> and ts.ACTUAL_DEPARTURE_TIME = #{actualDepartureTime}</if>
+ <if test="requiredArrivalTime != null "> and ts.REQUIRED_ARRIVAL_TIME = #{requiredArrivalTime}</if>
+ <if test="actualArrivalTime != null "> and ts.ACTUAL_ARRIVAL_TIME = #{actualArrivalTime}</if>
+ <if test="beReturn != null and beReturn != ''"> and ts.BE_RETURN = #{beReturn}</if>
+ <if test="dispatchQuantity != null "> and ts.DISPATCH_QUANTITY = #{dispatchQuantity}</if>
+ <if test="dispatchWeight != null "> and ts.DISPATCH_WEIGHT = #{dispatchWeight}</if>
+ <if test="dispatchVolume != null "> and ts.DISPATCH_VOLUME = #{dispatchVolume}</if>
+ <if test="status != null and status != ''"> and ts.STATUS = #{status}</if>
+ </sql>
<!--鏌ヨ-->
<select id="selectDispatchOrderById" parameterType="Integer" resultMap="DispatchOrderResult">
@@ -91,15 +113,15 @@
ts.DISPATCH_NO as 'dispatch_no',
ts.TRANSPORT_MODE as 'transport_mode',
ts.PRODUCT_ID as 'product_name',
- bp.`NAME` as 'carrier_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',
+ 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 '澶嶇閲嶉噺',
@@ -119,22 +141,12 @@
-- 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.STATUS AS 'status',
-- ts.ESTIMATED_COST '棰勪及璐圭敤',
-- ts.ESTIMATED_CARRIER_NUM '棰勪及鎵胯繍鍟嗘暟',
-- ts.ESTIMATED_COST_SAVING '棰勪及鑺傜害璐圭敤',
-- ts.TRANSPORT_LINE '杩愯緭绾胯矾',
- ts.REMARK '澶囨敞'
+ ts.REMARK 'remark'
-- ts.DISPATCH_PERMISSION_GROUP '璋冨害鏉冮檺鍒嗙粍',
-- ts.DISPATCH_GROUP '璋冨害鍒嗙粍',
-- ts.ROUTE_CODE '绾胯矾鍙�',
@@ -154,11 +166,96 @@
-- 鍦板尯琛�
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>-->
+ <where>
+ <include refid="whereCondition2"/>
+ </where>
order by ts.CREATED_TIME desc
</select>
+ <select id="selectDispatchOrderItemByNo" resultType="com.ruoyi.cwgl.domain.DispatchOrderItem">
+ SELECT
+ts.CREATED_TIME as createdTime,
+ts.DISPATCH_NO as dispatchNo,
+ts.TRANSPORT_MODE as transportMode,
+ts.LOAD_MODE as loadMode,
+ts.PRODUCT_ID as productId,
+bp.NAME as carrierName,
+ts.VEHICLE_TYPE_ID as vehicleTypeId,
+vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
+ts.VEHICLE_PLATE_ID as vehiclePlateId,
+-- ts.MAIN_DRIVER_ID '涓婚┚椹跺憳ID',
+-- ts.ASSISTANT_DRIVER_ID '鍓┚椹跺憳ID',
+driver_m.NAME as mainDriverName,
+driver_a.NAME as assistantDriverName,
+ts.POINT_NUM as pointNum,
+ts.RE_WEIGHING_WEIGHT as reWeighingWeight,
+ts.QUANTITY as quantity,
+ts.REQUIRED_ARRIVAL_TIME as requiredArrivalTime,
+ts.ACTUAL_DEPARTURE_TIME as actualDepartureTime,
+ts.ACTUAL_ARRIVAL_TIME as actualArrivalTime,
+-- ts.BE_RETURN '鏄惁鍥炵▼',
+ts.DISPATCH_QUANTITY as dispatchQuantity,
+ts.DISPATCH_WEIGHT as dispatchWeight,
+ts.DISPATCH_VOLUME as dispatchVolume,
+-- bfd.ID '璐﹀崟鏄庣粏Id',
+ts.STATUS as status,
+ts.TRANSPORT_LINE as transportLine,
+-- ts.REMARK '璋冨害鍗曞娉�',
+-- ts.ROUTE_CODE '绾胯矾鍙�',
+-- ts.DEPARTURE_LOCATION_ID '鍑哄彂鍦癐D',
+location_d.NAME_TREE as departureLocationName,
+-- ts.ARRIVAL_LOCATION_ID '鐩殑鍦癐D',
+location_a.NAME_TREE as arrivalLocationName,
+-- bill.id '璐﹀崟ID',
+fb.type AS billType,
+
+bfd.CREATED_TIME as feeDataCreatedTime,
+-- bfd.BILL_ID '璐﹀崟鏄庣粏ID',
+bfd.CHECK_STATUS as checkStatus,
+bfd.CURRENCY_TYPE as currencyType,
+-- bfd.ENTITY_LEVEL2 '浜岀骇涓讳綋',
+-- bfd.ENTITY_LEVEL3 '涓夌骇涓讳綋',
+-- bfd.FEE_BOOK_ID '璐︽湰ID',
+bfd.FEE_ITEM as feeItem,
+-- bfd.FEE_SOURCE '璐圭敤鏉ユ簮',
+bfd.FEE_TIME as feeTime,
+bfd.REMARK as remark,
+bfd.SETTLE_FEE as settleFee,
+bfd.STATUS as feeDataStatus,
+bt.FIELDS as settableFeeItems,
+bill.NAME as billName,
+-- bill.CHECK_ONLINE'鍦ㄧ嚎瀵硅处',
+ bill.STATUS AS billStatus
+FROM
+-- 璐﹀崟鏄庣粏琛�
+ bms_fee_data bfd
+-- 璁㈠崟琛�
+ LEFT JOIN oms_order ord
+ ON bfd.ENTITY_ID = ord.DISPATCH_CODE
+-- 璋冨害鍗曡〃
+ LEFT JOIN tms_shipment ts
+ ON ts.DISPATCH_NO = ord.DISPATCH_CODE
+-- 璐﹀崟涓昏〃
+ left join bms_bill bill on bill.id= bfd.BILL_ID
+-- 璐﹀唽琛�
+ LEFT JOIN bms_fee_book fb ON fb.id = bill.FEE_BOOK_ID
+-- 杩愯緭宸ュ叿琛�
+ 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
+ -- 璐﹀崟妯℃澘琛�
+ left join bms_bill_template bt on bt.ID=bill.BILL_TEMPLATE_ID
+WHERE
+ bfd.ENTITY_ID = #{no}
+
+ </select>
<!-- 鏂板 -->
<insert id="insertDispatchOrder" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0