From 5cccc3698dede7018339799336909f444b80b2c5 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:56:15 +0800
Subject: [PATCH] 新增确认取消判断
---
service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
index 461e63f..e07ec65 100644
--- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.ruoyi.cwgl.domain.DispatchOrder" id="DispatchOrderResult">
<result property="id" column="id" />
<result property="dispatchNo" column="dispatch_no" />
+ <result property="customerName" column="customer_name" />
<result property="transportMode" column="transport_mode" />
<result property="productName" column="product_name" />
<result property="carrierName" column="carrier_name" />
@@ -65,7 +66,8 @@
<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="dispatchNo != null and dispatchNo != ''"> and ts.DISPATCH_NO like concat('%', #{dispatchNo}, '%')</if>
+ <if test="customerName != null and customerName != ''"> and customer.`NAME` like concat('%', #{customerName}, '%')</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>
@@ -78,8 +80,8 @@
<if test="pointNum != null "> and ts.POINT_NUM = #{pointNum}</if>
<if test="quantity != null "> and ts.QUANTITY = #{quantity}</if>
<if test="actualDepartureTimeBegin != null and actualDepartureTimeBegin!='' and actualDepartureTimeEnd != null and actualDepartureTimeEnd!='' "> and ts.ACTUAL_DEPARTURE_TIME between #{actualDepartureTimeBegin} and #{actualDepartureTimeEnd}</if>
- <if test="requiredArrivalTimeBegin != null and requiredArrivalTimeBegin!='' and requiredArrivalTimeEnd != null and requiredArrivalTimeEnd!='' "> and ts.REQUIRED_ARRIVAL_TIME between #{requiredArrivalTimeEnd} and #{requiredArrivalTimeEnd}</if>
- <if test="actualArrivalTimeBegin != null and actualArrivalTimeBegin!='' and actualArrivalTimeEnd != null and actualArrivalTimeEnd!='' "> and ts.ACTUAL_ARRIVAL_TIME between #{actualArrivalTimeEnd} and #{actualArrivalTimeEnd}</if>
+ <if test="requiredArrivalTimeBegin != null and requiredArrivalTimeBegin!='' and requiredArrivalTimeEnd != null and requiredArrivalTimeEnd!='' "> and ts.REQUIRED_ARRIVAL_TIME between #{requiredArrivalTimeBegin} and #{requiredArrivalTimeEnd}</if>
+ <if test="actualArrivalTimeBegin != null and actualArrivalTimeBegin!='' and actualArrivalTimeEnd != null and actualArrivalTimeEnd!='' "> and ts.ACTUAL_ARRIVAL_TIME between #{actualArrivalTimeBegin} and #{actualArrivalTimeEnd}</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>
@@ -111,6 +113,7 @@
<select id="selectDispatchOrderList2" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" resultMap="DispatchOrderResult">
SELECT
ts.DISPATCH_NO as 'dispatch_no',
+ customer.`NAME` as 'customer_name',
ts.TRANSPORT_MODE as 'transport_mode',
ts.PRODUCT_ID as 'product_name',
bp.NAME as 'carrier_name',
@@ -132,6 +135,7 @@
ts.BE_RETURN as 'be_return',
ts.DISPATCH_QUANTITY as 'dispatch_quantity',
ts.DISPATCH_WEIGHT as 'dispatch_weight',
+ ts.CREATED_TIME as 'create_time',
ts.DISPATCH_VOLUME as 'dispatch_volume',
-- ts.EMPTY_MILEAGE '绌鸿浇閲岀▼锛堝叕閲岋級',
-- ts.EMPTY_FUEL '绌鸿浇娌硅�楋紙鍗囷級',
@@ -154,7 +158,8 @@
FROM
tms_shipment ts
-- 璁㈠崟琛�
- -- LEFT JOIN oms_order ord ON ts.DISPATCH_NO = ord.DISPATCH_CODE
+ LEFT JOIN oms_order ord ON ts.DISPATCH_NO = ord.DISPATCH_CODE
+ LEFT join base_customer customer on customer.ID=ord.CUSTOMER_ID
left join tms_vehicle vhc on ts.VEHICLE_ID=vhc.id
left join base_provider bp on bp.ID=ts.CARRIER_ID
-- 鍙告満琛�
@@ -171,6 +176,41 @@
</where>
order by ts.CREATED_TIME desc
</select>
+
+ <select id="selectDispatchOrderItemByNos" resultType="com.ruoyi.cwgl.domain.DispatchOrderItem">
+ SELECT
+ bfd.ENTITY_ID as 'dispatch_no',
+ bfd.CREATED_TIME AS feeDataCreatedTime,
+ bfd.CHECK_STATUS AS checkStatus,
+ bfd.CURRENCY_TYPE AS currencyType,
+ bfd.FEE_ITEM AS feeItem,
+ bfd.FEE_TIME AS feeTime,
+ bfd.REMARK AS remark,
+ bfd.SETTLE_FEE AS settleFee,
+ bfd.STATUS AS feeDataStatus,
+
+ bill.NAME AS billName,
+ bill.STATUS AS billStatus,
+
+ fb.TYPE AS billType,
+ bt.FIELDS AS settableFeeItems
+
+ FROM bms_fee_data bfd
+ 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 bms_bill_template bt ON bt.ID = bill.BILL_TEMPLATE_ID
+ LEFT JOIN oms_order ord ON bfd.ENTITY_ID = ord.DISPATCH_CODE
+
+ WHERE bfd.ENTITY_ID in
+ <foreach collection="nos" item="no" open="(" separator="," close=")">
+ #{no}
+ </foreach>
+
+
+ </select>
+
+
+
<select id="selectDispatchOrderItemByNo" resultType="com.ruoyi.cwgl.domain.DispatchOrderItem">
SELECT
ts.CREATED_TIME as createdTime,
--
Gitblit v1.8.0