diff --git a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml
index 1063507..19e9c02 100644
--- a/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml
@@ -99,7 +99,11 @@ l.currentPosition,
  where 1=1
  and ( /~ordersAll:  {ordersAll} = true~/  )  
  and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM})
- and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or o.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
   /~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/
   /~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/
   /~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} )
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml
index 2abdcd9..e6d8b00 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml
@@ -88,9 +88,14 @@ s          	<date id="l.order.planArriveTime1" title="order.planArriveTime" row=
  left join l.executer 
  left join l.supplier
  left join l.company  
- where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION' )
+ where 1=1
+ and l.executer = #{SESSION_PLATFORM} 
+ and l.status in( 'UNDISTRIBUTION' )
  and l.turnCar=1 
- and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ )
 /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
 /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
 /~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml
index b3ceca5..8cc4abd 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml
@@ -99,10 +99,20 @@
  left join l.company  
  left join l.fromLocation
  left join l.toLocation
- where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION','' )
- and l.turnCar=0 and l.turnShipment=0 and l.turnDelivery=0 
- and ((l.order.isShortBarge=0 or l.order.cusBill=1) or (l.order.isShortBarge=1 and l.nodeIndex>1))
- and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ where 1=1
+ and l.executer = #{SESSION_PLATFORM} 
+ and l.status in( 'UNDISTRIBUTION','' )
+ and l.turnCar=0 
+ and l.turnShipment=0 
+ and l.turnDelivery=0 
+ and (
+ (l.order.isShortBarge=0 or l.order.cusBill=1) 
+ or (l.order.isShortBarge=1 and l.nodeIndex>1)
+ )
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ )
 /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
 /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
 /~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/
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 88fc8b3..6931789 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml
@@ -120,7 +120,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
  WHERE 1=1  
  and shipment.platForm=#{SESSION_PLATFORM}
  and shipment.status!='CANCEL'
- and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  )  )
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or shipment.operator = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
   and ((/~shipment.operatorDate :{shipment.operatorDate} ~/=shipment.operatorDate)  or ( /~ordersAll: {ordersAll} = true~/ ))
  /~shipment.code: AND shipment.code like upper({shipment.code})~/
   /~shipment.transportType: AND shipment.transportType = {shipment.transportType}~/  
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml
index 715da83..b4c8eb2 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml
@@ -114,7 +114,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
  and shipment.shipmentDepartment='专线' 
  and shipment.isShortBarge=false 
  and shipment.platForm= #{SESSION_PLATFORM} 
- and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or shipment.operator = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
  and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ ) 
   /~shipment.code: AND shipment.code like upper({shipment.code})~/
   /~shipment.status: AND shipment.status = {shipment.status}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
index c651bd4..67c6f71 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
@@ -102,9 +102,18 @@
  left join orders.fromLocation.city.zone fromZone
  left join orders.toLocation.city.zone toZone 
  left join orders.routeFee
- WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
+ WHERE 1=1
+ and pf = #{SESSION_PLATFORM}   
+ and orders.isShortBarge=false
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
+ and (
+ orders.status in('AVAILABLE','TRANS_AVAILABLE') 
+ or ( /~ordersAll:  {ordersAll} = true~/  )
+ )
  /~order.code: AND orders.code like {order.code}~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
  /~order.status: AND orders.status = {order.status}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
index 59642f5..b7e7663 100644
--- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
@@ -99,9 +99,17 @@
  FROM Order orders 
  left join orders.contractor as pf
  left join orders.extends1 vt1 
- where orders.contractor = #{SESSION_PLATFORM}
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
+ where 1=1
+ and orders.contractor = #{SESSION_PLATFORM}
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
+ and (
+ orders.status in('AVAILABLE','TRANS_AVAILABLE') 
+ or ( /~ordersAll:  {ordersAll} = true~/  )
+ )
 /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 /~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
 /~orders.status: AND orders.status = {orders.status}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
index 3d4a451..c5dbb2b 100644
--- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
@@ -93,10 +93,18 @@
  left join orders.toLocation as ot 
  left join orders.routeFee
  left join orders.extends1 vt1
- where orders.contractor = #{SESSION_PLATFORM} 
+ where 1=1
+ and orders.contractor = #{SESSION_PLATFORM} 
  and orders.status !='CANCEL'  
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
+ and (
+ #{SESSION_USERS_NAME} = 'admin' 
+ or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ )
+ and (
+ orders.status !='SIGNED' 
+ or (/~isAll:  {isAll} = true~/)
+ )
  /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 /~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName  LIKE {ov.carrierName})~/
