From 965f21c8b5723a1f4d343df7edd4acf48b935f5d Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 17:36:24 +0800
Subject: [PATCH] 新增时间查询状态
---
service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 3 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
index de53e3d..e6341ce 100644
--- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml
@@ -77,9 +77,9 @@
<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="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 #{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>
@@ -171,6 +171,119 @@
</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>
+ <select id="selectDispatchOrderAttachment" resultType="com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo">
+SELECT
+-- image.PATH,
+ CONCAT('https://tms.ygalogisticspark.com/ImageViewServlet?id=',image.id) as imageUrl,
+ -- tof.FEE_TYPE_ID '璐圭敤绫诲瀷ID',
+ bfi.FEE_TYPE as feeItem,
+ tof.account as account,
+ case tof.CURRENCY_ID
+ when 1 then '娓竵'
+ when 2 then '浜烘皯甯�'
+ else '鏈煡'
+ end as currency
+
+FROM
+-- 鍏朵粬璐圭敤琛�
+ Tms_Other_Fee tof
+-- 璋冨害鍗曡〃
+ LEFT JOIN tms_shipment ts ON tof.dispatch_Order_Id = ts.id
+-- 闄勪欢琛�
+ LEFT JOIN Thorn_Attachment image ON image.OBJ_ID = tof.id
+-- 璐圭敤绫诲瀷琛�
+ left join base_fee_item bfi on bfi.id=tof.FEE_TYPE_ID
+WHERE
+ ts.DISPATCH_NO = #{no}
+ AND image.biz_Type = 'com.vtradex.tms.core.model.entity.fee.TmsOtherFee'
+
+
+ </select>
<!-- 鏂板 -->
<insert id="insertDispatchOrder" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0