ZPSZ-BASE.git - Gitblit

			@@ -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 '目的地ID',
			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,17 +141,7 @@
			-- 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 'status',
			ts.STATUS AS 'status',
			-- ts.ESTIMATED_COST '预估费用',
			-- ts.ESTIMATED_CARRIER_NUM '预估承运商数',
			-- ts.ESTIMATED_COST_SAVING '预估节约费用',
			@@ -154,9 +166,9 @@
			-- 地区表
			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>