diff --git a/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml b/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml
deleted file mode 100644
index 1063507..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainWayFillPage" title="maintainWayFillPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="l.ecNo" title="shipmentLegsQueryPage.l.legNo" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="organization.customer" title="organization.customer" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" />
-                <text id="shipment.code" title="shipment.code" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <list id="shipment.status" title="shipment.status" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentStatus">
-                    <hql><![CDATA[  SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'ShipmentStatus' order by enumerate.id]]></hql>
-                </list>
-                <remote id="shipment.carrier.id" title="shipment.carrier" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
-                    <hql><![CDATA[ select 
- carrier.id, 
- carrier.name 
- from Organization  carrier
- where carrier.disabled=false 
-	 and (carrier.beCarrier=true
-	 or carrier.beInCarrier=true)
-     and (upper(carrier.code) like upper(:param) or carrier.name like :param)
-     and (carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
-or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
-/~carrier.name: and carrier.name like {carrier.name}~/]]></hql>
-                    <inputUIs>
-                        <text id="carrier.name" title="maintainShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                <text id="vehicle.license" title="vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <date id="shipment.planLeaveTime" title="shipment.planLeaveTime" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="shipment.planArriveTime" title="shipment.planArriveTime" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            	<remote id="orders.consignor.id" title="consignor" row="4" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable" displayedTableHead="序号,代码,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.code,
- org.name,
- org.department.code
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
- or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
- and org.disabled=false
- ]]></hql>
-                </remote>
-                <list id="shipment.shipmentDepartment" title="shipment.shipmentDepartment" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[  SELECT 
-  commonCode.code,
-  commonCode.name From CommonCode commonCode 
-  where commonCode.codeType = '调度部门' 
-  order by commonCode.id]]></hql>
-                </list>
-                <text id="o.toName" title="orders.toName" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="o.toContact.address" title="toAddress" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-            	 <dateRanger id="orders.planFromDate" title="orders.planFromDate" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-            	 <text id="orders.customerOrderNO" title="orders.customerOrderNO" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-            	<checkbox id="ordersAll" title="ordersAll" row="8" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT 
- l.id,
- l.ecNo,
- l.order.customerOrderNO,
- l.order.consignor.shortName,
- round(l.quantity,0)||l.order.unitOne,
- CAST(round(l.weight,2) as string),
- CAST(round(l.volume,2) as string),
- l.leaveTime,
-  shipment.license,
- case when shipment.id is not null then shipment.driverName else l.supplier.contact.linkman end ,
- case when shipment.id is not null then shipment.driverPhone else l.supplier.contact.phone end ,
- o.paymentMethod,
- (l.payfee+l.otherFee),
- l.status,
- o.toName,
- o.toContact.address,
- o.toContact.linkman,
- o.toContact.phone,
- case when shipment.id is not null then carrier.name else (l.supplier.shortName||'(供)') end ,
- case when shipment.id is not null then carrier.customer else  l.supplier.customer end  ,
-l.currentPosition,
- l.positionTime,
- shipment.secondDriverName,
- o.planFromDate,
- o.planArriveTime,
- l.arriveTime 
- FROM  Legs l 
- left join l.supplier 
- left join l.order o 
- left join l.order.consignor 
- left join l.shipment shipment 
- left join l.shipment.carrier carrier
- left join l.shipment.vehicle vehicle
- left join l.shipment.driver driver
- where 1=1
- and ( /~ordersAll:  {ordersAll} = true~/  )  
- and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM})
- and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
-  /~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/
-  /~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/
-  /~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} )
-   or ({shipment.shipmentDepartment}='发货部' and l.supplier is not null and l.shipment is null))~/
-   /~orders.consignor.id: AND l.order.consignor.id = {orders.consignor.id}~/
-  /~o.toName: AND upper(o.toName) like upper({o.toName})~/
-  /~organization.customer: AND (upper(l.supplier.customer) like upper({organization.customer}) or upper(l.shipment.carrier.customer) like upper({organization.customer}))~/
-  /~shipment.code: AND upper(shipment.code) like upper({shipment.code})~/
-  /~shipment.status: AND shipment.status = {shipment.status}~/
-  /~shipment.planLeaveTime: AND shipment.planLeaveTime = {shipment.planLeaveTime}~/
-  /~shipment.planArriveTime: AND shipment.planArriveTime = {shipment.planArriveTime}~/
-  /~shipment.carrier.id: AND (shipment.carrier.id = {shipment.carrier.id} or l.supplier.id = {shipment.carrier.id})~/
-  /~vehicle.license: AND shipment.vehicle.license like {vehicle.license}~/
-  /~o.toName: AND upper(o.toName) like upper({o.toName})~/
-  /~o.toContact.address: AND upper(o.toContact.address) like upper({o.toContact.address})~/
-	/~startDate: AND trunc(o.planFromDate) >= {startDate}~/
-	/~endDate: AND trunc(o.planFromDate) <= {endDate}~/
-  order by l.id desc
- ]]></datasource>
-        <columns>
-         	<column id="l.id" title="shipmentLegsQueryPage.l.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.legNo" title="shipmentLegsQueryPage.l.legNo" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="order.consignor.name" width="70" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.quantity" title="quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.volume" title="volume" width="60" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.leaveTime" title="shipment.leaveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="vehicle.license" title="maintainShipmentPage.vehicle.license" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.driver.name" width="80" title="driverName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.driverPhone" width="80" title="driverPhone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="o.paymentMethod" title="orders.paymentMethod" visible="true" horizonAlign="left" verticalAlign="middle" format="colourFKFSFormatter"/>
-            <column id="l.payfee" width="80" title="payfee" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.status" width="80" title="legs.status" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="LegsStatus"/>
-            <column id="orders.toName" title="orders.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toContact.linkman" width="60" title="linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toContact.phone" title="phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.carrier.name" title="shipment.carrier" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="carrier.customer" width="70" title="carrier.customer" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.currentPosition" width="80" title="shipment.currentPosition" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.positionTime" title="shipment.positionTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            
-            <column id="shipment.secondDriverName" title="secondDriverName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="order.planFromDate" title="orders.planFromDate" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="order.planArriveTime" title="order.planArriveTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.arriveTime" title="legs.arriveTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-            <popup id="saveWayFillButton" title="maintainWayFillPage.saveWayFillButton" enableType="multi" invisible="false" containId="true" pageId="editWayFillPage">
-            	<enableExpression><![CDATA[ ${l.status} == 'DISPATCHED'|| ${l.status} == 'ONROAD' || ${l.status} == 'SH_ONROAD' || ${l.status} == 'FH_ONROAD'|| ${l.status} == 'ZC_ONROAD'|| ${l.status} == 'GYS_ONROAD']]></enableExpression>
-            </popup>
-        	<popup id="kfOnroadConfirm" title="kfOnroadConfirm" enableType="multi" invisible="false" containId="true" pageId="editKfOnroadConfirmPage">
-        		<enableExpression><![CDATA[ ${l.status} == 'DISPATCHED' ]]></enableExpression>
-            </popup>
-        	<popup id="kfArriveConfirm" title="kfArriveConfirm" enableType="multi" invisible="false" containId="true" pageId="editKfArriveConfirmPage">
-        		<enableExpression><![CDATA[${l.status} == 'LOADING' || ${l.status} == 'ONROAD' || ${l.status} == 'SH_ONROAD' || ${l.status} == 'FH_ONROAD'|| ${l.status} == 'ZC_ONROAD'|| ${l.status} == 'GYS_ONROAD']]></enableExpression>
-            </popup>
-        	<popup id="SeeTrackShipment" title="seeTrack" enableType="multi" invisible="false" containId="true" pageId="modifySeeTrackShipmentPage">
-            </popup>
-            <popup id="saveWayFeeButton" title="shipmnetLegsFeeIn" enableType="single" invisible="false" containId="true" pageId="modifySupplierLegsFeePage">
-            </popup>
-            <commit id="cancelLegs" title="cancelLegs" enableType="multi" invisible="false">
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="shipmentManager" methodName="cancelLegs" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-        </buttons>
-        
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml
deleted file mode 100644
index 2abdcd9..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainOrderLegsDedicatedPage" title="maintainOrderLegsDedicatedPage" autoQuery="false">
-       <search>
-         <inputUIs>
-             <text id="l.ecNo" title="shipmentLegsQueryPage.l.legNo" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <remote id="orders.consignor.id" title="consignor" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable" displayedTableHead="序号,代码,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.code,
- org.name,
- org.department.code
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
- or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
- and org.disabled=false
- ]]></hql>
-                </remote>
- 				<numberText id="l.weight1" title="weightThan" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="Double" decimal="2"/>
-                <numberText id="l.weight2" title="weightLess" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="Double" decimal="2"/>
-                 <text id="l.fromContact.address" title="fromAddress" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                  <text id="l.toContact.address" title="toAddress" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-			<date id="l.order.orderDate1" title="order.orderDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            <date id="l.order.orderDate2" title="endDate" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-          	<date id="l.order.planFromTime1" title="orders.planFromDate" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            <date id="l.order.planFromTime2" title="endDate" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-s          	<date id="l.order.planArriveTime1" title="order.planArriveTime" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            <date id="l.order.planArriveTime2" title="endDate" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-          	<list id="orders.superviseType" title="orders.cargoType" row="7" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="SuperviseType" >
-                    <hql><![CDATA[ SELECT 
-   enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'SuperviseType' order by enumerate.id asc ]]></hql> 
-                </list>
-<!--             <checkbox id="ordersAll" title="ordersAll" row="6" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-        </search>
-       <datasource type="hql"><![CDATA[ select 
-  l.id,
-  DATE_FORMAT(l.order.planFromDate,'%Y-%m-%d') ||' '|| l.order.planFromTime,
-  l.ecNo,
-  l.tempShipment.vehicle.license,
-  l.order.superviseType,
-  l.order.fromContact.address,
-  l.order.toContact.address,
-  l.order.consignor.shortName,
-  l.quantity||l.order.unitOne,
-  round(l.weight,3),
-  round(l.volume,3),
-  fromCity.name||'-'||toCity.name,
-  l.order.paymentMethod,
-  l.order.cash,
-  l.shipmentMethod,
-  l.carryMode,
-  o.updateInfo.operatorName,
-  l.company.shortName,
-  l.order.customerOrderNO,
-  l.order.orderDate,
-  l.order.planFromDate,
-  DATE_FORMAT(l.order.planArriveTime,'%Y-%m-%d'),
-  l.order.fromContact.linkman,
-  l.order.fromContact.phone,
-  l.order.description,
-  l.order.description1,
-  l.claim,
-  l.status,
-  l.nodeIndex,
-  o.description 
- from Legs l
- left join l.order o 
- left join l.order.consignor consignor
- left join l.order.extends1 extends1
- left join l.order.extends2 extends2
- left join l.consignor
- left join l.contractor
- left join l.toLocation
- left join l.fromLocation 
- left join l.toLocation.city toCity
- left join l.fromLocation.city fromCity 
- left join l.shipment 
- left join l.tempShipment
- left join l.tempShipment.vehicle  
- left join l.shipmentType
- left join l.executer 
- left join l.supplier
- left join l.company  
- where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION' )
- and l.turnCar=1 
- and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
-/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
-/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
-/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/
-/~l.toContact.address: and l.toContact.address like {l.toContact.address}~/
-/~l.status: and l.status like {l.status}~/
-/~orders.superviseType: and l.order.superviseType = {orders.superviseType}~/
-/~l.weight1: AND (l.weight >= {l.weight1} OR l.volume >= {l.weight1})~/
-/~l.weight2: AND (l.weight <= {l.weight2} OR l.volume <= {l.weight2})~/
-/~l.order.orderDate1: AND (l.order.orderDate) >= {l.order.orderDate1} ~/
-/~l.order.orderDate2: AND (l.order.orderDate) <= {l.order.orderDate2}~/ 
-/~l.order.planArriveTime1: AND (l.order.planArriveTime) >= {l.order.planArriveTime1} ~/
-/~l.order.planArriveTime2: AND (l.order.planArriveTime) <= {l.order.planArriveTime2}~/
-/~l.order.planFromTime1: AND (l.order.planFromDate) >= {l.order.planFromTime1} ~/
-/~l.order.planFromTime2: AND (l.order.planFromDate) <= {l.order.planFromTime2}~/
- order by l.order.updateInfo.updateTime asc,l.claim desc,l.toLocation.city.id,l.id  
-		]]></datasource>
-        <columns>
-            <column id="l.id" title="shipmentLegsQueryPage.l.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.orders.planFromTime" title="orders.planFromTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.legNo" title="shipmentLegsQueryPage.l.legNo" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="tempShipment.vehicle" width="80" title="tempShipment.vehicle" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="order.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle"  format="colourZDFormatter" />
-            <column id="l.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="order.consignor.name" width="70" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/> 
-            <column id="l.quantity" title="quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.volume" title="volume" width="60" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="siteName" title="siteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.paymentMethod" width="70" title="orders.paymentMethod" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.cash" width="70" title="orders.cash" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.shipmentMethod" width="70" title="shipmentLegsQueryPage.l.shipmentMethod" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="ShipmentMethod"/>
-            <column id="l.carryMode" width="70" title="orders.deliveryMode" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.company.shortName" width="80" title="l.company.shortName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" width="80" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.orderDate" title="order.orderDate" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
-        	<column id="order.planFromDate" title="order.planFromDate" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="order.planArriveTime" title="order.planArriveTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.fromContact.linkman" title="linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.fromContact.phone" title="phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.description1" title="l.order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.claim" title="l.description"  visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.status" width="50" title="legs.status" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="LegsStatus"/>
-            <column id="l.nodeIndex" width="50"  title="l.nodeIndex" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.description" title="shipmentLegsQueryPage.l.description" visible="true" horizonAlign="left" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-			<popup id="seeOrderinfo" title="seeOrderinfo" enableType="single" invisible="false" containId="true" pageId="editSeeOrderinfoPage"/>
-			<popup id="registration" title="registration" enableType="multi" invisible="false" containId="true" pageId="editRegistrationDedicatedPage"/>
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml
deleted file mode 100644
index b3ceca5..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainOrderLegsPage" title="maintainOrderLegsPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="l.ecNo" title="shipmentLegsQueryPage.l.legNo" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-<!--                 <list id="l.shipmentMethod" title="shipmentLegsQueryPage.l.shipmentMethod" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentMethod"> -->
-<!--                     <hql><![CDATA[ select  -->
-<!--  t.enumValue, -->
-<!--  t.enumValue  -->
-<!--  from Enumerate t  -->
-<!--  where t.enumType = 'ShipmentMethod'  -->
-<!--       order by t.id]]></hql> -->
-<!--                 </list> -->
-                <remote id="orders.consignor.id" title="consignor" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" displayColumn="2" editModel="uneditable" displayedTableHead="序号,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.name,
- org.department.code
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and  org.disabled=false
- ]]></hql>
-                </remote>
- 				<numberText id="l.weight1" title="weightThan" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="Double" decimal="2"/>
-                <numberText id="l.weight2" title="weightLess" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="Double" decimal="2"/>
-                 <text id="l.fromContact.address" title="fromAddress" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                  <text id="l.toContact.address" title="toAddress" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-			<date id="l.order.orderDate1" title="order.orderDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            <date id="l.order.orderDate2" title="endDate" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-          	<date id="l.order.planFromTime1" title="orders.planFromDate" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            <date id="l.order.planFromTime2" title="endDate" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-          	<list id="orders.superviseType" title="orders.cargoType" row="6" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="SuperviseType" >
-                    <hql><![CDATA[ SELECT 
-   enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'SuperviseType' order by enumerate.id asc ]]></hql> 
-            </list>
-            <text id="o.updateInfo.operatorName" title="inputByName" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ select 
-  l.id,
-  DATE_FORMAT(l.order.planFromDate,'%Y-%m-%d') ||' '|| l.order.planFromTime,
-  l.ecNo,
-  l.tempShipment.vehicle.license,
-  l.order.superviseType,
-  l.order.fromContact.address,
-  l.order.fromName,
-  l.order.toContact.address,
-  l.order.toName,
-  l.order.consignor.shortName,
-  l.order.extends1.name || l.order.extends2.name,
-  l.quantity,
-  l.order.unitOne,
-  CAST(round(l.weight,2) as string),
-  CAST(round(l.volume,2) as string),
-  fromCity.name||'-'||toCity.name,
-  o.updateInfo.operatorName,
-  l.supplier.shortName,
-  l.order.paymentMethod,
-  l.order.cash,
-  l.shipmentMethod,
-  l.carryMode,
-  l.company.shortName,
-  l.order.customerOrderNO,
-  l.order.orderDate,
-  l.order.planLeaveTime,
-  l.order.planArriveTime,
-  l.fromContact.linkman,
-  l.fromContact.phone,
-  l.order.description2,
-  l.order.description1,
-  l.status,
-  l.nodeIndex,
-  l.beSplit,
-  l.order.carPeople,
-  o.description 
- from Legs l
- left join l.order o 
- left join l.order.consignor consignor
- left join l.order.extends1 extends1
- left join l.order.extends2 extends2
- left join l.consignor
- left join l.contractor
- left join l.order.toLocation
- left join l.order.fromLocation 
- left join l.order.toLocation.city toCity
- left join l.order.fromLocation.city fromCity 
- left join l.shipment 
- left join l.tempShipment
- left join l.tempShipment.vehicle   
- left join l.shipmentType
- left join l.executer 
- left join l.supplier
- left join l.company  
- left join l.fromLocation
- left join l.toLocation
- where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION','' )
- and l.turnCar=0 and l.turnShipment=0 and l.turnDelivery=0 
- and ((l.order.isShortBarge=0 or l.order.cusBill=1) or (l.order.isShortBarge=1 and l.nodeIndex>1))
- and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
-/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
-/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
-/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/
-/~l.toContact.address: and l.toContact.address like {l.toContact.address}~/
-/~l.status: and l.status like {l.status}~/
-/~orders.superviseType: and l.order.superviseType = {orders.superviseType}~/
-/~l.weight1: AND (l.weight >= {l.weight1} OR l.volume >= {l.weight1})~/
-/~l.weight2: AND (l.weight <= {l.weight2} OR l.volume <= {l.weight2})~/
-/~l.order.orderDate1: AND (l.order.orderDate) >= {l.order.orderDate1} ~/
-/~l.order.orderDate2: AND (l.order.orderDate) <= {l.order.orderDate2}~/ 
-/~l.order.planFromTime1: AND (l.order.planFromDate) >= {l.order.planFromTime1} ~/
-/~l.order.planFromTime2: AND (l.order.planFromDate) <= {l.order.planFromTime2}~/
-/~o.updateInfo.operatorName: AND o.updateInfo.operatorName like {o.updateInfo.operatorName}~/
- order by l.id  desc
-		]]></datasource>
-        <columns>
-            <column id="l.id" title="shipmentLegsQueryPage.l.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.order.planFromTime" title="orders.planFromTime" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="l.legNo" title="shipmentLegsQueryPage.l.legNo" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="tempShipment.vehicle" width="80" title="tempShipment.vehicle" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="order.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle"  format="colourZDFormatter" />
-            <column id="l.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.fromName" title="l.fromName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.toName" title="l.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="order.consignor.name" width="70" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/> 
-            <column id="l.order.extends1.name" title="order.extends1.name" width="70" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="l.quantity" title="quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.order.unitOne" title="orders.unitOne" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.weight" title="weight" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="l.volume" title="volume" width="60" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="siteName" title="siteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.supplier.name" width="70" title="l.supplier.name" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.paymentMethod" width="70" title="orders.paymentMethod" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.cash" width="70" title="orders.cash" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.shipmentMethod" width="70" title="shipmentLegsQueryPage.l.shipmentMethod" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="ShipmentMethod"/>
-            <column id="l.carryMode" width="70" title="orders.deliveryMode" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.company.shortName" width="80" title="l.company.shortName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" width="80" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.orderDate" title="order.orderDate" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
-        	<column id="order.planLeaveTime" title="order.planLeaveTime" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="order.planArriveTime" title="order.planArriveTime" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="l.fromContact.linkman" title="linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.fromContact.phone" title="phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.description2" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.order.description1" title="l.order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.status" width="50" title="legs.status" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="LegsStatus"/>
-            <column id="l.nodeIndex" width="50"  title="l.nodeIndex" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.beSplit" width="50"  title="l.beSplit" visible="true" horizonAlign="left" verticalAlign="middle"/>
-             <column id="orders.carPeople"  width="60" title="orders.carpeople" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="l.description" title="shipmentLegsQueryPage.l.description" visible="false" horizonAlign="left" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-			<popup id="splitlegsButton" title="splitlegsButton" enableType="single" invisible="false" containId="true" pageId="editSplitLegsPage">
-                <enableExpression><![CDATA[${l.beSplit} == 'false']]></enableExpression> 
-             </popup>
-            <commit id="cancelSplitOrder" title="maintainOrderPage.cancelSliptOrder" enableType="single" invisible="false">
-                <enableExpression><![CDATA[${l.beSplit} == 'true']]></enableExpression> 
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="shipmentManager" methodName="cancelSplitlegs" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-			<popup id="seeOrderinfo" title="seeOrderinfo" enableType="single" invisible="false" containId="true" pageId="editSeeOrderinfoPage"/>
-			<popup id="registration" title="registration" enableType="multi" invisible="false" containId="true" pageId="editRegistrationPage"/>
-        	<commit id="turnCar" title="maintainOrderPage.turnCar" enableType="multi" invisible="false" confirmMessage="maintainBillFeePage.turnCar.confirmMessage">
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="shipmentManager" methodName="turnCar" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!--             	转发货部 -->
-<!--             <commit id="turnDelivery" title="maintainOrderPage.turnDelivery" enableType="multi" invisible="false" confirmMessage="maintainBillFeePage.turnDelivery.confirmMessage"> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="shipmentManager" methodName="turnDelivery" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-<!--             转分公司 -->
-<!--             <popup id="turnSubsidiary" title="turnSubsidiary" enableType="multi" invisible="false" containId="true" pageId="editTurnSubsidiaryPage"/> -->
-<!--           	预排车 -->
-<!--         	<popup id="tempRegistration" title="tempRegistration" enableType="multi" invisible="false" containId="true" pageId="editTempZdRegistrationPage"/> -->
-<!--         	预派列表 -->
-<!--             <popup id="tempRegistrationList" title="tempRegistrationList" enableType="none" invisible="false" containId="false" pageId="modifyTempZdListPage"/> -->
-<!--        取消预派车 -->
-<!--             <commit id="cancelTempRegistration" title="cancelTempRegistration" enableType="multi" invisible="false" confirmMessage="cancelConfirmShipment.confirmMessage"> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="shipmentManager" methodName="cancelShipmentConfirmLegs" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="false"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml
deleted file mode 100644
index 715da83..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   调度单管理-->
-<pages>
-    <maintainPage id="maintainShipmentZXPage" title="maintainShipmentZXPage" autoQuery="false">
-     <search>
-        <inputUIs>
-               <text id="shipment.code" title="shipment.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="shipment.relatebill3" title="relatebill3" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <list id="shipment.status" title="shipment.status" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentStatus">
-                    <hql><![CDATA[  SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'ShipmentStatus' 
-  and enumerate.enumValue not in ('UNAVAILABLE','AVAILABLE','LEAVEWH')
-  order by enumerate.id]]></hql>
-                </list>
-                 <list id="shipment.transportType" title="shipment.transportType" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
- c.name,
- c.name
- FROM CommonCode c 
- WHERE c.disabled=0 and c.codeType='调度方式' order by c.id asc
- ]]></hql>
-                </list>
-                <remote id="shipment.carrier.id" title="shipment.carrier" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
-                    <hql><![CDATA[ select 
- carrier.id, 
- carrier.code, 
- carrier.name 
- from Organization  carrier
- where carrier.disabled=false 
-     and (carrier.code like upper(:param) or carrier.name like :param )
-	 and (carrier.beCarrier = true 
-	  or carrier.beInCarrier=true)
-     and (carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
-or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
-/~carrier.name: and carrier.name like {carrier.name}~/
- order by carrier.sortIndex asc,carrier.id asc
-]]></hql>
-                    <inputUIs>
-                        <text id="carrier.name" title="maintainShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                    </inputUIs>
-                </remote>
-                
-                <text id="shipment.license" title="vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <dateRanger id="shipment.operatorDate" title="lfv.sdate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-<!--             	<remote id="shipment.routeFee.id" title="order.routeFee.name" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,代码,名称"> -->
-<!--                     <hql><![CDATA[ select d.id,d.code,d.name -->
-<!--  from RouteFee d -->
-<!--  where (d.code like upper(:param) or d.name like :param) -->
-<!--  and d.disabled=false and d.platForm=#{SESSION_PLATFORM} -->
-<!--  /~d.name: and d.name like {d.name}~/]]></hql> -->
-<!--                     <inputUIs> -->
-<!--                         <text id="d.name" title="maintainVehicleRegFeePage.department.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/> -->
-<!--                     </inputUIs> -->
-<!--                 </remote> -->
-            	<text id="shipment.driverName" title="shipment.driver" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-            	<text id="shipment.customerName" title="shipment.customerName" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-<!--            	<numberText id="shipment.payfee" title="shipment.payfee" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>-->
-            	<list id="shipment.shipmentDepartment" title="shipment.shipmentDepartment" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[  SELECT 
-  commonCode.code,
-  commonCode.name From CommonCode commonCode 
-  where commonCode.codeType = '调度部门' 
-  order by commonCode.id]]></hql>
-                </list>
-                <list id="shipment.superviseType" title="orders.cargoType" row="6" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="SuperviseType" >
-                    <hql><![CDATA[ SELECT 
-   enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'SuperviseType' order by enumerate.id asc ]]></hql> 
-                </list>
-                <numberText id="payfee1" title="payfee1" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/> 
-            	<numberText id="payfee2" title="payfee2" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
-                <numberText id="legsfee1" title="legfee1" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/> 
-            	<numberText id="legsfee2" title="legfee2" row="8" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ SELECT 
- shipment.id,
- shipment.operatorDate,
- shipment.code,
- shipment.costStatus,
- shipment.license,
- shipment.vehicleType.name,
- shipment.driverName,
- CAST(round(shipment.payfee,2) as string),
- CAST(round(shipment.fee7,2) as string),
- CAST(round(shipment.fee6,2) as string),
- CAST(round(shipment.otherFee,2) as string),
- shipment.secondDriverName,
- round(shipment.quantity,1),
- shipment.weight,
- shipment.volume,
- shipment.fromContact.address,
- shipment.toContact.address,
- shipment.status,
- shipment.unloadingCompany.shortName,
- shipment.shipmentDepartment,
- shipment.routeFee.name,
- shipment.description,
-  carrier.name,
- shipment.shipmentMethod,
- shipment.operator 
- FROM Shipment  shipment
-  left  JOIN   shipment.carrier  carrier
-  left  JOIN   shipment.driver    driver
-  left  JOIN   shipment.vehicle  vehicle
-  left join shipment.vehicleType vt 
-  left  join shipment.routeFee routeFee
-  left  join shipment.vehicleType 
-  left join shipment.unloadingCompany 
- WHERE 1=1 
- and shipment.shipmentDepartment='专线' 
- and shipment.isShortBarge=false 
- and shipment.platForm= #{SESSION_PLATFORM} 
- and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ ) 
-  /~shipment.code: AND shipment.code like upper({shipment.code})~/
-  /~shipment.status: AND shipment.status = {shipment.status}~/
-  /~shipment.carrier.id: AND shipment.carrier.id = {shipment.carrier.id}~/
-/~shipment.payfee: AND shipment.payfee <= {shipment.payfee}~/  
-/~shipment.driverName: AND shipment.driverName like {shipment.driverName}~/ 
-/~shipment.routeFee.id: AND shipment.routeFee.id = {shipment.routeFee.id}~/ 
-/~shipment.license: AND upper(shipment.license) like upper({shipment.license})~/
- /~startDate: AND trunc(shipment.operatorDate) >= {startDate}~/
- /~endDate: AND trunc(shipment.operatorDate) <= {endDate}~/
- /~shipment.shipmentDepartment: AND shipment.shipmentDepartment like {shipment.shipmentDepartment}~/
-   /~payfee1: AND shipment.payfee >= {payfee1}~/
-/~payfee2: AND shipment.payfee <= {payfee2}~/
-/~legsfee1: AND shipment.otherFee >= {legsfee1}~/
-/~legsfee2: AND shipment.otherFee <= {legsfee2}~/
-order by shipment.id desc 
-]]></datasource>
-        <columns>
-            <column id="shipment.id" title="shipment.id" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="shipment.operatorDate" title="lfv.sdate" visible="true" horizonAlign="left" verticalAlign="middle" format="shipmentDayFormatter"/>
-            <column id="shipment.code" title="shipment.code" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="shipment.costStatus" title="shipment.costStatus" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
-            <column id="shipment.license" title="maintainShipmentPage.vehicle.license" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.vehicleType.name" title="sendCar.vehicleType.name" width="60" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="shipment.driver.name" title="shipment.driver" width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.payfee" title="shipment.payfee" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="shipment.fee7" title="shipment.fee7" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="shipment.fee6" title="feeName.jjf" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="shipment.otherFee" title="shipment.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-            <column id="shipment.secondDriverName" title="secondDriverName"  width="80" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.quantity" title="quantity" 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"/>
-            <column id="shipment.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="shipment.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle" />
-            <column id="shipment.status" title="shipment.status" width="50" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="ShipmentStatus"/>
-            <column id="shipment.unloadingCompany.shortName" title="shipment.unloadingCompany.shortName" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="shipment.shipmentDepartment" title="shipment.shipmentDepartment" visible="true" horizonAlign="center" verticalAlign="middle" />
-<!--             <column id="shipment.otherFee" title="shipment.otherFee" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-            <column id="shipment.orderGroupCode" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.customerName" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.routeFee.name" title="shipment.routeFee.name" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="shipment.description" title="shipment.description" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.carrier.name" title="shipment.carrier" visible="false" horizonAlign="left" verticalAlign="middle"/>
-            <column id="shipment.superviseType" title="orders.superviseType" width="50" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="shipment.shipmentMethod" title="shipment.shipmentMethod" visible="false" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="ShipmentMethod"/>
-            <column id="shipment.operator" title="updateInfo.operatorName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-            <popup id="view" title="specialUpdate" enableType="single" invisible="false" containId="true" pageId="modifyShipmentZXPage">
-<!--              	<enableExpression><![CDATA[(${shipment.status}=='AVAILABLE'||${shipment.status}=='OPEN')]]></enableExpression> -->
-             </popup>
-             <popup id="inputShipmentFee" title="inputShipmentFee" enableType="single" invisible="false" containId="true" pageId="editShipmentFeeInPutPage">
-             </popup>
-             <commit id="cancel" title="maintainShipmentPage.cancel" enableType="multi" invisible="false" confirmMessage="maintainShipmentPage.cancel.confirmMessage">
-<!--                <enableExpression><![CDATA[(${shipment.status}=='AVAILABLE')]]></enableExpression>-->
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="CDShipmentManager" methodName="cancelShipment" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="send" title="shipSendArrivePage.shipeMentArrivePage.send" enableType="multi" invisible="false" containId="true" pageId="editCDShipSendPage">
-           <enableExpression><![CDATA[(${shipment.status} == 'AVAILABLE')  ]]></enableExpression>
-            </popup>
-<!--                <popup id="onroadArrive" title="arriveConfirm" enableType="multi" invisible="false" containId="true" pageId="sendArriveInformPage"> -->
-<!--            	 <enableExpression><![CDATA[(${shipment.status} == 'ONROAD')]]></enableExpression> -->
-<!--             </popup> -->
-<!--  			<popup id="shipmnetFeeIn" title="shipmnetFeeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentFeePage"> -->
-<!--               	<enableExpression><![CDATA[(${shipment.status}!= 'CANCEL')]]></enableExpression> -->
-<!--               </popup> -->
-              <popup id="inputLegsFee" title="inputPayFee" enableType="single" invisible="false" containId="true" pageId="modifyInputLegsFee">
-<!--         		<enableExpression><![CDATA[(${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
-        	</popup>
-              <popup id="legsFeeIn" title="otherFeeInput" enableType="single" invisible="false" containId="true" pageId="modifyLegsFeePage">
-<!--               	<enableExpression><![CDATA[(${shipment.status}!= 'CANCEL'&& ${shipment.costStatus} == 'OPEN')]]></enableExpression> -->
-              </popup>
-            <commit id="wholeStatusCheck" title="feeStatusCheck" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[ (${shipment.costStatus} == 'OPEN')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="CDShipmentManager" methodName="orderPaySubmitCheck" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <commit id="cancelCheck" title="feeStatuscancelCheck" enableType="multi" invisible="false">
-               <enableExpression><![CDATA[ (${shipment.costStatus} == 'SUBMIT_CHECK')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="CDShipmentManager" methodName="cancelCheck" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-           <popup id="avgtrimcost" title="avgtrimcost" enableType="single" invisible="false" containId="true" pageId="modifyAvgTrimCostPage">
-        		<enableExpression><![CDATA[(${shipment.costStatus} == 'OPEN')]]></enableExpression>
-        	</popup>
-		 <popup id="SeeTrackShipment" title="seeTrack" enableType="multi" invisible="false" containId="true" pageId="modifySeeTrackShipmentPage">
-            </popup>
-            
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
deleted file mode 100644
index c651bd4..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="shipmentOrderQueryPage" title="shipmentOrderQueryPage" autoQuery="false" height="2000">
-        <search>
-            <inputUIs>	
-                <text id="orders.relateBill3" title="orders.relateBill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                <text id="orders.customerOrderNO" title="orders.customerOrderNO" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                
-<!--                <list id="order.consignor.id" title="consignor" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable">-->
-<!--                    <hql><![CDATA[ SELECT -->
-<!-- c.id,-->
-<!-- c.shortName,-->
-<!-- c.description,-->
-<!-- '' as remark-->
-<!-- FROM Organization c -->
-<!-- WHERE c.disabled=0 and c.beCustomer = true   -->
-<!-- AND c.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org =  #{SESSION_PLATFORM} )]]></hql>-->
-<!--                </list>-->
-				<remote id="orders.consignor.id" title="consignor" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" displayColumn="2" editModel="uneditable" displayedTableHead="序号,简称,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.shortName,
- org.name,
- org.department.code
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
- or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
- and org.disabled=false
- ]]></hql>
-                </remote>
-                <text id="orders.updateInfo.operatorName" title="inputByName" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.fromContact.address" title="fromAddress" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                <text id="orders.toContact.address" title="toAddress" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                <date id="orders.planFromDate1" title="orders.planFromDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="orders.planFromDate2" title="maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-			     <dateRanger id="orders.updateInfo.updateTime" title="updateInfo.updateTime" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-			      
-			      <list id="order.status" title="order.status" row="11" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="OrderStatus">
-                    <hql><![CDATA[ SELECT 
- case when t.enumValue ='INPUT' then 'AVAILABLE' else t.enumValue end,
- t.enumValue 
- FROM Enumerate t 
- WHERE t.enumType = 'OrderStatus' and  t.enumValue in('ARRIVED_GOODS','DISPATCHED','ARRIVED','ONROAD','AVAILABLE','TRANS_AVAILABLE','SIGNED')
- ORDER BY  t.id]]></hql>
-                </list>
-                <text id="customerName" title="shipment.customerName" row="11" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-					 <checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            </inputUIs>
-        </search>
-       <datasource type="hql"><![CDATA[ SELECT 
- orders.id,
- orders.relateBill3,
- orders.consignor.name,
- orders.customerOrderNO,
- orders.fromContact.address,
- orders.toContact.address,
- orders.toName,
- orders.paymentMethod,
- case when orders.status ='AVAILABLE' then 'INPUT' else orders.status end ,
- round(orders.quantity,0)||orders.unitOne,
- CAST(round(orders.weight,2) as string),
- CAST(round(orders.income,2) as string),
- CAST(round(orders.volume,2) as string),
- fromCity.name,
- toCity.name,
- toZone.name,
- orders.carPeople,
- orders.planFromDate,
- orders.superviseType,
- orders.routeFee.name,
- orders.toContact.linkman,
- orders.toContact.phone,
- orders.cash,
- orders.deliveryMode,
- orders.packUnit,
- orders.predictFee,
- orders.description1,
- orders.description2,
- orders.planLeaveTime,
- orders.planArriveTime,
- orders.beStorage,
- orders.beReturn,
- orders.beCustomerReceipt,
- orders.signQuantity,
- orders.signException,
- orders.singleIdentity,
- orders.updateInfo.operatorName,
- orders.updateInfo.updateTime,
- 'ORDER',
- 'ORDER' 
- FROM Order as orders 
- left join orders.orderType as ot 
- left join orders.contractor as pf
- left join orders.fromLocation  froml 
- left join orders.toLocation  tol 
- left join orders.fromLocation.city fromCity
- left join orders.toLocation.city toCity
- left join orders.fromLocation.city.zone fromZone
- left join orders.toLocation.city.zone toZone 
- left join orders.routeFee
- WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
- /~order.code: AND orders.code like {order.code}~/
- /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
- /~order.status: AND orders.status = {order.status}~/
- /~orders.planFromDate1: AND (orders.planFromDate) >= {orders.planFromDate1}~/
- /~orders.planFromDate2: AND (orders.planFromDate) <= {orders.planFromDate2}~/
- /~orders.consignor.id: AND orders.consignor.id = {orders.consignor.id}~/
- /~orders.fromContact.address: AND orders.fromContact.address like {orders.fromContact.address}~/
- /~orders.toContact.address: AND orders.toContact.address like {orders.toContact.address}~/
- /~orders.relateBill3: AND upper(orders.relateBill3) like upper({orders.relateBill3})~/
- /~orders.declare: AND upper(orders.declare) like upper({orders.declare})~/
- /~order.region: AND orders.region = {order.region}~/
-  /~orders.updateInfo.operatorName: AND orders.updateInfo.operatorName like {orders.updateInfo.operatorName}~/
-   /~customerName: AND orders.consignor.name like {customerName}~/
-  /~startDate: AND (orders.updateInfo.updateTime) >= {startDate}~/
- /~endDate: AND (orders.updateInfo.updateTime) <= {endDate}~/
- order by orders.id asc,orders.planFromDate asc 
- ]]></datasource>
-        <columns>
-            <column id="orders.id" title="order.id" visible="false" horizonAlign="center" verticalAlign="middle" />
-            <column id="orders.relateBill3" width="100" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.consignor.name" width="70" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" width="70" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toName" title="orders.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.paymentMethod" width="60" title="orders.paymentMethod" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.status" width="60" title="order.status" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="OrderStatus"/>
-            <column id="orders.quantity" width="60" title="quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.weight" width="70" title="order.weight" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.income" width="70" title="orders.income" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.volume" width="70" title="volume" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fromSiteName" width="60" title="fromSiteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="toSiteName" width="60" title="toSiteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="toZone.name" title="toZone.name" width="60"  visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.carPeople"  width="60" title="orders.carpeople" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.planFromDate"  width="80" title="orders.planFromDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="SuperviseType"/>
-            <column id="orders.routeFee.name" title="order.routeFee.name" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.linkman" title="linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.phone" title="phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.cash" title="orders.cash" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.deliveryMode" title="orders.deliveryMode" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.packUnit" title="orders.packUnit" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.predictFee" title="orders.predictFee" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.description1" title="order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.description2" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.planLeaveTime" title="order.planLeaveTime" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.planArriveTime" title="order.planArriveTime" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.beStorage" title="orders.beStorage" visible="false" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="orders.beReturn" title="orders.beReturn" visible="false" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="orders.beCustomerReceipt" title="orders.beCustomerReceipt" visible="false" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="orders.signQuantity" title="maintainOrderPage.order.signQuantity" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.signException" title="maintainOrderPage.orders.signException" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.singleIdentity" title="orders.singleIdentity" visible="false" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-        	<column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-        	<column id="updateInfo.updateTime" title="updateInfo.updateTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-        </columns>
-        <buttons>
-       		<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editLegsOrderPage"/>
-       		<popup id="edit" title="edit" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPage">
-<!--       			<enableExpression><![CDATA[${orders.status} == 'AVAILABLE']]></enableExpression>-->
-       		</popup>
-<!--        		<popup id="editParticularly" title="editParticularly" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPageTwo"> -->
-<!--        		</popup> -->
-			<!--生效并打印  -->
-       		<!-- <popup id="printMultiOrder" title="availableAndPrintMultiOrder" enableType="multi" invisible="false" containId="true" pageId="printMultiOrderPage"/>  -->
-            <commit id="multiAvailable" title="maintainOrderPage.availableOrderButton" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[${orders.status} == 'INPUT' || ${orders.status} == 'CHECKED']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="orderManager" methodName="availableTransOrder" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-           <commit id="cancelOrder" title="cancelOrder" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.deleteOrder.confirmMessage">
-               <enableExpression><![CDATA[${orders.status} == 'INPUT' || ${orders.status} == 'AVAILABLE' ]]></enableExpression>
-               <mappings>
-                   <mapping id="ids" className="list"/>
-               </mappings>
-               <actions>
-                   <action managerName="orderManager" methodName="cancelOrder" parameter="ids"/>
-               </actions>
-               <forwards>
-                   <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-               </forwards>
-           </commit>
-            <commit id="unavailableOrderButton" title="maintainOrderPage.unAvailableOrderButton" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[(${orders.status} == 'TRANS_AVAILABLE')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="orderManager" methodName="unAvailableOrder" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!--             <popup id="view" title="viewOrderLegs" enableType="single" invisible="false" containId="true" pageId="viewOrderLegsPage"/> -->
-<!--        -->
-<!--  <popup id="showOrderDetail" title="shipmentLegsQueryPage.showOrderDetail" enableType="single" invisible="false" containId="true" pageId="showOrderDetailPage"/> -->
-<!--             <popup id="lookLegs" title="shipmentLegsQueryPage.lookLegs" enableType="single" invisible="false" containId="true" pageId="lookLegsPage"/> -->
-<!--             <popup id="lookLegsProduct" title="shipmentLegsQueryPage.lookLegsProduct" enableType="single" invisible="false" containId="true" pageId="lookLegsProductPage"/> -->
-<!--             <popup id="packLegButton" title="shipmentLegsQueryPage.packLegButton" enableType="single" invisible="false" containId="true" pageId="modifyLegPackingPage"/> -->
-<!--            <popup id="printOrder" title="printOrder" enableType="single" invisible="false" containId="true" pageId="printOrderPage"/> -->
-<!--             <popup id="feeIn" title="feeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentBillFeePage"/> -->
-       		<popup id="editImportOrderPage" title="editImportOrderPage" enableType="none" invisible="false" containId="false" pageId="editImportKEJOrderPage"/>
-        	<popup id="importImage" title="shipmentOrderQueryPage.importImage" enableType="single" invisible="false" containId="true" pageId="importImageDDYQPage"/>
-        	<popup id="feeImport" title="feeImport" enableType="none" invisible="false" containId="false" pageId="editfeeImportPage"/>
-        	
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
deleted file mode 100644
index 59642f5..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainSingOrderAuditingPage" title="maintainSingOrderAuditingPage" autoQuery="false">
-        <search>
-            <inputUIs>
-            	<date id="date1" title="date1" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" managerName="orderManager" methodName="getClientNull" showTime="false" manualEditable="true" defaultCurrentDate="true"/>
-                 <text id="orders.relateBill3" title="orders.relateBill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                <remote id="orders.consignor.id" title="consignor" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" displayColumn="2" editModel="uneditable" displayedTableHead="序号,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.name 
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and org.disabled=false
- ]]></hql>
-                </remote>
-                <dateRanger id="orders.signTime" title="maintainSingOrderPage.order.signTime" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-            	<list id="orders.status" title="maintainSingOrderPage.order.status" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="OrderStatus">
-                    <hql><![CDATA[  SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'OrderStatus' 
-  and enumerate.enumValue not in('CANCEL','AVAILABLE','ONROAD','ARRIVED_GOODS') 
-  order by enumerate.id]]></hql>
-                </list>
-				<list id="orders.shipmentWay" title="orders.shipmentWay" row="6" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="ShipmentWay">
-                <hql><![CDATA[ SELECT t.enumValue,t.enumValue 
- FROM Enumerate t 
- WHERE t.enumType = 'ShipmentWay' order by t.id]]></hql>
-                </list>
-<!-- 				 <dateRanger id="orders.planFromDate" title="orders.planFromDate" row="9" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="nodeFeeDate1" toDate="nodeFeeDate2"/> -->
-              	 <date id="planFromDate1" title="orders.planFromDate" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" methodName="getClientTime" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="planFromDate2" title="shipmentOrderQueryPage.maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <list id="orders.costStatus" title="orders.costStatus" row="11" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="FeeStatus">
-                <hql><![CDATA[ SELECT t.enumValue,t.enumValue 
- FROM Enumerate t 
- WHERE t.enumType = 'FeeStatus' and t.enumValue in('OPEN','CHECK') order by t.id]]></hql>
-                </list>
-			 <text id="orders.carPeople" title="orders.carpeople" row="11" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>            	
-              	<numberText id="receivefee1" title="receivefee1" row="12" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/> 
-            	<numberText id="receivefee2" title="receivefee2" row="12" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
-            	<text id="orders.customerOrderNO" title="orders.customerOrderNO" row="13" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> 
-            	 <list id="ofv.invoice" title="be_invoice_no" row="13" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="BooleanType">
-                 <hql><![CDATA[  SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'BooleanType' 
-  order by enumerate.id]]></hql>
-                </list>
-<!--                 <date id="planFromDate" title="orders.planFromDate" row="14" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true"/> -->
-           	  <dateRanger id="orders.responseTime" title="ofv.invoice_date" row="14" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDatereSponseTime" toDate="endDatereSponseTime"/>
-           	  <text id="toAddress" title="toAddress" row="16" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> 
-           	  <checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-              <text id="ov.license" title="ov.license" row="17" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> 
-              <text id="ov.driver_name" title="ov.driver_name" row="17" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> 
-            </inputUIs>
-        </search>
-        <datasource type="hql" displayRowCount="50"><![CDATA[ SELECT 
- orders.id,
- orders.relateBill3,
- orders.customerOrderNO,
- orders.consignor.name,
- orders.fromContact.address,
- orders.toContact.address,
- round(orders.quantity,0)||orders.unitOne,
- CAST(round(orders.weight,2) as string),
- CAST(round(orders.volume,2) as string),
- orders.planFromDate,
- CAST(round(orders.receivefee,2) as string),
- CAST(round(orders.fee9,2) as string),
- CAST(round(orders.receivefee-orders.fee9,2) as string),
- CAST(round(orders.fee5) as string),
- orders.expectLicense,
- orders.vehicleCode,
- orders.driverName,
- orders.superviseType,
- round(orders.income,4),
- orders.carPeople,
- orders.status, 
- orders.beReturn,
- orders.signTime,
- orders.matFee,
- orders.pwdd,
- orders.paymentMethod,
- orders.predictFee,
- orders.costStatus,
- orders.description1,
- orders.description,
- orders.billCode,
- orders.invName,
- orders.invCode,
- orders.responseTime,
- orders.updateInfo.updateTime,
- 'ORDER',
- 'ORDER' 
- FROM Order orders 
- left join orders.contractor as pf
- left join orders.extends1 vt1 
- where orders.contractor = #{SESSION_PLATFORM}
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
-/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
-/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
-/~orders.status: AND orders.status = {orders.status}~/
-/~orders.consignor.id: AND orders.consignor.id = {orders.consignor.id}~/
-/~orders.shipmentWay: AND orders.shipmentWay = {orders.shipmentWay}~/
-/~startDate: AND (orders.signTime) >= {startDate}~/
-/~endDate: AND (orders.signTime) <= {endDate}~/
-/~startDatereSponseTime: AND (orders.responseTime) >= {startDatereSponseTime}~/
-/~endDatereSponseTime: AND (orders.responseTime) <= {endDatereSponseTime}~/
-/~planFromDate1: AND (orders.planFromDate) >= {planFromDate1}~/
-/~planFromDate2: AND (orders.planFromDate) <= {planFromDate2}~/
-/~orders.costStatus: AND orders.costStatus = {orders.costStatus}~/
-/~toAddress: AND orders.toContact.address like {toAddress}~/
-/~orders.carPeople: AND orders.carPeople like {orders.carPeople}~/
-/~orders.relateBill3: AND orders.relateBill3 like upper({orders.relateBill3})~/
-/~orders.imageStatus: AND orders.imageStatus = {orders.imageStatus}~/
-/~orders.superviseType: AND orders.superviseType = {orders.superviseType}~/
-/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
-/~receivefee1: AND orders.receivefee >= {receivefee1}~/
-/~receivefee2: AND orders.receivefee <= {receivefee2}~/ 
-/~ov.license: AND upper(orders.vehicleCode) like upper({ov.license})~/
-/~ov.driver_name: AND orders.driverName like {ov.driver_name}~/
-order by orders.id asc,orders.planFromDate asc ]]></datasource>
-        <columns>
-            <column id="orders.id" title="order.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.relateBill3" width="90" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" width="80" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.consignor.name" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-           	<column id="orders.quantity" title="order.quantity" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.weight" title="order.weight" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.volume" title="order.volume" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.planFromDate" width="80" title="orders.planFromDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           	<column id="orders.receivefee" width="80" title="receivefee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           	<column id="orders.fee9" width="80" title="实际成本" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           	<column id="orders.profit" width="80" title="orders.profit" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
-           	<column id="orders.fee5" width="80" title="油卡" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
-           	
-           	<column id="orders.expectLicense" width="80" title="车型" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
-            <column id="orders.vehicleCode" width="80" title="车牌号" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
-            <column id="orders.driverName" width="120" title="司机" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
-            <column id="orders.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="SuperviseType"/>
-            <column id="orders.income" title="orders.income" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.carPeople" width="80" title="orders.carpeople" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.status" title="maintainSingOrderPage.order.status" width="70" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="OrderStatus"/>
-            <column id="orders.beReturn" title="orders.beReturn" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="disabled" />
-            <column id="orders.signTime" title="maintainSingOrderPage.orders.signTime" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
-            <column id="orders.matFee" width="80" title="orders.matFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.pwdd" width="80" title="orders.pwdd" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.paymentMethod" width="80" title="orders.paymentMethod" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           
-            <column id="orders.predictFee" title="orders.predictFee" visible="true" horizonAlign="left" verticalAlign="middle"/>
-           <column id="orders.costStatus" width="80" title="orders.costStatus" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
-            <column id="orders.description1" title="order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
-        	<column id="orders.billCode" width="120" title="ofv.bill_code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-<!-- 		    <column id="ofv.apply_code" width="120" title="ofv.apply_code" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-		    <column id="ofv.company_name" width="80" title="ofv.company_name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-		    <column id="ofv.invoice_no" width="80" title="ofv.invoice_no" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        	<column id="ofv.invoice_date" width="80" title="ofv.invoice_date" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        	<column id="updateInfo.updateTime" title="updateInfo.updateTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-        </columns>
-        <buttons>
-            <popup id="orderFeeInPut" title="orderFeeInPut" enableType="single" invisible="false" containId="true" pageId="editOrderFeeInPut">
-            <enableExpression><![CDATA[${orders.billCode} =='-'|| ${orders.billCode} =='']]></enableExpression>
-            </popup>
-       		<popup id="feeIn" title="shipmnetLegsFeeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentBillFeePage">
-       		</popup>
-<!--        		<popup id="feeinvoice" title="feeinvoice" enableType="multi" invisible="false" containId="true" pageId="editOrderInvoicePage"/> -->
-       		<popup id="editParticularly" title="editParticularly" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPageTwo">
-       		 <enableExpression><![CDATA[${orders.billCode} =='-'|| ${orders.billCode} =='']]></enableExpression>
-       		</popup>
-       		<popup id="view" title="viewOrderLegs" enableType="single" invisible="false" containId="true" pageId="viewOrderLegsPage"/>
-       		<commit id="orderFeeCheck" title="maintainSingOrderPage.feeCheck" enableType="multi" invisible="false">
-                 <enableExpression><![CDATA[${orders.costStatus} == 'OPEN']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="orderManager" methodName="orderFeeCheck" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <commit id="cancelOrderFeeCheck" title="maintainSingOrderPage.cancelFeeCheck" enableType="multi" invisible="false">
-                 <enableExpression><![CDATA[(${orders.costStatus} == 'CHECK')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="orderManager" methodName="orderFeeCancelCheck" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!-- 			<commit id="cancelOrder" title="forceCancelOrder" enableType="multi" invisible="false" confirmMessage="forceCancelOrder.confirmMessage">
-               <mappings>
-                   <mapping id="ids" className="list"/>
-               </mappings>
-               <actions>
-                   <action managerName="orderManager" methodName="forceCancelOrder" parameter="ids"/>
-               </actions>
-               <forwards>
-                   <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-               </forwards>
-           </commit> -->
-           <popup id="SeeTrackShipment" title="seeTrack" enableType="multi" invisible="false" containId="true" pageId="modifySeeTrackOrderPage">
-            </popup>
-           <popup id="ReceiveFee" title="ReceiveFee" enableType="none" invisible="false" containId="false" pageId="editReceiveFeeImportPage"/>
-        	
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
deleted file mode 100644
index 3d4a451..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainSingOrderPage" title="maintainSingOrderPage" autoQuery="false">
-        <search>
-            <inputUIs>
-<!--                 <text id="date1" managerName="orderManager" methodName="getClientNull" title="date1" defaultValue="11" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> -->
-                 <date id="date1" title="date1" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" managerName="orderManager" methodName="getClientNull" showTime="false" manualEditable="true" defaultCurrentDate="true"/>
-                <text id="orders.relateBill3" title="orders.relateBill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <remote id="orders.consignor.id" title="consignor" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable" displayedTableHead="序号,代码,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.code,
- org.name,
- org.department.code
- FROM Organization org  
- left join org.department
- where org.beCustomer=true
- and (upper(org.code) like upper(:param) or org.name like :param)
- and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
- or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
- and org.disabled=false
- ]]></hql>
-                </remote>
-                <dateRanger id="orders.signTime" title="maintainSingOrderPage.order.signTime" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-<!-- 				<dateRanger id="orders.planFromDate" title="orders.planFromDate" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="planFromDate1" toDate="planFromDate2"/> -->
-				 <date id="planFromDate1" managerName="orderManager" methodName="getClientTime" title="orders.planFromDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="planFromDate2" title="shipmentOrderQueryPage.maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-<!--             	<numberText id="receivefee1" title="receivefee1" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/> -->
-<!--             	<numberText id="receivefee2" title="receivefee2" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/> -->
-           	<text id="ov.carrierName" title="shipment.carrier" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-            	
-            	<list id="orders.status" title="maintainSingOrderPage.order.status" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="OrderStatus">
-                    <hql><![CDATA[  SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'OrderStatus' 
-  order by enumerate.id]]></hql>
-                </list>
-				 <dateRanger id="orders.orderDate" title="order.orderDate" row="9" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="nodeFeeDate1" toDate="nodeFeeDate2"/>
-<!--                 <list id="orders.costStatus" title="orders.costStatus" row="10" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="FeeStatus"> -->
-<!--                 <hql><![CDATA[ SELECT t.enumValue,t.enumValue  -->
-<!--  FROM Enumerate t  -->
-<!--  WHERE t.enumType = 'FeeStatus' and t.enumValue in('OPEN','CHECK') order by t.id]]></hql> -->
-<!--                 </list> -->
-                <text id="ov.driverName" title="driverName"  row="10" col="2" span="1"  readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="orders.carPeople" title="orders.carpeople"  row="11" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="orders.toContact.linkman" title="orders.toContact.linkman"  row="11" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="orders.fromContact.address" title="fromAddress" width="300" row="12" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="orders.toContact.address" title="toAddress" width="300" row="13" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="ov.license" title="license"  row="14" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="orders.customerOrderNO" title="orders.customerOrderNO" row="14" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-                <checkbox id="isAll" title="isAll" row="16" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql" displayRowCount="50"><![CDATA[ SELECT 
- orders.id,
- orders.relateBill3,
- orders.consignor.name,
- orders.customerOrderNO,
- orders.fromContact.address,
- orders.toContact.address,
- orders.toName,
- orders.status,
- orders.arriveTime,
- orders.vehicleCode,
- orders.expectLicense,
- orders.driverName,
- orders.carPeople,
- orders.costStatus,
- orders.unit,
- orders.routeFee.name,
- orders.superviseType,
- vt1.name,
- round(orders.quantity)||orders.unitOne,
- CAST(round(orders.weight,2) as string),
- CAST(round(orders.income,2) as string),
- orders.planFromDate,
- orders.signTime,
- orders.signBy,
- orders.orderDate,
- orders.toContact.linkman,
- orders.toContact.phone,
- orders.mailTime,
- orders.description,
- orders.imageStatus,
- orders.updateInfo.operatorName,
- 'ORDER',
- 'ORDER' 
- FROM Order orders
- left join orders.contractor as pf
- left join orders.fromLocation as of 
- left join orders.toLocation as ot 
- left join orders.routeFee
- left join orders.extends1 vt1
- where orders.contractor = #{SESSION_PLATFORM} 
- and orders.status !='CANCEL'  
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
- and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
- /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
- /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
-/~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName  LIKE {ov.carrierName})~/
-/~orders.status: AND orders.status = {orders.status}~/
-/~orders.consignor.id: AND orders.consignor.id = {orders.consignor.id}~/
-/~startDate: AND (orders.signTime) >= {startDate}~/
-/~endDate: AND (orders.signTime) <= {endDate}~/
-/~planFromDate1: and (orders.planFromDate) >= {planFromDate1}~/
- /~planFromDate2: AND (orders.planFromDate) <= {planFromDate2}~/
-/~nodeFeeDate1: AND orders.orderDate >= {nodeFeeDate1}~/
-/~nodeFeeDate2: AND orders.orderDate <= {nodeFeeDate2}~/
-/~orders.costStatus: AND orders.costStatus = {orders.costStatus}~/
-/~orders.relateBill3: AND orders.relateBill3 like upper({orders.relateBill3})~/
-/~orders.imageStatus: AND orders.imageStatus = {orders.imageStatus}~/ 
-/~ov.driverName: AND ov.driver_name LIKE {ov.driverName}~/
-/~orders.carPeople: AND orders.carPeople LIKE {orders.carPeople}~/
-/~orders.toContact.linkman: AND orders.toContact.linkman LIKE {orders.toContact.linkman}~/
-/~orders.fromContact.address: AND orders.fromContact.address LIKE {orders.fromContact.address}~/
-/~orders.toContact.address: AND orders.toContact.address LIKE {orders.toContact.address}~/
-/~ov.license: AND ov.license LIKE {ov.license}~/
-/~orders.customerOrderNO: AND orders.customerOrderNO LIKE {orders.customerOrderNO}~/
-order by orders.planFromDate desc,orders.id desc ]]></datasource>
-        <columns>
-            <column id="orders.id" title="order.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.relateBill3" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.consignor.name" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.customerOrderNO" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
-             <column id="orders.toName" title="orders.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.status" title="maintainSingOrderPage.order.status" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="OrderStatus"/>
-            <column id="orders.arriveTime" title="order.arriveTime" visible="true" horizonAlign="center" verticalAlign="middle" format="singOrderFormatter"/>
-             <column id="ov.license" width="100" title="ov.license" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="ov.vehicleTypeName" width="80" title="ov.vehicleTypeName" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="ov.driver_name" width="80" title="ov.driver_name" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="orders.carPeople"  width="60" title="orders.carpeople" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.costStatus" title="orders.costStatus" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
-            <column id="orders.unit" width="80" title="orders.unit" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MeasureUnit"/>
-            <column id="orders.routeFee.name" width="80" title="order.routeFee.name" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="orders.superviseType" width="80" title="orders.superviseType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="SuperviseType"/>
-            <column id="order.extends1.name" title="sendCar.vehicleType.name" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="orders.quantity" title="order.quantity" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.weight" title="order.weight" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.income" title="orders.income" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.planFromDate" title="orders.planFromDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.signTime" title="maintainSingOrderPage.orders.signTime" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
-            <column id="orders.signBy" title="orders.signBy" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.orderDate" title="order.orderDate" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
-<!--             <column id="orders.receivefee" width="80" title="receivefee" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-<!--             <column id="orders.payfee" width="80" title="orders.payfee" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-<!--             <column id="orders.profit" width="80" title="orders.profit" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/> -->
-<!--             <column id="orders.matFee" width="80" title="orders.matFee" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-            <column id="orders.toContact.linkman" title="orders.toContact.linkman" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.toContact.phone" title="orders.toContact.phone" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.mailTime" width="80" title="orders.mailTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="orders.imageStatus" title="orders.imageStatus" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-            <column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-        </columns>
-        <buttons>
-<!--            <popup id="sign" title="maintainSingOrderPage.sign" enableType="single" invisible="false" containId="true" pageId="modifySignOrderPage">-->
-<!--                <enableExpression><![CDATA[${orders.status}  != 'SIGNED']]></enableExpression>-->
-<!--            </popup>-->
-            <popup id="sign" title="modifySignOrderPage.signCommit" enableType="multi" invisible="false" containId="true" pageId="editSignOrderPage">
-                <enableExpression><![CDATA[${orders.status}!='SIGNED']]></enableExpression>
-            </popup>
-            <popup id="confirmSign" title="maintainSingOrderPage.confirmSign" enableType="multi" invisible="false" containId="true" pageId="editDatchSignOrderPage">
-                <enableExpression><![CDATA[${orders.status}!='SIGNED']]></enableExpression>
-            </popup>
-<!--              <commit id="confirmSign" title="maintainSingOrderPage.confirmSign" enableType="multi" invisible="false">-->
-<!--                <enableExpression><![CDATA[${orders.status}!='SIGNED']]></enableExpression>-->
-<!--                <mappings>-->
-<!--                    <mapping id="ids" className="list"/>-->
-<!--                </mappings>-->
-<!--                <actions>-->
-<!--                    <action managerName="orderManager" methodName="confirmSignOrder" parameter="ids"/>-->
-<!--                </actions>-->
-<!--                <forwards>-->
-<!--                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>-->
-<!--                </forwards>-->
-<!--            </commit>-->
-            <commit id="canelConfirmSign" title="maintainSingOrderPage.canelConfirmSign" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[(${orders.status} == 'SIGNED')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="orderManager" methodName="canelConfirmSignOrder" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!--            <popup id="showSignOrder" title="maintainSingOrderPage.showSignOrder" enableType="single" invisible="false" containId="true" pageId="showSignOrderPage"/>-->
-				<popup id="showSignOrder" title="maintainSingOrderPage.showSignOrder" enableType="single" invisible="false" containId="true" pageId="modifyShowSignOrderPage"/>
-            <popup id="signOrderImage" title="maintainSingOrderPage.signOrderImage" enableType="single" invisible="false" containId="true" pageId="signOrderImagePage">
-<!--                <enableExpression><![CDATA[${orders.imageStatus} == 'true']]></enableExpression> -->
-            </popup>
-            <popup id="importImage" title="maintainSingOrderPage.importSingImageFile" enableType="single" invisible="false" containId="true" pageId="importImagePage"/>
- 			<popup id="setTime" title="setTime" enableType="single" invisible="multi" containId="true" pageId="editSetmailTimePage"/>
-
-<!--			<popup id="showOrderDetail" title="maintainSingOrderPage.showOrderDetail" enableType="single" invisible="false" containId="true" pageId="showOrderDetailPage"/>-->
-<!--        		<popup id="feeIn" title="feeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentBillFeePage"/> -->
-<!--        		<popup id="feeSubmit" title="feeSubmit" enableType="single" invisible="false" containId="true" pageId="editOrderFeeSubmitPage"/> -->
-<!--        		<commit id="orderFeeCheck" title="maintainSingOrderPage.feeCheck" enableType="multi" invisible="false"> -->
-<!--                  <enableExpression><![CDATA[${orders.costStatus} == 'OPEN'&&${orders.status} == 'SIGNED']]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="orderManager" methodName="orderFeeCheck" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-<!--             <commit id="cancelOrderFeeCheck" title="maintainSingOrderPage.cancelFeeCheck" enableType="multi" invisible="false"> -->
-<!--                  <enableExpression><![CDATA[(${orders.costStatus} == 'CHECK')]]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="orderManager" methodName="orderFeeCancelCheck" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-<!--             <popup id="orderFeeTime" title="orderFeeTime" enableType="multi" invisible="false" containId="true" pageId="editOrderFeeTimePage"/> -->
-<!--        		<popup id="orderSupply" title="orderSupply" enableType="single" invisible="false" containId="true" pageId="editOrderSupplyPage"/> -->
-<!--         	<popup id="orderTurnover" title="orderTurnover" enableType="single" invisible="false" containId="true" pageId="modifyOrderTurnoverPage"> -->
-<!--         		<enableExpression><![CDATA[(${lfv.legCount} != 1)]]></enableExpression> -->
-<!--         	</popup> -->
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/hibernate.properties b/target/cqtms/WEB-INF/classes/hibernate.properties
deleted file mode 100644
index 3b651a7..0000000
--- a/target/cqtms/WEB-INF/classes/hibernate.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2001-2005 dev Information Technology Co.,Ltd. All Rights Reserved.
-#
-# This software is the confidential and proprietary information of dev
-# Information Technology Co.,Ltd. ("Confidential Information").  You shall not
-# disclose such Confidential Information and shall use it only in
-# accordance with the terms of the license agreement you entered into
-# with dev.
-#
-# dev MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE
-# SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE, OR NON-INFRINGEMENT. dev SHALL NOT BE LIABLE FOR ANY DAMAGES
-# SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
-# THIS SOFTWARE OR ITS DERIVATIVES.
-#
-# $Id: hibernate.properties,v 1.4 2009/10/19 07:08:34 yan.li Exp $
-
-# (only applied with "dataSourceContext-hibernate.xml")
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-#hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-#hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-
-#hibernate.default_schema=e2tms
-hibernate.format_sql = false
-hibernate.show_sql=false
-#hibernate.hbm2ddl.auto=create
-hibernate.hbm2ddl.auto=none
-
-hibernate.query.substitutions true=1, false=0
-hibernate.max_fetch_depth=0
-hibernate.jdbc.fetch_size=50
-hibernate.jdbc.batch_size=25
-hibernate.cglib.use_reflection_optimizer=true
-hibernate.jdbc.use_scrollable_resultset=true
-#hibernate.cache.provider_cache=org.hibernate.cache.EhCacheProvider
-hibernate.cache.use_second_level_cache=false
-hibernate.cache.use_query_cache=false
-
-#android 
-android.appkey = 5a461f60b27b0a4c08000257
-android.appMasterSecret = x9yr4arqhys3mapqheasskow22fecr0a
-#appVersion
-appVersion.version=18.4.17.2
-appVersion.url=http://106.15.90.41:8088/app/18-4-17-2.apk
-#printVersion
-printVersion.version=20.0