diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
index 79fe6db..e336606 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
@@ -192,7 +192,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
  left join legs.order.toCityCountiy toCity
   WHERE 1=1
    /~ shipment.id: AND  legs.shipment.id= {shipment.id} ~/
-   ORDER BY legs.sortIndex
+   ORDER BY legs.sortIndex,legs.id
 ]]></datasource>
             <columns>
                 <column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml
index fa87200..2a914bc 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml
@@ -178,7 +178,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
   left join legs.order
   WHERE 1=1
    /~ shipment.id: AND  legs.shipment.id= {shipment.id} ~/
-   ORDER BY legs.sortIndex
+   ORDER BY legs.sortIndex,legs.id
 ]]></datasource>
             <columns>
                 <column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
diff --git a/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml b/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
deleted file mode 100644
index 79fe6db..0000000
--- a/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <modifyDetailPage id="modifyShipmentPage" title="modifyShipmentPage" entityClass="com.dev.stms.server.model.shipment.Shipment" onClose="refreshParent" width="1080" height="500">
-        <modify>
-            <inputUIs>
-                <hidden id="shipment.id" reserve="false"/>
-                <hidden id="shipment.status" reserve="false"/>
-                <hidden id="aa" reserve="false"/>
-        		<hidden id="bb" reserve="false"/>
-                <text id="shipment.code" title="shipment.code" row="1" col="1" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <remote id="shipment.carrier.id" title="shipment.carrier" row="1" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" editModel="uneditable" 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.beCarrier=true
- or carrier.beInCarrier=true)
- and (upper(carrier.code) like :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}~/ order by carrier.beInCarrier desc,carrier.beCarrier desc]]></hql>
-                    <inputUIs>
-                        <text id="carrier.name" title="editShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                <remote id="shipment.vehicle.id" title="shipment.vehicle" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,车型">
-                    <hql><![CDATA[ select 
- vehicle.id, 	
- vehicle.license,
- vehicle.vehicleType.name,
- vehicle.vehicleType.code,
- vehicle.vehicleType.id,
- m.name,
- m.idCard,
- m.contact.phone ,
-  m.id 
- from Vehicle vehicle 
- left join vehicle.vehicleType vt
- left join vehicle.masterDriver m
- where vehicle.disabled=false and vehicle.license like :param
-  and (vehicle.status='ENABLE' or vehicle.status is null )
-  and vehicle.carrier.id=${shipment.carrier.id} 
-/~vehicle.license: and vehicle.license like {vehicle.license}~/
-]]></hql>
-                     <eventListeners>
-                        <eventListener id="shipment.license" index="2" refreshUI="false"/>
-                        <eventListener id="aa" index="4" refreshUI="false"/>
-                        <eventListener id="bb" index="6" refreshUI="false"/>
-                        <eventListener id="shipment.vehicleType.id" index="0" refreshUI="false"/>
-                         <eventListener id="shipment.driverName" index="6" refreshUI="false"/>
-                        <eventListener id="shipment.driverIdentityCard" index="7" refreshUI="false"/>
-                        <eventListener id="shipment.driverPhone" index="8" refreshUI="false"/>
-                         <eventListener id="shipment.driver.id" index="9" refreshUI="false"/>
-                    </eventListeners> 
-                    <inputUIs>
-                        <text id="vehicle.license" title="editShipmentPage.vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                <text id="shipment.license" title="editShipmentPage.shipment.license" row="1" col="4" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-				<list id="shipment.unit" title="orders.unit" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="MeasureUnit" >
-                    <hql><![CDATA[ SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'MeasureUnit' and enumerate.enumValue in ('VEHICLETYPE','WEIGHT','TICKET') order by enumerate.id]]></hql>
-                </list>
-				<list id="shipment.vehicleType.id" title="sendCar.vehicleType.name" row="2" col="2" span="1" width="120" readOnly="false" required="false" defaultValue="${bb}" reserve="false" forceOverride="true" forceSpace="false" multiple="false" inVisible="false">
-                    <hql><![CDATA[select d.id,d.code,d.name
-						 from VehicleType d 
-						 where  d.disabled=false 
- order by d.name,d.id 
-						]]></hql>
-                </list>
-                <date id="shipment.planLeaveTime" title="shipment.planLeaveTime" row="2" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="shipment.planArriveTime" title="shipment.planArriveTime" row="2" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false"/>
-                <remote id="shipment.driver.id" title="shipment.driver" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
-                    <hql><![CDATA[ select 
- driver.id, 
- driver.name, 
- driver.idCard,
- driver.contact.phone 
- from Driver  driver
- where driver.disabled=false 
- and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
-                    <eventListeners>
-                        <eventListener id="shipment.driverName" index="2" refreshUI="false"/>
-                        <eventListener id="shipment.driverIdentityCard" index="3" refreshUI="false"/>
-                        <eventListener id="shipment.driverPhone" index="4" refreshUI="false"/>
-                    </eventListeners>
-                    <inputUIs>
-                        <text id="driver.name" title="editShipmentPage.driver.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="shipment.driverName" title="driver.name" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.driverIdentityCard" title="editShipmentPage.shipment.driverIdentityCard" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.driverPhone" title="editShipmentPage.shipment.driverPhone" row="3" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <remote id="shipment.routeFee.id" title="editRegistrationPage.shipment.routeFee.name" row="4" col="1" 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 :param 
- and d.disabled=false and d.customer.id=${shipment.carrier.id}
- /~d.name: and d.name like {d.name}~/]]></hql>
-                </remote>
-                <text id="shipment.quantity" title="shipment.quantity" row="4" col="2" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" decimal="1"/>
-                <text id="shipment.weight" title="shipment.weight" row="4" col="3" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="4" isPrecision="true"/>
-                <text id="shipment.volume" title="shipment.volume" row="4" col="4" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="4" isPrecision="true"/>
-                <list id="shipment.superviseType" title="orders.superviseType" row="5" col="1" span="1" width="120" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="SuperviseType">
-                <hql><![CDATA[ SELECT t.enumValue,t.enumValue 
- FROM Enumerate t 
- WHERE t.enumType = 'SuperviseType' order by t.id]]></hql>
-                </list>
-                <text id="shipment.quantityFee" title="editRegistrationPage.shipment.quantityFee" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.weightFee" title="editRegistrationPage.shipment.weightFee" row="5" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.volumeFee" title="editRegistrationPage.shipment.volumeFee" row="5" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-              <remote id="shipment.secondDriver.id" title="shipment.secondDriver" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
-                    <hql><![CDATA[ select 
- driver.id, 
- driver.name, 
- driver.idCard,
- driver.contact.phone 
- from Driver  driver
- where driver.disabled=false 
- and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
-                    <inputUIs>
-                        <text id="driver.name" title="editShipmentPage.driver.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                 <date id="shipment.operatorDate" title="lfv.sdate" row="6" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-                <list id="shipment.transportType" title="shipment.transportType" row="6" col="3" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
- c.name,
- c.name
- FROM CommonCode c 
- WHERE c.disabled=0 and c.codeType='调度方式' and c.name in('提货','干线','派送')  order by c.id asc
- ]]></hql>
- 				<eventListeners>
-					<eventListener id="shipment.unloadingCompany.id"  refreshUI="true"/>
-                </eventListeners>
-                </list>
-                <remote id="shipment.unloadingCompany.id" title="unOrgId" row="6" col="4" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false"  displayColumn="2" percentSignPosition="both" displayedTableHead="序号,代码,名称">
-                    <hql><![CDATA[ select 
- carrier.id,
- carrier.name, 
- carrier.name 
- from Organization  carrier 
-  WHERE carrier.bePlatForm=1 and carrier.name like upper(:param) AND carrier.disabled=0 order by carrier.id ]]></hql>  
-                    <inputUIs>
-                        <text id="t.name" title="editShipmentPage.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="shipment.description" title="shipment.description" row="7" col="1" span="4" width="740" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-            </inputUIs>
-         <buttons>
-                <commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false">
-                    <enableExpression><![CDATA[(${shipment.status}!='CANCEL')]]></enableExpression>
-                    <mappings>
-                        <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
-                        <mapping id="consignorName" className="string"/>
-                    </mappings>
-                    <actions>
-                        <action managerName="shipmentManager" methodName="manualStoreShipment" parameter="shipment,consignorName"/>
-                    </actions>
-                    <forwards>
-                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                    </forwards>
-                </commit>
-            </buttons>
-        </modify>
-        <detail autoQuery="false">
-            <datasource><![CDATA[ SELECT 
-  legs.id,
-  legs.sortIndex,
-   fromCity.name||'-'||toCity.name,
-  legs.ecNo,
-  legs.consignor.name,
-  legs.order.fromContact.address,
-  legs.order.toContact.address,
-  round(legs.quantity,1),
-  round(legs.weight,4),
-  round(legs.volume,4),
-  legs.shareDistance,
-  legs.shareRouteName,
-  round(legs.payfee,2),
-  round(legs.otherFee,2),
-  legs.description
-  FROM  Legs legs 
-  left join legs.fromLocation
-  left join legs.toLocation
-  left join legs.order.fromCityCountiy fromCity
- left join legs.order.toCityCountiy toCity
-  WHERE 1=1
-   /~ shipment.id: AND  legs.shipment.id= {shipment.id} ~/
-   ORDER BY legs.sortIndex
-]]></datasource>
-            <columns>
-                <column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.sortIndex" title="legs.sortIndex" visible="true" width="40" horizonAlign="center" verticalAlign="middle" inputUI="text" inputUIValidator="integerRequired"/>
-                <column id="legs.routeName" title="legs.routeName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.ecNo" title="legs.ecNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.consignor.name" title="shipment.customerName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.fromContact.address" title="fromAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.toContact.address" title="toAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.quantity" title="legs.quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.weight" title="legs.weight" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.volume" title="legs.volume" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.shareDistance" title="legs.shareDistance" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.shareRouteName" title="legs.shareRouteName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.payfee" title="legs.payfee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.otherFee" title="legs.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.order.description" title="order.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            </columns>
-<!--             <buttons> -->
-<!--                <popup id="addLegButton" title="modifyShipmentPage.addLegButton" enableType="none" invisible="false" containId="true" pageId="maintainAddZSLegsPage"> -->
-<!--                    <enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING'||${shipment.status}=='ONROAD') && (${shipment.id} != null)]]></enableExpression> -->
-<!--                </popup> -->
-<!--                <commit id="deleteLegsButton" title="modifyShipmentPage.deleteLegsButton" enableType="multi" invisible="false"> -->
-<!--                 	<enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE'|| ${shipment.status}=='AVAILABLE'||${shipment.status}=='LOADING'||${shipment.status}=='ONROAD') && (${shipment.id} != null)]]></enableExpression> -->
-<!--                    <mappings> -->
-<!--                        <mapping id="ids" className="list"/> -->
-<!--                    </mappings> -->
-<!--                    <actions> -->
-<!--                        <action managerName="shipmentManager" methodName="deleteLegs" parameter="ids"/> -->
-<!--                    </actions> -->
-<!--                    <forwards> -->
-<!--                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                    </forwards> -->
-<!--                </commit> -->
-<!--                 <commit id="upLegs" title="upLegs" enableType="multi" invisible="false"> -->
-<!--                 	<enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE'|| ${shipment.status}=='AVAILABLE'||${shipment.status}=='LOADING'||${shipment.status}=='ONROAD') && (${shipment.id} != null)]]></enableExpression> -->
-<!--                    <mappings> -->
-<!--                        <mapping id="ids" className="list"/> -->
-<!--                    </mappings> -->
-<!--                    <actions> -->
-<!--                        <action managerName="shipmentManager" methodName="upLegs" parameter="ids"/> -->
-<!--                    </actions> -->
-<!--                    <forwards> -->
-<!--                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                    </forwards> -->
-<!--                </commit> -->
-<!--                 <commit id="downLegs" title="downLegs" enableType="multi" invisible="false"> -->
-<!--                 	<enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE'|| ${shipment.status}=='AVAILABLE'||${shipment.status}=='LOADING'||${shipment.status}=='ONROAD') && (${shipment.id} != null)]]></enableExpression> -->
-<!--                    <mappings> -->
-<!--                        <mapping id="ids" className="list"/> -->
-<!--                    </mappings> -->
-<!--                    <actions> -->
-<!--                        <action managerName="shipmentManager" methodName="downLegs" parameter="ids"/> -->
-<!--                    </actions> -->
-<!--                    <forwards> -->
-<!--                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                    </forwards> -->
-<!--                </commit> -->
-<!--             <commit id="saveSortIndex" title="saveSortIndex" enableType="multi" invisible="false"> -->
-<!--                	<enableExpression><![CDATA[(${shipment.status} == 'UNAVAILABLE'|| ${shipment.status}=='AVAILABLE'||${shipment.status}=='LOADING'||${shipment.status}=='ONROAD') && (${shipment.id} != null)]]></enableExpression> -->
-<!--                     <mappings> -->
-<!--                     <mapping id="map" className="map"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="shipmentManager" methodName="modifySortIndex" parameter="map"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit>	 -->
-<!--             </buttons> -->
-        </detail>
-    </modifyDetailPage>
-</pages>
diff --git a/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml b/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml
deleted file mode 100644
index fa87200..0000000
--- a/target/sdtms/WEB-INF/classes/config/origen/shipment/modifyShipmentZSPage.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <modifyDetailPage id="modifyShipmentZSPage" title="modifyShipmentZSPage" entityClass="com.dev.stms.server.model.shipment.Shipment" onClose="refreshParent" width="900" height="500">
-        <modify>
-            <inputUIs>
-                <hidden id="shipment.id" reserve="false"/>
-                <hidden id="shipment.status" reserve="false"/>
-                <hidden id="aa" reserve="false"/>
-        		<hidden id="bb" reserve="false"/>
-                <text id="shipment.code" title="shipment.code" row="1" col="1" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <remote id="shipment.carrier.id" title="shipment.carrier" row="1" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" editModel="uneditable" 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.beCarrier=true
- or carrier.beInCarrier=true)
- and (upper(carrier.code) like :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}~/ order by carrier.beInCarrier desc,carrier.beCarrier desc]]></hql>
-                    <inputUIs>
-                        <text id="carrier.name" title="editShipmentPage.carrier.name" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                <remote id="shipment.vehicle.id" title="shipment.vehicle" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,车型">
-                    <hql><![CDATA[ select 
- vehicle.id, 	
- vehicle.license,
- vehicle.vehicleType.name,
- vehicle.vehicleType.code,
- vehicle.vehicleType.id,
- m.name,
- m.idCard,
- m.contact.phone ,
-  m.id 
- from Vehicle vehicle 
- left join vehicle.vehicleType vt
- left join vehicle.masterDriver m
- where vehicle.disabled=false and vehicle.license like :param
-  and (vehicle.status='ENABLE' or vehicle.status is null )
-  and vehicle.carrier.id=${shipment.carrier.id} 
-/~vehicle.license: and vehicle.license like {vehicle.license}~/
-]]></hql>
-                     <eventListeners>
-                        <eventListener id="shipment.license" index="2" refreshUI="false"/>
-                        <eventListener id="aa" index="4" refreshUI="false"/>
-                        <eventListener id="bb" index="6" refreshUI="false"/>
-                        <eventListener id="shipment.vehicleType.id" index="0" refreshUI="false"/>
-                         <eventListener id="shipment.driverName" index="6" refreshUI="false"/>
-                        <eventListener id="shipment.driverIdentityCard" index="7" refreshUI="false"/>
-                        <eventListener id="shipment.driverPhone" index="8" refreshUI="false"/>
-                         <eventListener id="shipment.driver.id" index="9" refreshUI="false"/>
-                    </eventListeners> 
-                    <inputUIs>
-                        <text id="vehicle.license" title="editShipmentPage.vehicle.license" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                    </inputUIs>
-                </remote>
-                <text id="shipment.license" title="editShipmentPage.shipment.license" row="1" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-				<text id="shipment.cargoManifest" title="cargoManifest" row="2" col="1" span="1"   readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"  isPrecision="true">
-<!--                		<visibleExpression><![CDATA[ (${consignorName} == 'true' ||  ${consignorName} == true)]]></visibleExpression> -->
-                </text>
-<!-- 				<list id="shipment.unit" title="orders.unit" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="MeasureUnit" > -->
-<!--                     <hql><![CDATA[ SELECT  -->
-<!--   enumerate.enumValue, -->
-<!--   enumerate.enumValue From Enumerate enumerate  -->
-<!--   where enumerate.enumType = 'MeasureUnit' and enumerate.enumValue in ('VEHICLETYPE','WEIGHT','TICKET') order by enumerate.id]]></hql> -->
-<!--                 </list> -->
-				<list id="shipment.vehicleType.id" title="sendCar.vehicleType.name" row="2" col="2" span="1" width="120" readOnly="false" required="false" defaultValue="${bb}" reserve="false" forceOverride="true" forceSpace="false" multiple="false" inVisible="false">
-                    <hql><![CDATA[select d.id,d.name
-						 from VehicleType d 
-						 where  d.disabled=false 
- order by d.name,d.id 
-						]]></hql>
-                </list>
-                <date id="shipment.planLeaveTime" title="shipment.planLeaveTime" row="2" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false"/>
-                <date id="shipment.planArriveTime" title="shipment.planArriveTime" row="2" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false"/>
-                <remote id="shipment.driver.id" title="shipment.driver" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,名称">
-                    <hql><![CDATA[ select 
- driver.id, 
- driver.name, 
- driver.idCard,
- driver.contact.phone 
- from Driver  driver
- where driver.disabled=false 
- and driver.name like :param and driver.platForm= #{SESSION_PLATFORM} ]]></hql>
-                    <eventListeners>
-                        <eventListener id="shipment.driverName" index="2" refreshUI="false"/>
-                        <eventListener id="shipment.driverIdentityCard" index="3" refreshUI="false"/>
-                        <eventListener id="shipment.driverPhone" index="4" refreshUI="false"/>
-                    </eventListeners>
-                    <inputUIs>
-                        <text id="driver.name" title="editShipmentPage.driver.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="shipment.driverName" title="driver.name" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.driverIdentityCard" title="editShipmentPage.shipment.driverIdentityCard" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.driverPhone" title="editShipmentPage.shipment.driverPhone" row="3" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-<!--                 <remote id="shipment.routeFee.id" title="editRegistrationPage.shipment.routeFee.name" row="4" col="1" 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 :param  -->
-<!--  and d.disabled=false and d.customer.id=${shipment.carrier.id} -->
-<!--  /~d.name: and d.name like {d.name}~/]]></hql> -->
-<!--                 </remote> -->
-                <text id="shipment.quantity" title="quantity" row="4" col="1" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true" decimal="1"/>
-                <text id="shipment.weight" title="weight" row="4" col="2" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="4" isPrecision="true"/>
-                <text id="shipment.volume" title="volume" row="4" col="3" span="1" readOnly="true" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" decimal="4" isPrecision="true"/>
-<!--                 <list id="shipment.superviseType" title="orders.superviseType" row="5" col="1" span="1" width="120" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="SuperviseType"> -->
-<!--                 <hql><![CDATA[ SELECT t.enumValue,t.enumValue  -->
-<!--  FROM Enumerate t  -->
-<!--  WHERE t.enumType = 'SuperviseType' order by t.id]]></hql> -->
-<!--                 </list> -->
-                <text id="shipment.quantityFee" title="editRegistrationPage.shipment.quantityFee" row="4" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <text id="shipment.weightFee" title="editRegistrationPage.shipment.weightFee" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <list id="shipment.transportType" title="shipment.transportType" row="5" col="2" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
- c.name,
- c.name
- FROM CommonCode c 
- WHERE c.disabled=0 and c.codeType='调度方式' and c.name in('提货','干线','派送')  order by c.id asc
- ]]></hql>
- 				<eventListeners>
-					<eventListener id="shipment.unloadingCompany.id"  refreshUI="true"/>
-                </eventListeners>
-                </list>
-                <remote id="shipment.unloadingCompany.id" title="unOrgId" row="5" col="3" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false"  displayColumn="2" percentSignPosition="both" displayedTableHead="序号,代码,名称">
-                    <visibleExpression><![CDATA[(${shipment.transportType} == '提货'|| ${shipment.transportType} == '干线'  )]]></visibleExpression>
-                    <hql><![CDATA[ select 
- carrier.id,
- carrier.name, 
- carrier.name 
- from Organization  carrier 
-  WHERE carrier.bePlatForm=1 and carrier.name like upper(:param) AND carrier.disabled=0 order by carrier.id ]]></hql>  
-                    <inputUIs>
-                        <text id="t.name" title="editShipmentPage.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="shipment.description" title="shipment.description" row="7" col="1" span="4" width="740" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-            		<text id="consignorName" defaultValue="一次" title="consignorName" row="8" col="1" span="4"  readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="true"/>
-            </inputUIs>
-            <buttons>
-                <commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false">
-                    <enableExpression><![CDATA[(${shipment.status}!='CANCEL')]]></enableExpression>
-                    <mappings>
-                        <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
-                        <mapping id="consignorName" className="string"/>
-                    </mappings>
-                    <actions>
-                        <action managerName="shipmentManager" methodName="manualStoreShipment" parameter="shipment,consignorName"/>
-                    </actions>
-                    <forwards>
-                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                    </forwards>
-                </commit>
-            </buttons>
-        </modify>
-        <detail autoQuery="false">
-            <datasource><![CDATA[ SELECT 
-  legs.id,
-  legs.order.fromCity.name||'-'||legs.order.toCity.name,
-  legs.ecNo,
-  legs.order.customerOrderNO,
-  legs.consignor.name,
-  legs.order.fromContact.address,
-  legs.order.toContact.address,
-  legs.order.toName,
-  round(legs.quantity,1),
-  round(legs.weight,4),
-  round(legs.volume,4),
-  legs.description
-  FROM  Legs legs 
-  left join legs.fromLocation
-  left join legs.toLocation
-  left join legs.order
-  WHERE 1=1
-   /~ shipment.id: AND  legs.shipment.id= {shipment.id} ~/
-   ORDER BY legs.sortIndex
-]]></datasource>
-            <columns>
-                <column id="legs.id" title="legs.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-<!--                 <column id="legs.sortIndex" title="legs.sortIndex" visible="true" width="40" horizonAlign="center" verticalAlign="middle" inputUI="text" inputUIValidator="integerRequired"/> -->
-<!--                 <column id="legs.distance" title="legs.distance" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/> -->
-                <column id="legs.routeName" title="legs.routeName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.ecNo" title="legs.ecNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.order.customerOrderNO" title="orders.customerOrderNO" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.consignor.name" title="shipment.customerName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.fromContact.address" title="fromAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.toContact.address" title="toAddress" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="orders.toName" title="orders.toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
-                <column id="legs.quantity" title="legs.quantity" width="60" visible="true" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.weight" title="legs.weight" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-                <column id="legs.volume" title="legs.volume" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/>
-<!--                 <column id="legs.payfee" title="legs.payfee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/> -->
-<!--                 <column id="legs.otherFee" title="legs.otherFee" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/> -->
-<!--                 <column id="legs.shareDistance" title="legs.shareDistance" visible="true" width="60" horizonAlign="center" verticalAlign="middle"/> -->
-<!--                 <column id="legs.shareRouteName" title="legs.shareRouteName" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
-                <column id="legs.order.description" title="order.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            </columns>
-            <buttons>
-              <popup id="addLegButton" title="modifyShipmentPage.addLegButton" enableType="none" invisible="false" containId="true" pageId="maintainAddZSLegsPage">
-                <enableExpression><![CDATA[ (${shipment.id} != null)]]></enableExpression>
-              </popup>
-              <popup id="addLegButton2" title="modifyShipmentPage.addLegButton2" enableType="none" invisible="false" containId="true" pageId="maintainAddFHLegsPage">
-                   <enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression>
-              </popup> 
-               <popup id="addLegButton3" title="addLegButton3" enableType="none" invisible="false" containId="true" pageId="maintainAddTHreeLegsPage">
-                   <enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression>
-              </popup> 
-               <commit id="deleteLegsButton" title="modifyShipmentPage.deleteLegsButton" enableType="multi" invisible="false">
-                	<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression>
-            	<mappings>
-                       <mapping id="ids" className="list"/>
-                   </mappings>
-                   <actions>
-                       <action managerName="shipmentManager" methodName="deleteLegs" parameter="ids"/>
-                   </actions>
-                   <forwards>
-                       <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                   </forwards>
-               </commit>
-               <popup id="lookGoodsDetail" title="lookGoodsDetail" enableType="single" invisible="false" containId="true" pageId="modifyGoodsDetailPage"/>
-               <popup id="lookPackDetail" title="lookPackDetail" enableType="single" invisible="false" containId="true" pageId="modifyPackDetailPage"/>		
-
-<!--                 <commit id="upLegs" title="upLegs" enableType="multi" invisible="false"> -->
-<!--                 	<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression> -->
-<!--             		<mappings> -->
-<!--                        <mapping id="ids" className="list"/> -->
-<!--                    </mappings> -->
-<!--                    <actions> -->
-<!--                        <action managerName="shipmentManager" methodName="upLegs" parameter="ids"/> -->
-<!--                    </actions> -->
-<!--                    <forwards> -->
-<!--                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                    </forwards> -->
-<!--                </commit> -->
-<!--                 <commit id="downLegs" title="downLegs" enableType="multi" invisible="false"> -->
-<!--                 	<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression> -->
-<!--             		<mappings> -->
-<!--                        <mapping id="ids" className="list"/> -->
-<!--                    </mappings> -->
-<!--                    <actions> -->
-<!--                        <action managerName="shipmentManager" methodName="downLegs" parameter="ids"/> -->
-<!--                    </actions> -->
-<!--                    <forwards> -->
-<!--                        <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                    </forwards> -->
-<!--                </commit> -->
-<!--             <commit id="saveSortIndex" title="saveSortIndex" enableType="multi" invisible="false"> -->
-<!--                	<enableExpression><![CDATA[(${shipment.status} == 'RK_ONROAD' ||${shipment.status}=='AVAILABLE' ||${shipment.status}=='LOADING' ||${shipment.status} == 'ONROAD' || ${shipment.status} == 'SH_ONROAD' || ${shipment.status} == 'FH_ONROAD'||${shipment.status} == 'ZC_ONROAD')&& (${shipment.id} != null)]]></enableExpression> -->
-<!--             	<mappings> -->
-<!--                     <mapping id="map" className="map"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="shipmentManager" methodName="modifySortIndex" parameter="map"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit>	 -->
-            </buttons>
-        </detail>
-    </modifyDetailPage>
-</pages>