From 3974fad5d836431e417e99220cc07bb5b0aba331 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 08 十二月 2025 14:16:16 +0800
Subject: [PATCH] 提交
---
tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
index 3f972aa..7e27944 100644
--- a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
@@ -81,10 +81,21 @@
<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" />
+
</resultMap>
<sql id="selectTmsDispatchOrderVo">
- 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 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 from tms_dispatch_order AS thisTab
</sql>
<sql id="selectTmsDispatchOrderVoCount">
select count(0) from tms_dispatch_order as thisTab
@@ -138,6 +149,20 @@
<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="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>
</sql>
<!--鏌ヨ-->
@@ -204,7 +229,7 @@
<if test="receiverId != null">receiver_id,</if>
<if test="destinationAddress != null">destination_address,</if>
<if test="receiverName != null">receiver_name,</if>
- <if test="actualVehicleType != null">actual_vehicle_type,</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>
@@ -238,6 +263,14 @@
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dispatchNo != null and dispatchNo != ''">#{dispatchNo},</if>
@@ -281,7 +314,7 @@
<if test="receiverId != null">#{receiverId},</if>
<if test="destinationAddress != null">#{destinationAddress},</if>
<if test="receiverName != null">#{receiverName},</if>
- <if test="actualVehicleType != null">#{actualVehicleType},</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>
@@ -315,17 +348,25 @@
<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>
</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,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,
+ 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
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{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.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}
</trim>
</foreach>
</insert>
@@ -375,7 +416,7 @@
<if test="receiverId != null">receiver_id = #{receiverId},</if>
<if test="destinationAddress != null">destination_address = #{destinationAddress},</if>
<if test="receiverName != null">receiver_name = #{receiverName},</if>
- <if test="actualVehicleType != null">actual_vehicle_type = #{actualVehicleType},</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>
@@ -409,6 +450,17 @@
<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>
+
</trim>
where id = #{id}
</update>
@@ -458,7 +510,7 @@
<if test="item.receiverId != null">receiver_id = #{item.receiverId},</if>
<if test="item.destinationAddress != null">destination_address = #{item.destinationAddress},</if>
<if test="item.receiverName != null">receiver_name = #{item.receiverName},</if>
- <if test="item.actualVehicleType != null">actual_vehicle_type = #{item.actualVehicleType},</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>
@@ -492,6 +544,14 @@
<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>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0