From 3b7eb76a2cb6d8d3232222325c5aac5a286ed848 Mon Sep 17 00:00:00 2001
From: "huojin\\hj" <982011>
Date: Fri, 13 Jun 2025 18:05:14 +0800
Subject: [PATCH] no message

---
 .../config/origen/shipment/maintainShipmentAllPage.xml      | 6 ++++++
 .../origen/shipmentFee/maintainShipmentCDFeeViewPage.xml    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
index 084cc04..c6ad753 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
@@ -99,6 +99,9 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
  CAST(round(shipment.fee6,2) as string),
  CAST(round(shipment.fee9,2) as string),
  CAST(round(shipment.fee5,2) as string),
+ CAST(round(shipment.fee10,2) as string),
+ CAST(round(shipment.imprest,2) as string),
+ CAST(round(shipment.profit,2) as string), 
  CAST(round(shipment.payfee,2) as string),
  CAST(round(shipment.weight,2) as  string),
  CAST(round(shipment.volume,2) as  string),
@@ -161,6 +164,9 @@ order by shipment.operatorDate desc
          	<column id="shipment.fee6" title="feeName.jjf" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
             <column id="shipment.fee9" title="预付款" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
             <column id="shipment.fee5" title="其他费" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
+            <column id="shipment.fee10" title="垫付车贷款" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
+            <column id="shipment.imprest" title="甲醇费" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
+            <column id="shipment.profit" title="易流费" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
             <column id="shipment.payfee" title="shipment.payfee" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
             <column id="shipment.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="shipment.volume" title="volume" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipmentFee/maintainShipmentCDFeeViewPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipmentFee/maintainShipmentCDFeeViewPage.xml
index f887677..7e08aa8 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipmentFee/maintainShipmentCDFeeViewPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipmentFee/maintainShipmentCDFeeViewPage.xml
@@ -94,7 +94,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
  /~shipment.planLeaveTime: AND shipment.planLeaveTime = {shipment.planLeaveTime}~/
  /~shipment.planArriveTime: AND shipment.planArriveTime = {shipment.planArriveTime}~/
  /~shipment.carrier.id: AND shipment.carrier.id = {shipment.carrier.id}~/
- /~vehicle.license: AND shipment.vehicle.license <= {vehicle.license}~/
+ /~vehicle.license: AND shipment.license like upper({vehicle.license})~/
  /~shipment.payfee: AND shipment.payfee <= {shipment.payfee}~/  
  /~shipment.relatebill3: AND upper(shipment.orderGroupCode) like upper({shipment.relatebill3})~/ 
  /~shipment.driverName: AND shipment.driverName like {shipment.driverName}~/