From ab10193e9b8224bf6644b832f3bf9c44dee89146 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Tue, 11 Feb 2025 10:47:36 +0800
Subject: [PATCH] no message

---
 .../origen/shipment/editLegsOrderPage.xml     |   2 +-
 .../origen/shipment/editLegsOrderPage.xml     | 265 ------------------
 2 files changed, 1 insertion(+), 266 deletions(-)
 delete mode 100644 target/cqtms/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml

diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml
index 5ab55f7..3a8ca30 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml
@@ -244,7 +244,7 @@
             </inputUIs>
             <buttons>
                 <commit id="saveOrderButton" title="00030D412CB01211614789269" width="200" enableType="none"  invisible="false" accelerateKey="enter">
-                    <enableExpression><![CDATA[${orders.status}  == 'AVAILABLE']]></enableExpression>
+                   <!--  <enableExpression><![CDATA[${orders.status}  == 'AVAILABLE']]></enableExpression> -->
                     <mappings>
                         <mapping id="orders" className="com.dev.stms.server.model.order.Order"/>
                         <mapping id="consignorName" className="string"/>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml
deleted file mode 100644
index 5ab55f7..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/editLegsOrderPage.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <editPage id="editLegsOrderPage" title="editLegsOrderPage" entityClass="com.dev.stms.server.model.order.Order" onClose="refreshParent" width="1020" height="600">
-        <initListeners>
-            <initListener id="orders.planFromDate" managerName="orderManager" methodName="getCurrierTime" newEnabled="true" editEnabled="false"/>
-            <initListener id="orders.planArriveTime" managerName="orderManager" methodName="getCurrierTime" newEnabled="true" editEnabled="false"/>
-        </initListeners>
-            <inputUIs>
-                <hidden id="orders.id" reserve="false"/>
-                <hidden id="orders.status" reserve="false"/>
-                <hidden id="ab" reserve="false"/>
-                 <hidden id="cd" reserve="false"/>
-                <text id="orders.code" title="order.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" editModel="uneditable" trimSpace="true"/>         
-                <remote id="orders.consignor.id" title="consignor" row="0" col="1" span="1" width="120" readOnly="false" required="true" reserve="true" displayColumn="2"  forceOverride="true" editModel="editable" displayedTableHead="序号,简称,名称">
-                    <hql><![CDATA[SELECT 
- org.id,
- org.name,
- org.shortName,
- org.carryAddress.name,
- org.carryAddress.contact.linkman,
- org.carryAddress.contact.phone,
- org.carryAddress.contact.address,
- org.carryAddress.id,
- org.fromClaim,
- org.carPeople,
- org.toClaim
- FROM Organization org  
- left join org.department
- left join org.carryAddress 
- 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>
- 				<eventListeners>
- 						<eventListener id="orders.fromLocation.id" index="8" refreshUI="false"/>
- 						<eventListener id="orders.fromName" index="4" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.address" index="7" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.linkman" index="5" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.phone" index="6" refreshUI="false"/>
-                        <eventListener id="orders.description1" index="9" refreshUI="false"/>
-                        <eventListener id="orders.carPeople" index="10" refreshUI="false"/>
-                </eventListeners>
-                   <inputUIs>
-                        <text id="org.name" title="consignorName" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                    </inputUIs>
-                </remote>
-                <text id="orders.customerOrderNO" title="orders.customerOrderNO" row="0" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  trimSpace="true"/> 
-                <list id="orders.orderType.id" title="orders.orderType" row="1" col="2" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="true">
-                    <hql><![CDATA[ SELECT 
- c.id,
- c.name
- FROM OrderType c 
- WHERE c.disabled=0
- ]]></hql>
-                </list>
-                <date id="orders.orderDate" title="order.orderDate" row="0" col="3" span="1" readOnly="false" required="true" reserve="true" forceOverride="false" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="true"/>
-                <text id="orders.carPeople" title="orders.carpeople" row="0" col="4" span="1" readOnly="false" defaultValue="" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <numberText id="orders.quantity" title="quantity" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="0" />
-                <list id="orders.unitOne" title="orders.unitOne" row="1" col="2" span="1" defaultValue="件" 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='包装单位' 
- ]]></hql>
-                </list>
-                <numberText id="orders.weight" title="order.weight" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  validator="number" returnType="Double" decimal="2" />
-                <numberText id="orders.volume" title="volume" row="1" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  validator="number" returnType="Double" decimal="2" />
-			    <date id="orders.planFromDate" title="orders.planFromDate" row="3" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true"/>
-				 <text id="orders.planFromTime" title="orders.planFromTime" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  trimSpace="true"/> 
-                <date id="orders.planArriveTime" title="orders.planArriveTime" row="3" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-				<text id="orders.declare" title="orders.declare" row="3" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  trimSpace="true" defaultValue="16:00"/> 
-				 <list id="orders.unit" title="orders.unit" defaultValue="WEIGHT" row="4" 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','VOLUME','TON_CUBIC') or enumerate.id=1 order by enumerate.id asc ]]></hql>
-                </list>
- 				
-                <remote id="orders.routeFee.id" title="order.routeFee.name" row="4" 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.name,d.name
- from RouteFee d 
- where (d.code like upper(:param) or d.name like :param)
- and d.disabled=false   
- 
-  order by d.id]]></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>
-                 <list id="orders.superviseType" title="orders.cargoType"  defaultValue="UNSUPERVISE" row="4" col="3" 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>
-				<list id="orders.shipmentMethod" title="orders.shipmentMethod" defaultValue="TRUCK"  row="4" col="4" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentMethod">
-                    <hql><![CDATA[ SELECT 
-  enumerate.enumValue,
-  enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'ShipmentMethod' order by enumerate.id]]></hql>
-                </list>
-                <remote id="orders.extends1.id" title="order.extends1.name" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车型">
-                    <hql><![CDATA[ select d.id,d.name 
- from VehicleType d
- where (d.code like upper(:param) or d.name like :param) 
- and d.disabled=false  and d.beContractVehicle=true
-  order by d.id asc
- ]]></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="orders.vehicleNumber1" title="orders.vehicleNumber" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <remote id="orders.extends2.id" title="order.extends2.name" row="5" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车型">
-                   <hql><![CDATA[ select d.id,d.name 
- from VehicleType d
- where (d.code like upper(:param) or d.name like :param) 
- and d.disabled=false 
- and d.beContractVehicle=true order by d.id asc
- ]]></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="orders.vehicleNumber2" title="orders.vehicleNumber" row="5" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <list id="orders.deliveryMode" title="orders.deliveryMode" row="6" col="1" span="1" defaultValue="送货上门" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-   c.code,c.name 
-   From CommonCode c  
-   where c.codeType='交付方式' order by c.id asc]]></hql> 
-                </list>
-                <list id="orders.paymentMethod" title="orders.paymentMethod" defaultValue="月付" row="6" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false"  >
-                    <hql><![CDATA[ SELECT 
-   c.code,c.name 
-   From CommonCode c  
-   where c.codeType='付款方式' order by c.id asc]]></hql>
-	   				<eventListeners>
-	                    <eventListener id="aa" refreshUI="true"/>
-	                </eventListeners>
-                </list>
-               <text id="aa" title="orders.cash" row="6" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="true"/>
-               <text id="orders.cash" title="orders.cash" row="6" col="3" span="1" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="true" trimSpace="true" manualEditable="true" isPrecision="true">
-               		<visibleExpression><![CDATA[ (${aa} == '到付' || ${aa} == '现付')]]></visibleExpression>
-               </text>
-               <checkbox id="orders.checkBill" title="orders.checkBill" row="6" col="4" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false">
-               		<visibleExpression><![CDATA[ (${aa} == '到付' || ${aa} == '现付')]]></visibleExpression>
-               </checkbox>
-                <separator id="separator1" row="7"/>
-                <remote id="orders.fromCityCountiy.id" title="orders.fromCode" row="10" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,城市,省份">
-                <hql><![CDATA[select city.id,city.name,city.zone.name,
-                city.ssq from City city 
- where upper(city.name) like upper(:param) and city.disabled =false 
- /~city.name: and city.name like {city.name} ~/]]></hql> 
- 				<eventListeners>
-                </eventListeners>
-            </remote>
-              <remote id="orders.fromLocation.id" title="orders.fromName" row="10" col="1" span="1" readOnly="false" required="false"  reserve="true" forceOverride="true" inVisible="false"  manualEditable="true"  displayColumn="2"  percentSignPosition="both" displayedTableHead="序号,提货单位,联系人,电话,地址">
-                  <hql><![CDATA[SELECT 
- t.id,
- t.name,
- t.contact.linkman,
- t.contact.phone,
- t.contact.address,
- t.thyq,
- qy.id
- FROM TransLocation t 
- left join t.city qy 
- left join qy.city cs 
- WHERE t.remark like upper(:param) AND t.disabled=0  and (t.platForm = #{SESSION_PLATFORM} or t.sourceId is not null) and t.sourceId is null  
- and  (qy.id={orders.fromCityCountiy.id} or cs.id={orders.fromCityCountiy.id}) 
- order by t.ssq,t.name desc,t.contact.address,t.id
- /~t.name: AND t.name like {t.name}~/]]></hql>
-                    <eventListeners>
-                        <eventListener id="orders.fromName" index="2" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.address" index="5" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.linkman" index="3" refreshUI="false"/>
-                        <eventListener id="orders.fromContact.phone" index="4" refreshUI="false"/>
-                         <eventListener id="orders.description1" index="6" refreshUI="false"/>
-                         <eventListener id="orders.fromCityCountiy.id" index="7" refreshUI="false"/>
-                    </eventListeners>
-                    <inputUIs>
-                        <text id="t.name" title="modifyOrderPage.sender.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                    </inputUIs>
-                </remote>
-                <text id="orders.fromCode" title="orders.fromCode" row="10" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="true" trimSpace="true"/>
-                <text id="orders.fromName" title="orders.fromName" row="10" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.fromContact.linkman" title="linkman" row="10" col="3" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.fromContact.phone" title="phone" row="11" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.fromContact.address" title="fromAddress" row="11" col="2" span="3" width="550" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <textArea id="orders.description1" title="order.description1" row="12" col="1" span="4" width="850" readOnly="false" required="false" reserve="true" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-                <separator id="separator2" row="13"/>
-                <remote id="orders.toCityCountiy.id" title="orders.toCode" row="14" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,城市,省份">
-                <hql><![CDATA[select city.id,city.name,city.zone.name,
-                city.ssq from City city 
- where upper(city.name) like upper(:param) and city.disabled =false 
- /~city.name: and city.name like {city.name} ~/]]></hql>
- 				<eventListeners>
-                </eventListeners>
-            </remote>
-             <remote id="orders.toLocation.id" title="orders.toName" row="14" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,收货单位,联系人,电话,地址">
-                      <hql><![CDATA[SELECT 
- t.id,
- t.name,
- t.contact.linkman,
- t.contact.phone,
- t.contact.address,
- t.thyq,
- qy.id
- FROM TransLocation t 
- left join t.city qy 
- left join qy.city cs 
- WHERE t.remark like upper(:param) AND t.disabled=0  and (t.platForm = #{SESSION_PLATFORM} or t.sourceId is not null) and t.sourceId is null  
- and  (qy.id={orders.toCityCountiy.id} or cs.id={orders.toCityCountiy.id}) 
- order by t.ssq,t.name desc,t.contact.address,t.id
- /~t.name: AND t.name like {t.name}~/]]></hql>
-                    <eventListeners>
-                        <eventListener id="orders.toName" index="2" refreshUI="false"/>
-                        <eventListener id="orders.toContact.address" index="5" refreshUI="false"/>
-                        <eventListener id="orders.toContact.linkman" index="3" refreshUI="false"/>
-                        <eventListener id="orders.toContact.phone" index="4" refreshUI="false"/>
-                        <eventListener id="orders.description" index="6" refreshUI="false"/>
-                        <eventListener id="orders.toCityCountiy.id" index="7" refreshUI="false"/>
-                    </eventListeners>
-                    <inputUIs>
-                        <text id="t.remark" title="modifyOrderPage.receiver.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                    </inputUIs>
-                </remote>
-                <text id="orders.toCode" title="orders.toCode" row="10" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true"/>
-                <text id="orders.toName" title="orders.toName" row="14" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.toContact.linkman" title="linkman" row="14" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.toContact.phone" title="phone" row="18" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="orders.toContact.address" title="toAddress" row="18" col="1" span="3" width="550" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-               <textArea id="orders.description" title="order.description2" rows="4" cols="100" row="19" col="1" span="4" width="850" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-               <!--  <separator id="separator3" row="20"/>
-                <checkbox id="orders.beStorage" title="orders.beStorage" row="22" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-               <checkbox id="orders.beReturn" title="orders.beReturn" row="22" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-                <checkbox id="orders.isShortBarge" title="orders.isShortBarge" row="22" col="3" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
- 				<checkbox id="orders.cusBill" title="orders.cusBill" row="22" col="4" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
- 				<checkbox id="orders.guard" title="orders.guard" row="23" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-            <buttons>
-                <commit id="saveOrderButton" title="00030D412CB01211614789269" width="200" enableType="none"  invisible="false" accelerateKey="enter">
-                    <enableExpression><![CDATA[${orders.status}  == 'AVAILABLE']]></enableExpression>
-                    <mappings>
-                        <mapping id="orders" className="com.dev.stms.server.model.order.Order"/>
-                        <mapping id="consignorName" className="string"/>
-                    </mappings>
-                    <actions>
-                          <action managerName="orderManager" methodName="storeTransOrder" parameter="orders,consignorName"/>
-                    </actions>
-                    <forwards>
-                        <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                    	<forward name="resetWindow" newEnabled="true" editEnabled="false"/>
-                    	 <forward name="closeWindow" newEnabled="false" editEnabled="true"/>
-                    </forwards>
-                </commit>
-                <popup id="new" title="maintainOrganizationPage.newconsignor" enableType="none" invisible="false" containId="false" pageId="editOrganizationPage"/>
-<!--                <popup id="printOrder" title="printOrder" enableType="single" invisible="false" containId="true" pageId="printOrderPage"/> -->
-            </buttons>
-    </editPage>
-</pages>