From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml | 448 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 402 insertions(+), 46 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
index c826d9d..948cadd 100644
--- a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
@@ -9,12 +9,13 @@
<result property="dispatchNo" column="dispatch_no" />
<result property="customerId" column="customer_id" />
<result property="customerName" column="customer_name" />
- <result property="projectName" column="project_name" />
+ <result property="customerCode" column="customer_code" />
<result property="projectId" column="project_id" />
+ <result property="projectName" column="project_name" />
<result property="contractId" column="contract_id" />
<result property="contractName" column="contract_name" />
- <result property="transportLine" column="transport_line" />
<result property="orderType" column="order_type" />
+ <result property="transportLine" column="transport_line" />
<result property="signType" column="sign_type" />
<result property="vehicleProviderId" column="vehicle_provider_id" />
<result property="vehicleProviderName" column="vehicle_provider_name" />
@@ -28,10 +29,10 @@
<result property="mainDriverId" column="main_driver_id" />
<result property="mainDriverName" column="main_driver_name" />
<result property="assistantDriverId" column="assistant_driver_id" />
- <result property="assistantDriverName" column="assistant_driver_name" />
<result property="requiredVehicleTypes" column="required_vehicle_types" />
- <result property="containerNo" column="container_no" />
+ <result property="assistantDriverName" column="assistant_driver_name" />
<result property="vehicleId" column="vehicle_id" />
+ <result property="containerNo" column="container_no" />
<result property="licensePlate" column="license_plate" />
<result property="shipperId" column="shipper_id" />
<result property="earliestDeparture" column="earliest_departure" />
@@ -43,12 +44,13 @@
<result property="latestArrival" column="latest_arrival" />
<result property="departureAddress" column="departure_address" />
<result property="shipperRegionCode" column="shipper_region_code" />
- <result property="destinationAddress" column="destination_address" />
<result property="receiverId" column="receiver_id" />
- <result property="actualVehicleType" column="actual_vehicle_type" />
+ <result property="destinationAddress" column="destination_address" />
<result property="receiverName" column="receiver_name" />
- <result property="actualLoadStart" column="actual_load_start" />
+ <result property="actualVehicleType" column="actual_vehicle_type" />
<result property="receiverMobile" column="receiver_mobile" />
+ <result property="actualLoadStart" column="actual_load_start" />
+ <result property="shipperRegionLabel" column="shipper_region_label" />
<result property="receiverAddress" column="receiver_address" />
<result property="actualUnloadEnd" column="actual_unload_end" />
<result property="receiverRegionCode" column="receiver_region_code" />
@@ -56,12 +58,13 @@
<result property="actualArrival" column="actual_arrival" />
<result property="actualQuantity" column="actual_quantity" />
<result property="actualWeight" column="actual_weight" />
+ <result property="receiverRegionLabel" column="receiver_region_label" />
<result property="actualVolume" column="actual_volume" />
<result property="reweighWeight" column="reweigh_weight" />
<result property="containerId" column="container_id" />
<result property="electronicLock" column="electronic_lock" />
- <result property="shelfId" column="shelf_id" />
<result property="emptyMileage" column="empty_mileage" />
+ <result property="shelfId" column="shelf_id" />
<result property="emptyFuel" column="empty_fuel" />
<result property="shelfCode" column="shelf_code" />
<result property="loadedMileage" column="loaded_mileage" />
@@ -76,10 +79,48 @@
<result property="remark" column="remark" />
<result property="accountsReceivableStatus" column="accounts_receivable_status" />
<result property="accountsPayableStatus" column="accounts_payable_status" />
+ <result property="collectionPlanId" column="collection_plan_id" />
+ <result property="paymentPlanId" column="payment_plan_id" />
+ <result property="isCustoms" column="is_customs" />
+ <result property="startRegionCode" column="start_region_code" />
+ <result property="endRegionCode" column="end_region_code" />
+ <result property="quoteDetailId" column="quote_detail_id" />
+ <result property="operationMode" column="operation_mode" />
+ <result property="quotePlanId" column="quote_plan_id" />
+ <result property="okTime" column="ok_time" />
+ <result property="confirmTime" column="confirm_time" />
+ <result property="isLoad" column="is_load" />
+ <result property="commissionModel" column="commission_model" />
+ <result property="orderTime" column="order_time" />
+ <result property="iscc" column="iscc" />
+ <result property="closeWhy" column="close_why" />
+ <result property="closeTime" column="close_time" />
+ <result property="closeBy" column="close_by" />
+ <result property="closeRemark" column="close_remark" />
+ <result property="isfk" column="isfk" />
+ <result property="isPrint" column="is_print" />
+ <result property="printCount" column="print_count" />
+ <result property="printTime" column="print_time" />
+ <result property="printBy" column="print_by" />
+ <result property="sixLinkNo" column="six_link_no" />
+ <result property="portName" column="port_name" />
+ <result property="billNo" column="bill_no" />
+ <result property="terminalName" column="terminal_name" />
+ <result property="cargoName" column="cargo_name" />
+ <result property="pieceCount" column="piece_count" />
+ <result property="weight" column="weight" />
+ <result property="contactName" column="contact_name" />
+ <result property="contactPhone" column="contact_phone" />
+ <result property="port" column="port" />
+ <result property="seamlessNumber" column="seamless_number" />
+ <result property="seamlessSupplierId" column="seamless_supplier_id" />
+ <result property="seamlessSupplierName" column="seamless_supplier_name" />
+ <result property="notes" column="notes" />
+
</resultMap>
<sql id="selectTmsDispatchOrderVo">
- select thisTab.id, thisTab.dispatch_no, thisTab.customer_id, thisTab.customer_name, thisTab.project_name, thisTab.project_id, thisTab.contract_id, thisTab.contract_name, thisTab.transport_line, thisTab.order_type, thisTab.sign_type, thisTab.vehicle_provider_id, thisTab.vehicle_provider_name, thisTab.loading_service_provider_id, thisTab.loading_service_provider_name, thisTab.customs_service_provider_id, thisTab.customs_service_provider_name, thisTab.is_urgent, thisTab.transport_type, thisTab.load_method, thisTab.main_driver_id, thisTab.main_driver_name, thisTab.assistant_driver_id, thisTab.assistant_driver_name, thisTab.required_vehicle_types, thisTab.container_no, thisTab.vehicle_id, thisTab.license_plate, thisTab.shipper_id, thisTab.earliest_departure, thisTab.shipper_name, thisTab.latest_departure, thisTab.shipper_mobile, thisTab.earliest_arrival, thisTab.shipper_address, thisTab.latest_arrival, thisTab.departure_address, thisTab.shipper_region_code, thisTab.destination_address, thisTab.receiver_id, thisTab.actual_vehicle_type, thisTab.receiver_name, thisTab.actual_load_start, thisTab.receiver_mobile, thisTab.receiver_address, thisTab.actual_unload_end, thisTab.receiver_region_code, thisTab.actual_departure, thisTab.actual_arrival, thisTab.actual_quantity, thisTab.actual_weight, thisTab.actual_volume, thisTab.reweigh_weight, thisTab.container_id, thisTab.electronic_lock, thisTab.shelf_id, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.shelf_code, thisTab.loaded_mileage, thisTab.loaded_fuel, thisTab.shift_no, thisTab.line_no, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.accounts_receivable_status, thisTab.accounts_payable_status from tms_dispatch_order AS thisTab
+ select thisTab.id, thisTab.dispatch_no, thisTab.customer_id, thisTab.customer_name, thisTab.customer_code, thisTab.project_id, thisTab.project_name, thisTab.contract_id, thisTab.contract_name, thisTab.order_type, thisTab.transport_line, thisTab.sign_type, thisTab.vehicle_provider_id, thisTab.vehicle_provider_name, thisTab.loading_service_provider_id, thisTab.loading_service_provider_name, thisTab.customs_service_provider_id, thisTab.customs_service_provider_name, thisTab.is_urgent, thisTab.transport_type, thisTab.load_method, thisTab.main_driver_id, thisTab.main_driver_name, thisTab.assistant_driver_id, thisTab.required_vehicle_types, thisTab.assistant_driver_name, thisTab.vehicle_id, thisTab.container_no, thisTab.license_plate, thisTab.shipper_id, thisTab.earliest_departure, thisTab.shipper_name, thisTab.latest_departure, thisTab.shipper_mobile, thisTab.earliest_arrival, thisTab.shipper_address, thisTab.latest_arrival, thisTab.departure_address, thisTab.shipper_region_code, thisTab.receiver_id, thisTab.destination_address, thisTab.receiver_name, thisTab.actual_vehicle_type, thisTab.receiver_mobile, thisTab.actual_load_start, thisTab.shipper_region_label, thisTab.receiver_address, thisTab.actual_unload_end, thisTab.receiver_region_code, thisTab.actual_departure, thisTab.actual_arrival, thisTab.actual_quantity, thisTab.actual_weight, thisTab.receiver_region_label, thisTab.actual_volume, thisTab.reweigh_weight, thisTab.container_id, thisTab.electronic_lock, thisTab.empty_mileage, thisTab.shelf_id, thisTab.empty_fuel, thisTab.shelf_code, thisTab.loaded_mileage, thisTab.loaded_fuel, thisTab.shift_no, thisTab.line_no, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.accounts_receivable_status, thisTab.accounts_payable_status, thisTab.collection_plan_id, thisTab.payment_plan_id , thisTab.is_customs, thisTab.start_region_code, thisTab.end_region_code, thisTab.quote_detail_id, thisTab.operation_mode, thisTab.quote_plan_id, thisTab.ok_time, thisTab.confirm_time, thisTab.is_load ,thisTab.commission_model ,thisTab.order_time, thisTab.iscc, thisTab.close_why, thisTab.close_time, thisTab.close_by, thisTab.close_remark, thisTab.isfk, thisTab.is_print, thisTab.print_count, thisTab.print_time, thisTab.print_by, thisTab.six_link_no, thisTab.port_name, thisTab.bill_no, thisTab.terminal_name, thisTab.cargo_name, thisTab.piece_count, thisTab.weight, thisTab.contact_name, thisTab.contact_phone, thisTab.port, thisTab.seamless_number, thisTab.seamless_supplier_id, thisTab.seamless_supplier_name from tms_dispatch_order AS thisTab
</sql>
<sql id="selectTmsDispatchOrderVoCount">
select count(0) from tms_dispatch_order as thisTab
@@ -88,12 +129,13 @@
<sql id="whereCondition">
<if test="dispatchNo != null and dispatchNo != ''"> and thisTab.dispatch_no = #{dispatchNo}</if>
<if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
+ <if test="customerCode != null and customerCode != ''"> and thisTab.customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
<if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
<if test="projectId != null "> and thisTab.project_id = #{projectId}</if>
<if test="contractId != null "> and thisTab.contract_id = #{contractId}</if>
<if test="contractName != null and contractName != ''"> and thisTab.contract_name like concat('%', #{contractName}, '%')</if>
- <if test="transportLine != null "> and thisTab.transport_line = #{transportLine}</if>
+ <if test="transportLine != null and transportLine != '' "> and thisTab.transport_line = #{transportLine}</if>
<if test="orderType != null "> and thisTab.order_type = #{orderType}</if>
<if test="signType != null "> and thisTab.sign_type = #{signType}</if>
<if test="vehicleProviderId != null "> and thisTab.vehicle_provider_id = #{vehicleProviderId}</if>
@@ -117,17 +159,73 @@
<if test="shipperMobile != null and shipperMobile != ''"> and thisTab.shipper_mobile = #{shipperMobile}</if>
<if test="shipperAddress != null and shipperAddress != ''"> and thisTab.shipper_address = #{shipperAddress}</if>
<if test="shipperRegionCode != null and shipperRegionCode != ''"> and thisTab.shipper_region_code = #{shipperRegionCode}</if>
+ <if test="shipperRegionLabel != null and shipperRegionLabel != ''"> and thisTab.shipper_region_label = #{shipperRegionLabel}</if>
<if test="receiverId != null "> and thisTab.receiver_id = #{receiverId}</if>
<if test="receiverName != null and receiverName != ''"> and thisTab.receiver_name like concat('%', #{receiverName}, '%')</if>
<if test="receiverMobile != null and receiverMobile != ''"> and thisTab.receiver_mobile = #{receiverMobile}</if>
<if test="receiverAddress != null and receiverAddress != ''"> and thisTab.receiver_address = #{receiverAddress}</if>
<if test="receiverRegionCode != null and receiverRegionCode != ''"> and thisTab.receiver_region_code = #{receiverRegionCode}</if>
+ <if test="receiverRegionLabel != null and receiverRegionLabel != ''"> and thisTab.receiver_region_label = #{receiverRegionLabel}</if>
<if test="containerId != null "> and thisTab.container_id = #{containerId}</if>
<if test="shelfId != null "> and thisTab.shelf_id = #{shelfId}</if>
<if test="shelfCode != null and shelfCode != ''"> and thisTab.shelf_code = #{shelfCode}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
<if test="accountsReceivableStatus != null "> and thisTab.accounts_receivable_status = #{accountsReceivableStatus}</if>
<if test="accountsPayableStatus != null "> and thisTab.accounts_payable_status = #{accountsPayableStatus}</if>
+ <if test="collectionPlanId != null "> and thisTab.collection_plan_id = #{collectionPlanId}</if>
+ <if test="paymentPlanId != null "> and thisTab.payment_plan_id = #{paymentPlanId}</if>
+ <if test="isCustoms != null "> and thisTab.is_customs = #{isCustoms}</if>
+ <if test="startRegionCode != null "> and thisTab.start_region_code = #{startRegionCode}</if>
+ <if test="endRegionCode != null "> and thisTab.end_region_code = #{endRegionCode}</if>
+ <if test="quoteDetailId != null "> and thisTab.quote_detail_id = #{quoteDetailId}</if>
+ <if test="operationMode != null "> and thisTab.operation_mode = #{operationMode}</if>
+ <if test="quotePlanId != null "> and thisTab.quote_plan_id = #{quotePlanId}</if>
+ <if test="iscc != null "> and thisTab.iscc = #{iscc}</if>
+ <if test="isfk != null "> and thisTab.isfk = #{isfk}</if>
+
+ <if test="closeWhy != null "> and thisTab.close_why = #{closeWhy}</if>
+ <if test="closeTime != null "> and thisTab.close_time = #{closeTime}</if>
+ <if test="closeBy != null "> and thisTab.close_by = #{closeBy}</if>
+ <if test="closeRemark != null "> and thisTab.close_remark = #{closeRemark}</if>
+
+ <if test="createBy != null and createBy != ''"> and thisTab.create_by like concat('%', #{createBy}, '%')</if>
+ <if test="updateBy != null and updateBy != ''"> and thisTab.update_by like concat('%', #{updateBy}, '%')</if>
+
+
+ <if test="createTimeBegin != null and createTimeBegin != '' and createTimeEnd != null and createTimeEnd != ''"> and thisTab.create_time between #{createTimeBegin} and #{createTimeEnd}</if>
+ <if test="updateTimeBegin != null and updateTimeBegin != '' and updateTimeEnd != null and updateTimeEnd != ''"> and thisTab.update_time between #{updateTimeBegin} and #{updateTimeEnd}</if>
+ <if test="confirmTimeBegin != null and confirmTimeBegin != '' and confirmTimeEnd != null and confirmTimeEnd != ''"> and thisTab.confirm_time between #{confirmTimeBegin} and #{confirmTimeEnd}</if>
+ <if test="okTimeBegin != null and okTimeBegin != '' and okTimeEnd != null and okTimeEnd != ''"> and thisTab.ok_time between #{okTimeBegin} and #{okTimeEnd}</if>
+
+ <if test="isLoad != null "> and thisTab.is_load = #{isLoad}</if>
+ <if test="commissionModel != null "> and thisTab.commission_model = #{commissionModel}</if>
+ <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if>
+ <if test="orderTimeBegin != null and orderTimeBegin != '' and orderTimeEnd != null and orderTimeEnd != ''"> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if>
+ <if test="inStatusList != null and inStatusList.size > 0">
+ and thisTab.status in
+ <foreach item="item" collection="inStatusList" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+
+ </if>
+ <if test="isPrint != null "> and thisTab.is_print = #{isPrint}</if>
+ <if test="printCount != null "> and thisTab.print_count = #{printCount}</if>
+ <if test="printTime != null "> and thisTab.print_time = #{printTime}</if>
+ <if test="printBy != null and printBy != ''"> and thisTab.print_by = #{printBy}</if>
+ <if test="sixLinkNo != null and sixLinkNo != ''"> and thisTab.six_link_no = #{sixLinkNo}</if>
+ <if test="portName != null and portName != ''"> and thisTab.port_name like concat('%', #{portName}, '%')</if>
+ <if test="billNo != null and billNo != ''"> and thisTab.bill_no = #{billNo}</if>
+ <if test="terminalName != null and terminalName != ''"> and thisTab.terminal_name like concat('%', #{terminalName}, '%')</if>
+ <if test="cargoName != null and cargoName != ''"> and thisTab.cargo_name like concat('%', #{cargoName}, '%')</if>
+ <if test="pieceCount != null "> and thisTab.piece_count = #{pieceCount}</if>
+ <if test="weight != null "> and thisTab.weight = #{weight}</if>
+ <if test="contactName != null and contactName != ''"> and thisTab.contact_name like concat('%', #{contactName}, '%')</if>
+ <if test="contactPhone != null and contactPhone != ''"> and thisTab.contact_phone = #{contactPhone}</if>
+
+ <if test="port != null and port != ''"> and thisTab.port = #{port}</if>
+ <if test="seamlessNumber != null and seamlessNumber != ''"> and thisTab.seamless_number = #{seamlessNumber}</if>
+ <if test="seamlessSupplierId != null"> and thisTab.seamless_supplier_id = #{seamlessSupplierId}</if>
+ <if test="seamlessSupplierName != null and seamlessSupplierName != ''"> and thisTab.seamless_supplier_name = #{seamlessSupplierName}</if>
</sql>
<!--鏌ヨ-->
@@ -150,20 +248,19 @@
</where>
order by thisTab.id desc
</select>
-
- <!-- 鏂板 -->
<insert id="insertTmsDispatchOrder" parameterType="com.ruoyi.tms.domain.TmsDispatchOrder" useGeneratedKeys="true" keyProperty="id">
insert into tms_dispatch_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dispatchNo != null and dispatchNo != ''">dispatch_no,</if>
<if test="customerId != null">customer_id,</if>
<if test="customerName != null">customer_name,</if>
- <if test="projectName != null and projectName != ''">project_name,</if>
+ <if test="customerCode != null">customer_code,</if>
<if test="projectId != null">project_id,</if>
+ <if test="projectName != null and projectName != ''">project_name,</if>
<if test="contractId != null">contract_id,</if>
<if test="contractName != null and contractName != ''">contract_name,</if>
- <if test="transportLine != null">transport_line,</if>
<if test="orderType != null">order_type,</if>
+ <if test="transportLine != null">transport_line,</if>
<if test="signType != null">sign_type,</if>
<if test="vehicleProviderId != null">vehicle_provider_id,</if>
<if test="vehicleProviderName != null and vehicleProviderName != ''">vehicle_provider_name,</if>
@@ -177,10 +274,10 @@
<if test="mainDriverId != null">main_driver_id,</if>
<if test="mainDriverName != null and mainDriverName != ''">main_driver_name,</if>
<if test="assistantDriverId != null">assistant_driver_id,</if>
- <if test="assistantDriverName != null">assistant_driver_name,</if>
<if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">required_vehicle_types,</if>
- <if test="containerNo != null">container_no,</if>
+ <if test="assistantDriverName != null">assistant_driver_name,</if>
<if test="vehicleId != null">vehicle_id,</if>
+ <if test="containerNo != null">container_no,</if>
<if test="licensePlate != null and licensePlate != ''">license_plate,</if>
<if test="shipperId != null">shipper_id,</if>
<if test="earliestDeparture != null">earliest_departure,</if>
@@ -192,12 +289,13 @@
<if test="latestArrival != null">latest_arrival,</if>
<if test="departureAddress != null">departure_address,</if>
<if test="shipperRegionCode != null">shipper_region_code,</if>
- <if test="destinationAddress != null">destination_address,</if>
<if test="receiverId != null">receiver_id,</if>
- <if test="actualVehicleType != null">actual_vehicle_type,</if>
+ <if test="destinationAddress != null">destination_address,</if>
<if test="receiverName != null">receiver_name,</if>
- <if test="actualLoadStart != null">actual_load_start,</if>
+ <if test="actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type,</if>
<if test="receiverMobile != null">receiver_mobile,</if>
+ <if test="actualLoadStart != null">actual_load_start,</if>
+ <if test="shipperRegionLabel != null">shipper_region_label,</if>
<if test="receiverAddress != null">receiver_address,</if>
<if test="actualUnloadEnd != null">actual_unload_end,</if>
<if test="receiverRegionCode != null">receiver_region_code,</if>
@@ -205,12 +303,13 @@
<if test="actualArrival != null">actual_arrival,</if>
<if test="actualQuantity != null">actual_quantity,</if>
<if test="actualWeight != null">actual_weight,</if>
+ <if test="receiverRegionLabel != null">receiver_region_label,</if>
<if test="actualVolume != null">actual_volume,</if>
<if test="reweighWeight != null">reweigh_weight,</if>
<if test="containerId != null">container_id,</if>
<if test="electronicLock != null">electronic_lock,</if>
- <if test="shelfId != null">shelf_id,</if>
<if test="emptyMileage != null">empty_mileage,</if>
+ <if test="shelfId != null">shelf_id,</if>
<if test="emptyFuel != null">empty_fuel,</if>
<if test="shelfCode != null">shelf_code,</if>
<if test="loadedMileage != null">loaded_mileage,</if>
@@ -225,17 +324,52 @@
<if test="remark != null">remark,</if>
<if test="accountsReceivableStatus != null">accounts_receivable_status,</if>
<if test="accountsPayableStatus != null">accounts_payable_status,</if>
+ <if test="collectionPlanId != null">collection_plan_id,</if>
+ <if test="paymentPlanId != null">payment_plan_id,</if>
+ <if test="isCustoms != null">is_customs,</if>
+ <if test="startRegionCode != null">start_region_code,</if>
+ <if test="endRegionCode != null">end_region_code,</if>
+ <if test="quoteDetailId != null">quote_detail_id,</if>
+ <if test="operationMode != null">operation_mode,</if>
+ <if test="quotePlanId != null">quote_plan_id,</if>
+ <if test="isLoad != null">is_load,</if>
+ <if test="commissionModel != null">commission_model,</if>
+ <if test="orderTime != null">order_time,</if>
+ <if test="iscc != null">iscc,</if>
+ <if test="closeWhy != null">close_why,</if>
+ <if test="closeTime != null">close_time,</if>
+ <if test="closeBy != null">close_by,</if>
+ <if test="closeRemark != null">close_remark,</if>
+ <if test="isfk != null">isfk,</if>
+ <if test="isPrint != null">is_print,</if>
+ <if test="printCount != null">print_count,</if>
+ <if test="printTime != null">print_time,</if>
+ <if test="printBy != null">print_by,</if>
+ <if test="sixLinkNo != null and sixLinkNo != ''">six_link_no,</if>
+ <if test="portName != null and portName != ''">port_name,</if>
+ <if test="billNo != null and billNo != ''">bill_no,</if>
+ <if test="terminalName != null">terminal_name,</if>
+ <if test="cargoName != null">cargo_name,</if>
+ <if test="pieceCount != null">piece_count,</if>
+ <if test="weight != null">weight,</if>
+ <if test="contactName != null">contact_name,</if>
+ <if test="contactPhone != null">contact_phone,</if>
+ <if test="port != null">port,</if>
+ <if test="seamlessNumber != null">seamless_number,</if>
+ <if test="seamlessSupplierId != null">seamless_supplier_id,</if>
+ <if test="seamlessSupplierName != null">seamless_supplier_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dispatchNo != null and dispatchNo != ''">#{dispatchNo},</if>
<if test="customerId != null">#{customerId},</if>
<if test="customerName != null">#{customerName},</if>
- <if test="projectName != null and projectName != ''">#{projectName},</if>
+ <if test="customerCode != null">#{customerCode},</if>
<if test="projectId != null">#{projectId},</if>
+ <if test="projectName != null and projectName != ''">#{projectName},</if>
<if test="contractId != null">#{contractId},</if>
<if test="contractName != null and contractName != ''">#{contractName},</if>
- <if test="transportLine != null">#{transportLine},</if>
<if test="orderType != null">#{orderType},</if>
+ <if test="transportLine != null">#{transportLine},</if>
<if test="signType != null">#{signType},</if>
<if test="vehicleProviderId != null">#{vehicleProviderId},</if>
<if test="vehicleProviderName != null and vehicleProviderName != ''">#{vehicleProviderName},</if>
@@ -249,10 +383,10 @@
<if test="mainDriverId != null">#{mainDriverId},</if>
<if test="mainDriverName != null and mainDriverName != ''">#{mainDriverName},</if>
<if test="assistantDriverId != null">#{assistantDriverId},</if>
- <if test="assistantDriverName != null">#{assistantDriverName},</if>
<if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">#{requiredVehicleTypes},</if>
- <if test="containerNo != null">#{containerNo},</if>
+ <if test="assistantDriverName != null">#{assistantDriverName},</if>
<if test="vehicleId != null">#{vehicleId},</if>
+ <if test="containerNo != null">#{containerNo},</if>
<if test="licensePlate != null and licensePlate != ''">#{licensePlate},</if>
<if test="shipperId != null">#{shipperId},</if>
<if test="earliestDeparture != null">#{earliestDeparture},</if>
@@ -264,12 +398,13 @@
<if test="latestArrival != null">#{latestArrival},</if>
<if test="departureAddress != null">#{departureAddress},</if>
<if test="shipperRegionCode != null">#{shipperRegionCode},</if>
- <if test="destinationAddress != null">#{destinationAddress},</if>
<if test="receiverId != null">#{receiverId},</if>
- <if test="actualVehicleType != null">#{actualVehicleType},</if>
+ <if test="destinationAddress != null">#{destinationAddress},</if>
<if test="receiverName != null">#{receiverName},</if>
- <if test="actualLoadStart != null">#{actualLoadStart},</if>
+ <if test="actualVehicleType != null and actualVehicleType != ''">#{actualVehicleType},</if>
<if test="receiverMobile != null">#{receiverMobile},</if>
+ <if test="actualLoadStart != null">#{actualLoadStart},</if>
+ <if test="shipperRegionLabel != null">#{shipperRegionLabel},</if>
<if test="receiverAddress != null">#{receiverAddress},</if>
<if test="actualUnloadEnd != null">#{actualUnloadEnd},</if>
<if test="receiverRegionCode != null">#{receiverRegionCode},</if>
@@ -277,12 +412,13 @@
<if test="actualArrival != null">#{actualArrival},</if>
<if test="actualQuantity != null">#{actualQuantity},</if>
<if test="actualWeight != null">#{actualWeight},</if>
+ <if test="receiverRegionLabel != null">#{receiverRegionLabel},</if>
<if test="actualVolume != null">#{actualVolume},</if>
<if test="reweighWeight != null">#{reweighWeight},</if>
<if test="containerId != null">#{containerId},</if>
<if test="electronicLock != null">#{electronicLock},</if>
- <if test="shelfId != null">#{shelfId},</if>
<if test="emptyMileage != null">#{emptyMileage},</if>
+ <if test="shelfId != null">#{shelfId},</if>
<if test="emptyFuel != null">#{emptyFuel},</if>
<if test="shelfCode != null">#{shelfCode},</if>
<if test="loadedMileage != null">#{loadedMileage},</if>
@@ -297,17 +433,51 @@
<if test="remark != null">#{remark},</if>
<if test="accountsReceivableStatus != null">#{accountsReceivableStatus},</if>
<if test="accountsPayableStatus != null">#{accountsPayableStatus},</if>
+ <if test="collectionPlanId != null">#{collectionPlanId},</if>
+ <if test="paymentPlanId != null">#{paymentPlanId},</if>
+ <if test="isCustoms != null">#{isCustoms},</if>
+ <if test="startRegionCode != null">#{startRegionCode},</if>
+ <if test="endRegionCode != null">#{endRegionCode},</if>
+ <if test="quoteDetailId != null">#{quoteDetailId},</if>
+ <if test="operationMode != null">#{operationMode},</if>
+ <if test="quotePlanId != null">#{quotePlanId},</if>
+ <if test="isLoad != null">#{isLoad},</if>
+ <if test="commissionModel != null">#{commissionModel},</if>
+ <if test="orderTime != null">#{orderTime},</if>
+ <if test="iscc != null">#{iscc},</if>
+ <if test="closeWhy != null">#{closeWhy},</if>
+ <if test="closeTime != null">#{closeTime},</if>
+ <if test="closeBy != null">#{closeBy},</if>
+ <if test="closeRemark != null">#{closeRemark},</if>
+ <if test="isfk != null">#{isfk},</if>
+ <if test="isPrint != null">#{isPrint},</if>
+ <if test="printCount != null">#{printCount},</if>
+ <if test="printTime != null">#{printTime},</if>
+ <if test="printBy != null">#{printBy},</if>
+ <if test="sixLinkNo != null and sixLinkNo != ''">#{sixLinkNo},</if>
+ <if test="portName != null and portName != ''">#{portName},</if>
+ <if test="billNo != null and billNo != ''">#{billNo},</if>
+ <if test="terminalName != null">#{terminalName},</if>
+ <if test="cargoName != null">#{cargoName},</if>
+ <if test="pieceCount != null">#{pieceCount},</if>
+ <if test="weight != null">#{weight},</if>
+ <if test="contactName != null">#{contactName},</if>
+ <if test="contactPhone != null">#{contactPhone},</if>
+ <if test="port != null">#{port},</if>
+ <if test="seamlessNumber != null">#{seamlessNumber},</if>
+ <if test="seamlessSupplierId != null">#{seamlessSupplierId},</if>
+ <if test="seamlessSupplierName != null">#{seamlessSupplierName},</if>
</trim>
</insert>
<insert id="insertTmsDispatchOrderBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_dispatch_order
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,dispatch_no,customer_id,customer_name,project_name,project_id,contract_id,contract_name,transport_line,order_type,sign_type,vehicle_provider_id,vehicle_provider_name,loading_service_provider_id,loading_service_provider_name,customs_service_provider_id,customs_service_provider_name,is_urgent,transport_type,load_method,main_driver_id,main_driver_name,assistant_driver_id,assistant_driver_name,required_vehicle_types,container_no,vehicle_id,license_plate,shipper_id,earliest_departure,shipper_name,latest_departure,shipper_mobile,earliest_arrival,shipper_address,latest_arrival,departure_address,shipper_region_code,destination_address,receiver_id,actual_vehicle_type,receiver_name,actual_load_start,receiver_mobile,receiver_address,actual_unload_end,receiver_region_code,actual_departure,actual_arrival,actual_quantity,actual_weight,actual_volume,reweigh_weight,container_id,electronic_lock,shelf_id,empty_mileage,empty_fuel,shelf_code,loaded_mileage,loaded_fuel,shift_no,line_no,status,create_by,create_time,update_by,update_time,remark,accounts_receivable_status,accounts_payable_status,
+ id,dispatch_no,customer_id,customer_name,customer_code,project_id,project_name,contract_id,contract_name,order_type,transport_line,sign_type,vehicle_provider_id,vehicle_provider_name,loading_service_provider_id,loading_service_provider_name,customs_service_provider_id,customs_service_provider_name,is_urgent,transport_type,load_method,main_driver_id,main_driver_name,assistant_driver_id,required_vehicle_types,assistant_driver_name,vehicle_id,container_no,license_plate,shipper_id,earliest_departure,shipper_name,latest_departure,shipper_mobile,earliest_arrival,shipper_address,latest_arrival,departure_address,shipper_region_code,receiver_id,destination_address,receiver_name,actual_vehicle_type,receiver_mobile,actual_load_start,shipper_region_label,receiver_address,actual_unload_end,receiver_region_code,actual_departure,actual_arrival,actual_quantity,actual_weight,receiver_region_label,actual_volume,reweigh_weight,container_id,electronic_lock,empty_mileage,shelf_id,empty_fuel,shelf_code,loaded_mileage,loaded_fuel,shift_no,line_no,status,create_by,create_time,update_by,update_time,remark,accounts_receivable_status,accounts_payable_status,collection_plan_id,payment_plan_id,is_customs,start_region_code,end_region_code,quote_detail_id,operation_mode,quote_plan_id,is_load,commission_model,order_time,iscc,close_why,close_time,close_by,close_remark,isfk,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.dispatchNo},#{item.customerId},#{item.customerName},#{item.projectName},#{item.projectId},#{item.contractId},#{item.contractName},#{item.transportLine},#{item.orderType},#{item.signType},#{item.vehicleProviderId},#{item.vehicleProviderName},#{item.loadingServiceProviderId},#{item.loadingServiceProviderName},#{item.customsServiceProviderId},#{item.customsServiceProviderName},#{item.isUrgent},#{item.transportType},#{item.loadMethod},#{item.mainDriverId},#{item.mainDriverName},#{item.assistantDriverId},#{item.assistantDriverName},#{item.requiredVehicleTypes},#{item.containerNo},#{item.vehicleId},#{item.licensePlate},#{item.shipperId},#{item.earliestDeparture},#{item.shipperName},#{item.latestDeparture},#{item.shipperMobile},#{item.earliestArrival},#{item.shipperAddress},#{item.latestArrival},#{item.departureAddress},#{item.shipperRegionCode},#{item.destinationAddress},#{item.receiverId},#{item.actualVehicleType},#{item.receiverName},#{item.actualLoadStart},#{item.receiverMobile},#{item.receiverAddress},#{item.actualUnloadEnd},#{item.receiverRegionCode},#{item.actualDeparture},#{item.actualArrival},#{item.actualQuantity},#{item.actualWeight},#{item.actualVolume},#{item.reweighWeight},#{item.containerId},#{item.electronicLock},#{item.shelfId},#{item.emptyMileage},#{item.emptyFuel},#{item.shelfCode},#{item.loadedMileage},#{item.loadedFuel},#{item.shiftNo},#{item.lineNo},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.accountsReceivableStatus},#{item.accountsPayableStatus},
+ #{item.id},#{item.dispatchNo},#{item.customerId},#{item.customerName},#{item.customerCode},#{item.projectId},#{item.projectName},#{item.contractId},#{item.contractName},#{item.orderType},#{item.transportLine},#{item.signType},#{item.vehicleProviderId},#{item.vehicleProviderName},#{item.loadingServiceProviderId},#{item.loadingServiceProviderName},#{item.customsServiceProviderId},#{item.customsServiceProviderName},#{item.isUrgent},#{item.transportType},#{item.loadMethod},#{item.mainDriverId},#{item.mainDriverName},#{item.assistantDriverId},#{item.requiredVehicleTypes},#{item.assistantDriverName},#{item.vehicleId},#{item.containerNo},#{item.licensePlate},#{item.shipperId},#{item.earliestDeparture},#{item.shipperName},#{item.latestDeparture},#{item.shipperMobile},#{item.earliestArrival},#{item.shipperAddress},#{item.latestArrival},#{item.departureAddress},#{item.shipperRegionCode},#{item.receiverId},#{item.destinationAddress},#{item.receiverName},#{item.actualVehicleType},#{item.receiverMobile},#{item.actualLoadStart},#{item.shipperRegionLabel},#{item.receiverAddress},#{item.actualUnloadEnd},#{item.receiverRegionCode},#{item.actualDeparture},#{item.actualArrival},#{item.actualQuantity},#{item.actualWeight},#{item.receiverRegionLabel},#{item.actualVolume},#{item.reweighWeight},#{item.containerId},#{item.electronicLock},#{item.emptyMileage},#{item.shelfId},#{item.emptyFuel},#{item.shelfCode},#{item.loadedMileage},#{item.loadedFuel},#{item.shiftNo},#{item.lineNo},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.accountsReceivableStatus},#{item.accountsPayableStatus},#{item.collectionPlanId},#{item.paymentPlanId},#{item.isCustoms},#{item.startRegionCode},#{item.endRegionCode},#{item.quoteDetailId},#{item.operationMode},#{item.quotePlanId},#{item.isLoad},#{item.commissionModel},#{item.orderTime},#{item.iscc},#{item.closeWhy},#{item.closeTime},#{item.closeBy},#{item.closeRemark},#{item.isfk},
</trim>
</foreach>
</insert>
@@ -319,12 +489,13 @@
<if test="dispatchNo != null and dispatchNo != ''">dispatch_no = #{dispatchNo},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
- <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
+ <if test="customerCode != null">customer_code = #{customerCode},</if>
<if test="projectId != null">project_id = #{projectId},</if>
+ <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
<if test="contractId != null">contract_id = #{contractId},</if>
<if test="contractName != null and contractName != ''">contract_name = #{contractName},</if>
- <if test="transportLine != null">transport_line = #{transportLine},</if>
<if test="orderType != null">order_type = #{orderType},</if>
+ <if test="transportLine != null">transport_line = #{transportLine},</if>
<if test="signType != null">sign_type = #{signType},</if>
<if test="vehicleProviderId != null">vehicle_provider_id = #{vehicleProviderId},</if>
<if test="vehicleProviderName != null and vehicleProviderName != ''">vehicle_provider_name = #{vehicleProviderName},</if>
@@ -338,10 +509,10 @@
<if test="mainDriverId != null">main_driver_id = #{mainDriverId},</if>
<if test="mainDriverName != null and mainDriverName != ''">main_driver_name = #{mainDriverName},</if>
<if test="assistantDriverId != null">assistant_driver_id = #{assistantDriverId},</if>
- <if test="assistantDriverName != null">assistant_driver_name = #{assistantDriverName},</if>
<if test="requiredVehicleTypes != null and requiredVehicleTypes != ''">required_vehicle_types = #{requiredVehicleTypes},</if>
- <if test="containerNo != null">container_no = #{containerNo},</if>
+ <if test="assistantDriverName != null">assistant_driver_name = #{assistantDriverName},</if>
<if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
+ <if test="containerNo != null">container_no = #{containerNo},</if>
<if test="licensePlate != null and licensePlate != ''">license_plate = #{licensePlate},</if>
<if test="shipperId != null">shipper_id = #{shipperId},</if>
<if test="earliestDeparture != null">earliest_departure = #{earliestDeparture},</if>
@@ -353,12 +524,13 @@
<if test="latestArrival != null">latest_arrival = #{latestArrival},</if>
<if test="departureAddress != null">departure_address = #{departureAddress},</if>
<if test="shipperRegionCode != null">shipper_region_code = #{shipperRegionCode},</if>
- <if test="destinationAddress != null">destination_address = #{destinationAddress},</if>
<if test="receiverId != null">receiver_id = #{receiverId},</if>
- <if test="actualVehicleType != null">actual_vehicle_type = #{actualVehicleType},</if>
+ <if test="destinationAddress != null">destination_address = #{destinationAddress},</if>
<if test="receiverName != null">receiver_name = #{receiverName},</if>
- <if test="actualLoadStart != null">actual_load_start = #{actualLoadStart},</if>
+ <if test="actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type = #{actualVehicleType},</if>
<if test="receiverMobile != null">receiver_mobile = #{receiverMobile},</if>
+ <if test="actualLoadStart != null">actual_load_start = #{actualLoadStart},</if>
+ <if test="shipperRegionLabel != null">shipper_region_label = #{shipperRegionLabel},</if>
<if test="receiverAddress != null">receiver_address = #{receiverAddress},</if>
<if test="actualUnloadEnd != null">actual_unload_end = #{actualUnloadEnd},</if>
<if test="receiverRegionCode != null">receiver_region_code = #{receiverRegionCode},</if>
@@ -366,12 +538,13 @@
<if test="actualArrival != null">actual_arrival = #{actualArrival},</if>
<if test="actualQuantity != null">actual_quantity = #{actualQuantity},</if>
<if test="actualWeight != null">actual_weight = #{actualWeight},</if>
+ <if test="receiverRegionLabel != null">receiver_region_label = #{receiverRegionLabel},</if>
<if test="actualVolume != null">actual_volume = #{actualVolume},</if>
<if test="reweighWeight != null">reweigh_weight = #{reweighWeight},</if>
<if test="containerId != null">container_id = #{containerId},</if>
<if test="electronicLock != null">electronic_lock = #{electronicLock},</if>
- <if test="shelfId != null">shelf_id = #{shelfId},</if>
<if test="emptyMileage != null">empty_mileage = #{emptyMileage},</if>
+ <if test="shelfId != null">shelf_id = #{shelfId},</if>
<if test="emptyFuel != null">empty_fuel = #{emptyFuel},</if>
<if test="shelfCode != null">shelf_code = #{shelfCode},</if>
<if test="loadedMileage != null">loaded_mileage = #{loadedMileage},</if>
@@ -386,6 +559,43 @@
<if test="remark != null">remark = #{remark},</if>
<if test="accountsReceivableStatus != null">accounts_receivable_status = #{accountsReceivableStatus},</if>
<if test="accountsPayableStatus != null">accounts_payable_status = #{accountsPayableStatus},</if>
+ <if test="collectionPlanId != null">collection_plan_id = #{collectionPlanId},</if>
+ <if test="paymentPlanId != null">payment_plan_id = #{paymentPlanId},</if>
+ <if test="isCustoms != null">is_customs = #{isCustoms},</if>
+ <if test="startRegionCode != null">start_region_code = #{startRegionCode},</if>
+ <if test="endRegionCode != null">end_region_code = #{endRegionCode},</if>
+ <if test="quoteDetailId != null">quote_detail_id = #{quoteDetailId},</if>
+ <if test="operationMode != null">operation_mode = #{operationMode},</if>
+ <if test="quotePlanId != null">quote_plan_id = #{quotePlanId},</if>
+ <if test="confirmTime != null">confirm_time = #{confirmTime},</if>
+ <if test="okTime != null">ok_time = #{okTime},</if>
+ <if test="isLoad != null">is_load = #{isLoad},</if>
+ <if test="commissionModel != null">commission_model = #{commissionModel},</if>
+ <if test="orderTime != null">order_time = #{orderTime},</if>
+ <if test="iscc != null">iscc = #{iscc},</if>
+ <if test="closeWhy != null">close_why = #{closeWhy},</if>
+ <if test="closeTime != null">close_time = #{closeTime},</if>
+ <if test="closeBy != null">close_by = #{closeBy},</if>
+ <if test="closeRemark != null">close_remark = #{closeRemark},</if>
+ <if test="isfk != null">isfk = #{isfk},</if>
+ <if test="isPrint != null">is_print = #{isPrint},</if>
+ <if test="printCount != null">print_count = #{printCount},</if>
+ <if test="printTime != null">print_time = #{printTime},</if>
+ <if test="printBy != null">print_by = #{printBy},</if>
+ <if test="sixLinkNo != null and sixLinkNo != ''">six_link_no = #{sixLinkNo},</if>
+ <if test="portName != null and portName != ''">port_name = #{portName},</if>
+ <if test="billNo != null and billNo != ''">bill_no = #{billNo},</if>
+ <if test="terminalName != null">terminal_name = #{terminalName},</if>
+ <if test="cargoName != null">cargo_name = #{cargoName},</if>
+ <if test="pieceCount != null">piece_count = #{pieceCount},</if>
+ <if test="weight != null">weight = #{weight},</if>
+ <if test="contactName != null">contact_name = #{contactName},</if>
+ <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+ <if test="port != null">port = #{port},</if>
+ <if test="seamlessNumber != null">seamless_number = #{seamlessNumber},</if>
+ <if test="seamlessSupplierId != null">seamless_supplier_id = #{seamlessSupplierId},</if>
+ <if test="seamlessSupplierName != null">seamless_supplier_name = #{seamlessSupplierName},</if>
+ <if test="notes != null">notes = #{notes},</if>
</trim>
where id = #{id}
</update>
@@ -397,12 +607,13 @@
<if test="item.dispatchNo != null and item.dispatchNo != ''">dispatch_no = #{item.dispatchNo},</if>
<if test="item.customerId != null">customer_id = #{item.customerId},</if>
<if test="item.customerName != null">customer_name = #{item.customerName},</if>
- <if test="item.projectName != null and item.projectName != ''">project_name = #{item.projectName},</if>
+ <if test="item.customerCode != null">customer_code = #{item.customerCode},</if>
<if test="item.projectId != null">project_id = #{item.projectId},</if>
+ <if test="item.projectName != null and item.projectName != ''">project_name = #{item.projectName},</if>
<if test="item.contractId != null">contract_id = #{item.contractId},</if>
<if test="item.contractName != null and item.contractName != ''">contract_name = #{item.contractName},</if>
- <if test="item.transportLine != null">transport_line = #{item.transportLine},</if>
<if test="item.orderType != null">order_type = #{item.orderType},</if>
+ <if test="item.transportLine != null">transport_line = #{item.transportLine},</if>
<if test="item.signType != null">sign_type = #{item.signType},</if>
<if test="item.vehicleProviderId != null">vehicle_provider_id = #{item.vehicleProviderId},</if>
<if test="item.vehicleProviderName != null and item.vehicleProviderName != ''">vehicle_provider_name = #{item.vehicleProviderName},</if>
@@ -416,10 +627,10 @@
<if test="item.mainDriverId != null">main_driver_id = #{item.mainDriverId},</if>
<if test="item.mainDriverName != null and item.mainDriverName != ''">main_driver_name = #{item.mainDriverName},</if>
<if test="item.assistantDriverId != null">assistant_driver_id = #{item.assistantDriverId},</if>
- <if test="item.assistantDriverName != null">assistant_driver_name = #{item.assistantDriverName},</if>
<if test="item.requiredVehicleTypes != null and item.requiredVehicleTypes != ''">required_vehicle_types = #{item.requiredVehicleTypes},</if>
- <if test="item.containerNo != null">container_no = #{item.containerNo},</if>
+ <if test="item.assistantDriverName != null">assistant_driver_name = #{item.assistantDriverName},</if>
<if test="item.vehicleId != null">vehicle_id = #{item.vehicleId},</if>
+ <if test="item.containerNo != null">container_no = #{item.containerNo},</if>
<if test="item.licensePlate != null and item.licensePlate != ''">license_plate = #{item.licensePlate},</if>
<if test="item.shipperId != null">shipper_id = #{item.shipperId},</if>
<if test="item.earliestDeparture != null">earliest_departure = #{item.earliestDeparture},</if>
@@ -431,12 +642,13 @@
<if test="item.latestArrival != null">latest_arrival = #{item.latestArrival},</if>
<if test="item.departureAddress != null">departure_address = #{item.departureAddress},</if>
<if test="item.shipperRegionCode != null">shipper_region_code = #{item.shipperRegionCode},</if>
- <if test="item.destinationAddress != null">destination_address = #{item.destinationAddress},</if>
<if test="item.receiverId != null">receiver_id = #{item.receiverId},</if>
- <if test="item.actualVehicleType != null">actual_vehicle_type = #{item.actualVehicleType},</if>
+ <if test="item.destinationAddress != null">destination_address = #{item.destinationAddress},</if>
<if test="item.receiverName != null">receiver_name = #{item.receiverName},</if>
- <if test="item.actualLoadStart != null">actual_load_start = #{item.actualLoadStart},</if>
+ <if test="item.actualVehicleType != null and actualVehicleType != ''">actual_vehicle_type = #{item.actualVehicleType},</if>
<if test="item.receiverMobile != null">receiver_mobile = #{item.receiverMobile},</if>
+ <if test="item.actualLoadStart != null">actual_load_start = #{item.actualLoadStart},</if>
+ <if test="item.shipperRegionLabel != null">shipper_region_label = #{item.shipperRegionLabel},</if>
<if test="item.receiverAddress != null">receiver_address = #{item.receiverAddress},</if>
<if test="item.actualUnloadEnd != null">actual_unload_end = #{item.actualUnloadEnd},</if>
<if test="item.receiverRegionCode != null">receiver_region_code = #{item.receiverRegionCode},</if>
@@ -444,12 +656,13 @@
<if test="item.actualArrival != null">actual_arrival = #{item.actualArrival},</if>
<if test="item.actualQuantity != null">actual_quantity = #{item.actualQuantity},</if>
<if test="item.actualWeight != null">actual_weight = #{item.actualWeight},</if>
+ <if test="item.receiverRegionLabel != null">receiver_region_label = #{item.receiverRegionLabel},</if>
<if test="item.actualVolume != null">actual_volume = #{item.actualVolume},</if>
<if test="item.reweighWeight != null">reweigh_weight = #{item.reweighWeight},</if>
<if test="item.containerId != null">container_id = #{item.containerId},</if>
<if test="item.electronicLock != null">electronic_lock = #{item.electronicLock},</if>
- <if test="item.shelfId != null">shelf_id = #{item.shelfId},</if>
<if test="item.emptyMileage != null">empty_mileage = #{item.emptyMileage},</if>
+ <if test="item.shelfId != null">shelf_id = #{item.shelfId},</if>
<if test="item.emptyFuel != null">empty_fuel = #{item.emptyFuel},</if>
<if test="item.shelfCode != null">shelf_code = #{item.shelfCode},</if>
<if test="item.loadedMileage != null">loaded_mileage = #{item.loadedMileage},</if>
@@ -464,6 +677,36 @@
<if test="item.remark != null">remark = #{item.remark},</if>
<if test="item.accountsReceivableStatus != null">accounts_receivable_status = #{item.accountsReceivableStatus},</if>
<if test="item.accountsPayableStatus != null">accounts_payable_status = #{item.accountsPayableStatus},</if>
+ <if test="item.collectionPlanId != null">collection_plan_id = #{item.collectionPlanId},</if>
+ <if test="item.paymentPlanId != null">payment_plan_id = #{item.paymentPlanId},</if>
+ <if test="item.isCustoms != null">is_customs = #{item.isCustoms},</if>
+ <if test="item.startRegionCode != null">start_region_code = #{item.startRegionCode},</if>
+ <if test="item.endRegionCode != null">end_region_code = #{item.endRegionCode},</if>
+ <if test="item.quoteDetailId != null">quote_detail_id = #{item.quoteDetailId},</if>
+ <if test="item.operationMode != null">operation_mode = #{item.operationMode},</if>
+ <if test="item.quotePlanId != null">quote_plan_id = #{item.quotePlanId},</if>
+ <if test="item.isLoad != null">is_load = #{item.isLoad},</if>
+ <if test="item.commissionModel != null">commission_model = #{item.commissionModel},</if>
+ <if test="item.orderTime != null">order_time = #{item.orderTime},</if>
+ <if test="item.iscc != null">iscc = #{item.iscc},</if>
+ <if test="item.closeWhy != null">close_why = #{item.closeWhy},</if>
+ <if test="item.closeTime != null">close_time = #{item.closeTime},</if>
+ <if test="item.closeBy != null">close_by = #{item.closeBy},</if>
+ <if test="item.closeRemark != null">close_remark = #{item.closeRemark},</if>
+ <if test="item.isfk != null">isfk = #{item.isfk},</if>
+ <if test="item.isPrint != null">is_print = #{item.isPrint},</if>
+ <if test="item.printCount != null">print_count = #{item.printCount},</if>
+ <if test="item.printTime != null">print_time = #{item.printTime},</if>
+ <if test="item.printBy != null">print_by = #{item.printBy},</if>
+ <if test="item.sixLinkNo != null and item.sixLinkNo != ''">six_link_no = #{item.sixLinkNo},</if>
+ <if test="item.portName != null and item.portName != ''">port_name = #{item.portName},</if>
+ <if test="item.billNo != null and item.billNo != ''">bill_no = #{item.billNo},</if>
+ <if test="item.terminalName != null">terminal_name = #{item.terminalName},</if>
+ <if test="item.cargoName != null">cargo_name = #{item.cargoName},</if>
+ <if test="item.pieceCount != null">piece_count = #{item.pieceCount},</if>
+ <if test="item.weight != null">weight = #{item.weight},</if>
+ <if test="item.contactName != null">contact_name = #{item.contactName},</if>
+ <if test="item.contactPhone != null">contact_phone = #{item.contactPhone},</if>
</trim>
where id = #{item.id}
</foreach>
@@ -480,4 +723,117 @@
</foreach>
</delete>
+ <select id="selectAssignedItineraryList" resultType="com.ruoyi.tms.domain.vo.DriverDispatchVo">
+
+ SELECT tdo.dispatch_no, tdo.customer_name, tdo.license_plate,tdo.transport_line,tdo.status,tdo.latest_departure,
+ tdd.status as tddStatus,tdd.driver_id,tdd.dispatch_id,tdo.ok_time
+ FROM tms_dispatch_order AS tdo
+ LEFT JOIN tms_driver_dispatch AS tdd
+ ON tdo.id = tdd.dispatch_id
+ where 1 = 1
+ <if test="inStatusList != null and inStatusList.size > 0">
+ and tdd.status in
+ <foreach item="item" collection="inStatusList" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+
+ </if>
+ <if test="inTdoStatusList != null and inTdoStatusList.size > 0">
+ and tdo.status in
+ <foreach item="item" collection="inTdoStatusList" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+
+ </if>
+
+
+ and tdd.driver_id = #{driverId};
+ </select>
+ <select id="selectAssignedItineraryDetail" resultType="com.ruoyi.tms.domain.vo.DriverDispatchVo">
+ SELECT tdo.dispatch_no, tdo.customer_name, tdo.license_plate,tdo.transport_line,tdo.status,tdo.latest_departure,
+ tdd.status as tddStatus,tdd.driver_id,tdd.dispatch_id,tdo.ok_time,tdo.shelf_code,tdo.shipper_address,tdo.receiver_address
+ FROM tms_dispatch_order AS tdo
+ LEFT JOIN tms_driver_dispatch AS tdd
+ ON tdo.id = tdd.dispatch_id
+ where tdo.id = #{dispatchId} and tdd.driver_id = #{driverId};
+
+ </select>
+ <select id="selectselectDpData" resultType="com.ruoyi.tms.domain.vo.DpDriverDispatchVo">
+ SELECT
+ tdo.main_driver_name as driverName,
+ tdo.dispatch_no as dispatchNo,
+ tdo.confirm_time as confirmTime,
+ tdo.license_plate as licensePlate,
+ tdo.status,
+ src.region_name AS startRegionName,
+
+ erc.region_name AS endRegionName
+FROM (
+ SELECT id
+ FROM tms_dispatch_order
+ WHERE `status` IN (2, 3)
+ and is_customs=0
+ ORDER BY confirm_time DESC
+ LIMIT 50
+) tmp
+JOIN tms_dispatch_order tdo ON tmp.id = tdo.id
+LEFT JOIN tms_region src ON SUBSTRING_INDEX(tdo.start_region_code, ',', -1) = src.region_code
+LEFT JOIN tms_region erc ON SUBSTRING_INDEX(tdo.end_region_code, ',', -1) = erc.region_code
+ORDER BY tdo.confirm_time DESC
+ </select>
+ <select id="selectDataByNo" resultType="com.ruoyi.tms.domain.vo.DpDriverDispatchItemVo">
+
+ SELECT
+ tdo.dispatch_no as dispatchNo,
+ tdo.customer_name as customerName,
+ tdo.project_name as projectName
+,
+ tdo.transport_line as transportLine,
+ tdo.confirm_time as confirmTime,
+ tdo.create_time as createTime,
+ tdo.main_driver_name as driverName,
+ tdo.license_plate as licensePlate,
+ JSON_ARRAYAGG(
+ JSON_OBJECT(
+ 'tripTime', DATE_FORMAT(tr.trip_time, '%Y.%m.%d %H:%i:%s'),
+ 'status', (SELECT dict_label FROM sys_dict_data WHERE dict_type='trip_type' AND dict_value = tr.trip_type),
+ 'address', tr.address
+ )
+ ) AS trips
+FROM tms_dispatch_order tdo
+LEFT JOIN tms_trip tr ON tr.dispatch_order_id = tdo.id
+WHERE tdo.dispatch_no = #{no}
+GROUP BY tdo.id
+ </select>
+ <select id="selectItineraryLog" resultType="com.ruoyi.tms.domain.vo.DpItineraryLogVo">
+
+ SELECT
+ tr.vehicle_number as vehicleNumber,
+ tr.trip_time as tripTime ,
+ tdo.dispatch_no as dispatchNo ,
+CASE
+ trip_type
+ WHEN 0 THEN
+ '寮�濮嬬敵鎶�'
+ WHEN 3 THEN
+ '瀹℃牳閫氳繃'
+ WHEN 4 THEN
+ '娴峰叧楠屾斁'
+ WHEN 5 THEN
+ '鏀捐绂诲満'
+ end as remark
+ FROM
+ tms_trip tr
+ LEFT JOIN tms_dispatch_order tdo ON tr.dispatch_order_id = tdo.id
+ WHERE
+ tdo.`status` = 3
+ AND tr.trip_type IN (
+ 0,
+ 3,
+ 4,
+ 5)
+ order by tr.trip_time desc
+ limit 50
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0