diff --git a/src/main/java/com/dev/swms/server/model/order/CheckRelea.java b/src/main/java/com/dev/swms/server/model/order/CheckRelea.java
index aef2e74..d640f5e 100644
--- a/src/main/java/com/dev/swms/server/model/order/CheckRelea.java
+++ b/src/main/java/com/dev/swms/server/model/order/CheckRelea.java
@@ -1,5 +1,7 @@
 package com.dev.swms.server.model.order;
 
+import java.util.Date;
+
 import com.dev.energy.server.model.Entity;
 import com.dev.swms.server.model.base.Location;
 import com.dev.swms.server.model.base.UpdateInfo;
@@ -57,8 +59,15 @@ public class CheckRelea extends Entity{
 	
 	private MasterBOL masterBOL;
 	
+	private Date vehicleDate;//车辆登记时间
 	
 	
+	public Date getVehicleDate() {
+		return vehicleDate;
+	}
+	public void setVehicleDate(Date vehicleDate) {
+		this.vehicleDate = vehicleDate;
+	}
 	public MasterBOL getMasterBOL() {
 		return masterBOL;
 	}
diff --git a/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml b/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml
index f45fd95..6fae737 100644
--- a/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml
@@ -70,5 +70,6 @@
 		<many-to-one name="masterBOL" class="com.dev.swms.server.model.shipping.MasterBOL">
 			<column name="MASTER_BOL_ID"/>
 		</many-to-one>
+		<property name="vehicleDate" column="VEHICLE_DATE" type="timestamp" />
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java
index d6cd4f0..613237d 100644
--- a/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java
+++ b/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java
@@ -44,6 +44,9 @@ public interface CustomsOrderManager extends BaseManager{
 	@Transactional
 	void saveRegisterCheckRelea(Long asn_id,CheckRelea cr);
 	
+	//车辆登记
+	void saveRegisterCheckRelea2(Long asn_id,CheckRelea cr);
+	
 	@Transactional
 	void saveFee(Fee fee ,Long asnid,String billObjectType);
 	
diff --git a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
index fe0d595..4ba5a68 100644
--- a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
+++ b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
@@ -2786,6 +2786,20 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
 			}
 		}
 	}
+	
+	@Transactional
+	public void saveRegisterCheckRelea2(Long asn_id,CheckRelea cr) {
+		ASN asn=commonDao.load(ASN.class, asn_id);
+		cr.setAsn(asn);
+		if(asn.getInvoiceBox()!=null) {
+			cr.setInvoiceBox(asn.getInvoiceBox());
+			cr.setOrder(asn.getInvoiceBox().getCustomsOrder());
+		}
+		cr.setVehicleDate(new Date());
+		commonDao.store(cr);
+		wmsOperationHisManager.storeOperationHis(asn.getId(),asn.getCode(), null,"", "发票箱单", "车辆登记",null,null,0, 0,0, 0, asn.getDescription(), "WMS");
+	}
+	
 	public void saveRegisterCheckRelea(Long asn_id,CheckRelea cr) {
 		ASN asn=commonDao.load(ASN.class, asn_id);
 		cr.setAsn(asn);
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml
index c4225c5..f5941cc 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml
@@ -23,10 +23,11 @@
 <!--                         <eventListener id="checkRelea.frameWeight" index="5" refreshUI="false"/> -->
 <!--                     </eventListeners> -->
 <!--  			 </remote> -->
-       		<text id="checkRelea.license" title="l.license" row="1" col="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+       		<text id="checkRelea.license" title="l.license" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
        		<text id="checkRelea.driverName" title="司机姓名" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
        		<text id="checkRelea.telephone" title="电话" row="1" col="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-             <list id="checkRelea.dock.id" title="作业平台" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
+       		
+             <!-- <list id="checkRelea.dock.id" title="作业平台" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
                     <hql><![CDATA[ SELECT 
   c.id, 
   c.code,
@@ -58,7 +59,7 @@
   FROM Worker c  
   WHERE c.disabled=0 and c.type='DISPATCHER'
   ]]></hql> 
-        	</list>
+        	</list> -->
         </inputUIs>
         <buttons>
             <commit id="save" title="save" enableType="none" invisible="false">
@@ -67,7 +68,7 @@
                     <mapping id="crd" className="com.dev.swms.server.model.order.CheckRelea"/>
                 </mappings>
                 <actions>
-                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea" parameter="asn.id,crd"/>
+                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea2" parameter="asn.id,crd"/>
                 </actions>
                 <forwards>
                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml
index 4db7f43..710e90f 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-    <editPage id="editReceivePage" title="editReceivePage" entityClass="com.dev.swms.server.model.order.CheckRelea" onClose="refreshParent" width="300" height="330">
+    <editPage id="editReceivePage" title="作业派单" entityClass="com.dev.swms.server.model.order.CheckRelea" onClose="refreshParent" width="550" height="330">
         <inputUIs>
             <hidden id="checkRelea.id" reserve="false"/>
             
@@ -15,7 +15,7 @@
     and c.warehouse = #{SESSION_WAREHOUSE} order by c.code
   ]]></hql> 
         	 </list>
-        	 <list id="checkRelea.worker1.id" title="理货员" row="2" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
+        	 <list id="checkRelea.worker1.id" title="理货员" row="1" col="2" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
                     <hql><![CDATA[ SELECT 
   c.id, 
   c.name 
@@ -23,7 +23,7 @@
   WHERE c.disabled=0 and c.type='FORKLIFT'
   ]]></hql> 
         	</list>
-        	<list id="checkRelea.worker2.id" title="理动力人员" row="3" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
+        	<list id="checkRelea.worker2.id" title="理动力人员" row="1" col="3" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
                     <hql><![CDATA[ SELECT 
   c.id, 
   c.name 
@@ -31,7 +31,7 @@
   WHERE c.disabled=0 and c.type='GENARAL'
   ]]></hql> 
         	</list>
-        	<list id="checkRelea.worker3.id" title="仓库派单员" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
+        	<list id="checkRelea.worker3.id" title="仓库派单员" row="2" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
                     <hql><![CDATA[ SELECT 
   c.id, 
   c.name 
@@ -43,12 +43,11 @@
         <buttons>
             <commit id="save" title="save" enableType="none" invisible="false">
                 <mappings>
-                	<mapping id="parentIds" className="list"/>
                 	<mapping id="asn.id" className="long"/>
                     <mapping id="crd" className="com.dev.swms.server.model.order.CheckRelea"/>
                 </mappings>
                 <actions>
-                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea" parameter="parentIds,asn.id,crd"/>
+                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea" parameter="asn.id,crd"/>
                 </actions>
                 <forwards>
                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml
index 880f314..af5fd59 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml
@@ -38,6 +38,7 @@
  checkRelea.worker2.name,
  checkRelea.worker3.name,
  checkRelea.license,
+ checkRelea.vehicleDate,
  checkRelea.titleNo,
  checkRelea.telephone,
  checkRelea.containNo,
@@ -71,6 +72,7 @@
             <column id="checkRelea.worker2.name" title="checkRelea.worker2.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="checkRelea.worker3.name" title="checkRelea.worker3.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="checkRelea.license" title="checkRelea.license" visible="true" horizonAlign="center" verticalAlign="middle"/>
+             <column id="checkRelea.vehicleDate" title="车辆登记时间" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="checkRelea.titleNo" title="checkRelea.titleNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="checkRelea.telephone" title="checkRelea.telephone" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="checkRelea.containNo" title="checkRelea.containNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
@@ -86,10 +88,12 @@
             <column id="checkRelea.description" title="checkRelea.description" visible="true" horizonAlign="center" verticalAlign="middle" />
         </columns>
         <buttons>
-       		 <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editCheckReleaDetailFBPage"/>
-            <popup id="edit" title="登记" enableType="multi" invisible="false" containId="true" pageId="editReceivePage">
-            <enableExpression><![CDATA[(${asn.status}=='OPEN'||${asn.status}=='ACTIVE' )]]></enableExpression>
-            </popup>
+         <popup id="cldj" title="车辆登记" enableType="none" invisible="false" containId="false" pageId="editCheckReleaDetailFBPage"/>
+            
+       	  <popup id="zypd" title="作业派单" enableType="none" invisible="false" containId="false" pageId="editReceivePage">
+            <!-- <enableExpression><![CDATA[(${asn.status}=='OPEN'||${asn.status}=='ACTIVE' )]]></enableExpression> -->
+            </popup> 
+       		
 
 <!--             <commit id="delete" title="delete" enableType="multi" invisible="false"> -->
 <!--                 <mappings> -->
@@ -102,7 +106,7 @@
 <!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
 <!--                 </forwards> -->
 <!--             </commit> -->
-		 <popup id="edit" title="库位登记" enableType="multi" invisible="false" containId="true" pageId="modifyLocationRegistrationPage"/>
+		 <popup id="edit" title="库位分配" enableType="multi" invisible="false" containId="true" pageId="modifyLocationRegistrationPage"/>
         </buttons>
         </detail>
     </modifyDetailPage>
diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
index 63b4ebe..d263f0a 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
@@ -118,11 +118,11 @@
 			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
         </columns>
         <buttons>
-           <popup id="importASN" title="importASN" enableType="none" invisible="false" containId="false" pageId="importASNPage"/>
-<!--             <popup id="importASNGrounding" title="importASNGrounding" enableType="none" invisible="false" containId="false" pageId="importASNGroundingPage"/> -->
+          <!--  <popup id="importASN" title="importASN" enableType="none" invisible="false" containId="false" pageId="importASNPage"/>
             <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editASNPage"/>
             <popup id="modify" title="edit" enableType="single" invisible="false" containId="true" pageId="editASNPage"/>
-            <commit id="delete" title="delete_return" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
+            
+ -->            <commit id="delete" title="delete_return" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
                 <enableExpression><![CDATA[(${asn.status}=='OPEN')||(${asn.status}=='ACTIVE')]]></enableExpression>
                 <mappings>
                     <mapping id="ids" className="list"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml
index b0dd4fe..7111a35 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml
@@ -93,6 +93,7 @@
  WHERE 1=1 
  and inventory.quantity-inventory.queuedQuantity>0
  and inventory.warehouse=#{SESSION_WAREHOUSE}
+ and location.type='STORAGE'
  and item.id=(select d.item.id from PickTicketDetail d where d.id={id} )
  and (inventory.SOI=(select d.pickTicket.relatedBill3 from PickTicketDetail d where d.id={id})  /~ordersAll: or true = {ordersAll}~/ )
  /~company.id: AND company.id = {company.id}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
index c835f54..92cb021 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
@@ -15,8 +15,6 @@
  (pickTicketDetail.orderQuantity-pickTicketDetail.allocatedQuantity) as unQllocatedQuantity,
  pickTicketDetail.orderQuantity,
  pickTicketDetail.allocatedQuantity,
- pickTicketDetail.item.company.name,
- pickTicketDetail.item.code,
  pickTicketDetail.item.name,
  pickTicketDetail.item.specs
  FROM PickTicketDetail pickTicketDetail
@@ -33,9 +31,7 @@
                 <column id="unQllocatedQuantity" title="未分配数量" width="80" visible="true" horizonAlign="left"/>
                 <column id="pickTicketDetail.orderQuantity" title="pickTicketDetail.orderQuantity" width="95" visible="true" horizonAlign="right"/>
                 <column id="pickTicketDetail.allocatedQuantity" title="pickTicketDetail.allocatedQuantity" visible="true"  horizonAlign="right"/>
-                <column id="pickTicketDetail.item.company.name" title="company.name" width="120" visible="true" horizonAlign="left" />
-                <column id="pickTicketDetail.item.code" title="item.code" width="200" visible="true" horizonAlign="left"/>
-                <column id="pickTicketDetail.item.name" title="item.name" width="200" visible="true" horizonAlign="left"/>
+                <column id="pickTicketDetail.item.name" title="品名（中文）" width="200" visible="true" horizonAlign="left"/>
                 <column id="pickTicketDetail.item.specs" title="item.specs" width="100" visible="true" horizonAlign="center" verticalAlign="middle" />
                               
             </columns>
diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class b/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class
deleted file mode 100644
index 942cdf3..0000000
Binary files a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class and /dev/null differ
diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/checkRelea.hbm.xml b/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/checkRelea.hbm.xml
deleted file mode 100644
index f45fd95..0000000
--- a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/checkRelea.hbm.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC 
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-    <class name="com.dev.swms.server.model.order.CheckRelea" table="CHECK_RELEA">
-        <id name="id" column="ID" type="long">
-            <generator class="native">
-                <param name="sequence">wms_seq_check_relea</param>
-                <param name="parameters">START WITH 1000</param>
-            </generator>
-        </id>
-        <many-to-one name="order" class="com.dev.swms.server.model.order.CustomsOrder">
-			<column name="order_ID" />
-		</many-to-one>
-		<many-to-one name="invoiceBox" class="com.dev.swms.server.model.order.InvoiceBox">
-			<column name="InvoiceBox_ID" />
-		</many-to-one>
-		 <property name="checkCode" column="check_Code" type="string" length="100"/>
-        <property name="vehicleWeight" column="VEHICLE_WEIGHT" type="double" />
-        <property name="frameWeight" column="FRAME_WEIGHT" type="double" />
-        <property name="containWeight" column="CONTAIN_WEIGHT" type="double" />
-        <property name="totalWeight" column="TOTAL_WEIGHT" type="double" />
-        <property name="totalGrossWeight" column="TOTAL_GROSS_WEIGHT" type="double" />
-        <property name="totalNetWeight" column="TOTAL_NET_WEIGHT" type="double" />
-        
-        <property name="type" column="TYPE" type="string" length="500"/>
-        <property name="exitSign" column="EXITSIGN" type="string" length="500"/>
-        <property name="bindType" column="BIND_TYPE" type="string" length="500"/>
-        <property name="documentType" column="DOCUMENT_TYPE" type="string" length="500"/>
-        <property name="documentNo" column="DOCUMENT_NO" type="string" length="500"/>
-        <property name="license" column="LICENSE" type="string" length="500"/>
-        <property name="containNo" column="CONTAIN_NO" type="string" length="500"/>
-        <property name="frameNo" column="FRAME_NO" type="string" length="500"/>
-        <property name="containBox" column="CONTAIN_BOX" type="string" length="500"/>
-        <property name="description" column="DESCRIPTION" type="string" length="500"/>
-		<property name="titleNo" column="title_No" type="string" length="150"/>
-		<property name="telephone" column="telephone" type="string" length="50"/>
-		<component name="updateInfo" class="com.dev.swms.server.model.base.UpdateInfo">
-			<property name="operatorId" column="OPERATOR_ID" type="long" />
-			<property name="operatorName" column="OPERATOR_NAME" type="string" length="20"/>
-			<property name="updateTime" column="UPDATE_TIME" type="timestamp" />
-		</component>		
-		<many-to-one name="worker1" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER1_ID"/>
-		</many-to-one>
-		<many-to-one name="worker2" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER2_ID"/>
-		</many-to-one>
-		<many-to-one name="worker3" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER3_ID"/>
-		</many-to-one>
-		<many-to-one name="worker4" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER4_ID"/>
-		</many-to-one>
-		<many-to-one name="dock" class="com.dev.swms.server.model.base.Location">
-			<column name="DOCK_ID"/>
-		</many-to-one>
-		<many-to-one name="licensePlate" class="com.dev.swms.server.model.order.LicensePlate">
-			<column name="license_Plate_ID" />
-		</many-to-one>
-		<many-to-one name="asn" class="com.dev.swms.server.model.receiving.ASN">
-			<column name="asn_ID" />
-		</many-to-one>
-		<many-to-one name="pickTicket" class="com.dev.swms.server.model.shipping.PickTicket">
-			<column name="pick_Ticket_ID" />
-		</many-to-one>
-		  <property name="driverName" column="driver_Name" type="string" length="150"/>
-        <property name="lineName" column="line_Name" type="string" length="500"/>
-		<many-to-one name="masterBOL" class="com.dev.swms.server.model.shipping.MasterBOL">
-			<column name="MASTER_BOL_ID"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class b/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class
deleted file mode 100644
index a5bbd95..0000000
Binary files a/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class and /dev/null differ
diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml
deleted file mode 100644
index c4225c5..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <editPage id="editCheckReleaDetailFBPage" title="editReceivePage" entityClass="com.dev.swms.server.model.order.CheckRelea" onClose="refreshParent" width="550" height="330">
-        <inputUIs>
-            <hidden id="checkRelea.id" reserve="false"/>
-<!--              <remote id="c.licensePlate.id" title="承运车车牌号" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,车牌号,类型,车自重,车架号"> -->
-<!--                     <hql><![CDATA[ select  -->
-<!--   l.id, -->
-<!--  l.license,  -->
-<!--  l.trailType, -->
-<!--  l.weight, -->
-<!--  l.volume, -->
-<!--  l.engineNo -->
-<!--   from Transportation l -->
-<!--   where 1=1  -->
-<!--   and upper(l.license) like upper(:param)  -->
-<!--                ]]></hql>  -->
-<!-- 					<eventListeners> -->
-<!--                         <eventListener id="checkRelea.license" index="2" refreshUI="false"/> -->
-<!--                         <eventListener id="checkRelea.vehicleWeight" index="4" refreshUI="false"/> -->
-<!--                         <eventListener id="checkRelea.frameNo" index="6" refreshUI="false"/> -->
-<!--                         <eventListener id="checkRelea.frameWeight" index="5" refreshUI="false"/> -->
-<!--                     </eventListeners> -->
-<!--  			 </remote> -->
-       		<text id="checkRelea.license" title="l.license" row="1" col="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-       		<text id="checkRelea.driverName" title="司机姓名" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-       		<text id="checkRelea.telephone" title="电话" row="1" col="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-             <list id="checkRelea.dock.id" title="作业平台" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.code,
-  c.name 
-  FROM Location c    
-   WHERE c.disabled=0  and (c.type ='RECEIVE'  or c.type ='SHIP' ) and c.warehouse = #{SESSION_WAREHOUSE}
-  ]]></hql> 
-        	 </list>
-        	 <list id="checkRelea.worker1.id" title="理货员" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='FORKLIFT'
-  ]]></hql> 
-        	</list>
-        	<list id="checkRelea.worker2.id" title="理动力人员" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='GENARAL'
-  ]]></hql> 
-        	</list>
-        	<list id="checkRelea.worker3.id" title="仓库派单员" row="5" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='DISPATCHER'
-  ]]></hql> 
-        	</list>
-        </inputUIs>
-        <buttons>
-            <commit id="save" title="save" enableType="none" invisible="false">
-                <mappings>
-                	<mapping id="asn.id" className="long"/>
-                    <mapping id="crd" className="com.dev.swms.server.model.order.CheckRelea"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea" parameter="asn.id,crd"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                    <forward name="resetWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-        </buttons>
-    </editPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml
deleted file mode 100644
index 4db7f43..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <editPage id="editReceivePage" title="editReceivePage" entityClass="com.dev.swms.server.model.order.CheckRelea" onClose="refreshParent" width="300" height="330">
-        <inputUIs>
-            <hidden id="checkRelea.id" reserve="false"/>
-            
-             <list id="checkRelea.dock.id" title="作业平台" row="1" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.code,
-  c.name 
-  FROM Location c    
-   WHERE c.disabled=0  and (c.type ='RECEIVE'  or c.type ='SHIP' )
-    and c.warehouse = #{SESSION_WAREHOUSE} order by c.code
-  ]]></hql> 
-        	 </list>
-        	 <list id="checkRelea.worker1.id" title="理货员" row="2" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='FORKLIFT'
-  ]]></hql> 
-        	</list>
-        	<list id="checkRelea.worker2.id" title="理动力人员" row="3" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='GENARAL'
-  ]]></hql> 
-        	</list>
-        	<list id="checkRelea.worker3.id" title="仓库派单员" row="4" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
-                    <hql><![CDATA[ SELECT 
-  c.id, 
-  c.name 
-  FROM Worker c  
-  WHERE c.disabled=0 and c.type='DISPATCHER'
-  ]]></hql> 
-        	</list>
-        </inputUIs>
-        <buttons>
-            <commit id="save" title="save" enableType="none" invisible="false">
-                <mappings>
-                	<mapping id="parentIds" className="list"/>
-                	<mapping id="asn.id" className="long"/>
-                    <mapping id="crd" className="com.dev.swms.server.model.order.CheckRelea"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="saveRegisterCheckRelea" parameter="parentIds,asn.id,crd"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                    <forward name="resetWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-        </buttons>
-    </editPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml
deleted file mode 100644
index 880f314..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <modifyDetailPage id="modifyArrivalReceivePage" title="modifyArrivalReceivePage" entityClass="com.dev.swms.server.model.receiving.ASN" onClose="refreshParent" width='900' height='600'>
-       <modify>
-        <inputUIs>       	
-             <hidden id="asn.id" reserve="true"/>
-             <hidden id="asn.invoiceBox.id" reserve="true"/>
-              <hidden id="asn.invoiceBox.customsOrder.id" reserve="true"/>
-              <hidden id="asn.status" reserve="true"/>
-        </inputUIs>
-         <buttons>
-<!--                 <commit id="register" title="register" enableType="none" invisible="false"> -->
-<!--                     <mappings> -->
-<!--                         <mapping id="customsOrder.id" className="long"/> -->
-                        
-<!--                     </mappings> -->
-<!--                     <actions> -->
-<!--                         <action managerName="customsOrderManager" methodName="checkReleaRegister" parameter="customsOrder.id/> -->
-                        
-<!--                     </actions> -->
-<!--                     <forwards> -->
-<!--                         <forward name="refreshParent" newEnabled="true" editEnabled="true"/> -->
-<!--                         <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                     </forwards> -->
-<!--                 </commit> -->
-            </buttons>
-    </modify>
-       <detail autoQuery="false">
-       <datasource type="hql" displayRowCount="50"><![CDATA[ select
- checkRelea.id,
- checkRelea.type,
- checkRelea.exitSign,
- checkRelea.bindType,
- checkRelea.documentType,
- checkRelea.dock.code,
- checkRelea.worker1.name,
- checkRelea.worker2.name,
- checkRelea.worker3.name,
- checkRelea.license,
- checkRelea.titleNo,
- checkRelea.telephone,
- checkRelea.containNo,
- checkRelea.documentNo,
- checkRelea.frameNo,
- checkRelea.vehicleWeight,
- checkRelea.frameWeight,
- checkRelea.containWeight,
- checkRelea.containBox,
- checkRelea.totalWeight,
- checkRelea.totalGrossWeight,
- checkRelea.totalNetWeight,
- checkRelea.description
- from CheckRelea checkRelea
- left join checkRelea.worker1
- left join checkRelea.worker2
- left join checkRelea.worker3
- left join checkRelea.dock
- where 1=1 
- and checkRelea.invoiceBox.id={asn.invoiceBox.id} 
- ORDER BY checkRelea.id desc      
- ]]></datasource>
-        <columns>
-            <column id="crd.id" title="crd.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.type" title="checkRelea.type" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.exitSign" title="checkRelea.exitSign" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.bindType" title="checkRelea.bindType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.documentType" title="checkRelea.documentType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.dock.code" title="checkRelea.dock.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.worker1.name" title="checkRelea.worker1.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.worker2.name" title="checkRelea.worker2.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.worker3.name" title="checkRelea.worker3.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.license" title="checkRelea.license" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.titleNo" title="checkRelea.titleNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.telephone" title="checkRelea.telephone" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.containNo" title="checkRelea.containNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkRelea.documentNo" title="checkRelea.documentNo" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.frameNo" title="checkRelea.frameNo" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.vehicleWeight" title="checkRelea.vehicleWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.frameWeight" title="checkRelea.frameWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.containWeight" title="checkRelea.containWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.containBox" title="checkRelea.containBox" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.totalWeight" title="checkRelea.totalWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.totalGrossWeight" title="checkRelea.totalGrossWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.totalNetWeight" title="checkRelea.totalNetWeight" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="checkRelea.description" title="checkRelea.description" visible="true" horizonAlign="center" verticalAlign="middle" />
-        </columns>
-        <buttons>
-       		 <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editCheckReleaDetailFBPage"/>
-            <popup id="edit" title="登记" enableType="multi" invisible="false" containId="true" pageId="editReceivePage">
-            <enableExpression><![CDATA[(${asn.status}=='OPEN'||${asn.status}=='ACTIVE' )]]></enableExpression>
-            </popup>
-
-<!--             <commit id="delete" title="delete" enableType="multi" invisible="false"> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="customsOrderManager" methodName="deleteCheckReleaDetail" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-		 <popup id="edit" title="库位登记" enableType="multi" invisible="false" containId="true" pageId="modifyLocationRegistrationPage"/>
-        </buttons>
-        </detail>
-    </modifyDetailPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml b/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
deleted file mode 100644
index 63b4ebe..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainASNPage" title="maintainASNPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <remote id="asn.company.id" title="asn.company" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" editModel="normal" manualEditable="true" displayedTableHead="序号,编码,名称">
-                    <hql><![CDATA[select company.id, company.code, company.name from Structure company
- where company.beClient = true 
- and company.disabled=false
- and (upper(company.code) like upper(:param)
- or company.name LIKE :param) 
-  and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
- or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
- )
- /~company.name: and company.name like {company.name} ~/
- /~company.code: and company.code like {company.code} ~/
- 
- ]]></hql>
-                </remote>
-                <list id="asn.status" title="asn.status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="ASNStatus">
-                    <hql><![CDATA[ SELECT 
- enumerate.enumValue,
- enumerate.enumValue FROM Enumerate enumerate 
- WHERE enumerate.enumType = 'ASNStatus']]></hql>
-                </list>
-                <text id="asn.code" title="asn.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <text id="asn.relatedBill1" title="asn.relatedBill1" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <dateRanger id="order.date" title="asn.orderDate" row="3" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="order.beginDate" toDate="order.endDate"/>
-                <date id="asn.orderDate" title="asn.orderDate" row="6" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="true" showTime="false" manualEditable="false" defaultCurrentDate="true"/>
-                
-                <dateRanger id="receive.date" title="asn.receivedDate" row="4" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="receive.beginDate" toDate="receive.endDate"/>
-                <text id="asn.userName" title="asn.userName" row="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-<!--                  <checkbox id="ordersAll" title="ordersAll" row="5" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-            
-        </search>
-        <datasource type="hql"><![CDATA[SELECT asn.id,
-        asn.relatedBill1,
- company.name,
- asn.code,
- o.businessClassify,
- asn.status,
- asn.orderDate,
- round(asn.expectedQuantity ,4),
- asn.weight,
- asn.volume,
- dock.code,
- asn.billType.name,
- asn.worker1.name,
- asn.vehicle,
- asn.receiveDateEnd,
- round(asn.receivedQuantity ,4),
- asn.receivedDate,
- asn.submitCheckDate,
- asn.submitCheckBy,
- asn.submitReturnDes,
- asn.checkDate,
- asn.checkBy,	
- asn.submit,
- asn.submitDate,
- asn.bewrong,
- asn.userName,
- asn.updateTime,
- asn.order.businessType,
- 'ASN',
- 'ASN' 
- FROM ASN asn
- LEFT JOIN asn.company company
- LEFT JOIN asn.dock dock
- LEFT JOIN asn.worker1 worker1 
- left join asn.order o 
- WHERE 1=1  and (asn.relatedBill3 is null or asn.relatedBill3!='DB') 
- and asn.warehouse = #{SESSION_WAREHOUSE} 
- and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
- or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
- )
- /~SESSION_WAREHOUSE: AND asn.warehouse = #{SESSION_WAREHOUSE} ~/
- /~asn.company.id: AND  asn.company.id = {asn.company.id} ~/
- /~asn.status: AND asn.status = {asn.status} ~/
- /~asn.code: AND asn.code like {asn.code} ~/
- /~asn.relatedBill1: AND asn.relatedBill1 like {asn.relatedBill1} ~/
- /~order.beginDate: AND asn.orderDate >= {order.beginDate} ~/
- /~order.endDate: AND asn.orderDate <= {order.endDate} ~/
- /~receive.beginDate: AND asn.receivedDate >= {receive.beginDate} ~/
- /~receive.endDate: AND asn.receivedDate <= {receive.endDate} ~/
- /~asn.userName: AND asn.userName LIKE {asn.userName} ~/  order by asn.id desc]]></datasource>
-        <columns>
-            <column id="asn.id" title="asn.id" visible="false"/>
-            <column id="asn.relatedBill1" width="100" title="asn.relatedBill1" visible="true" horizonAlign="left"/>
-            <column id="asn.company.name" width="120" title="asn.company" visible="true" horizonAlign="left"/>
-            <column id="asn.code" title="asn.code" visible="true" horizonAlign="left" sortIndex="1" />
-            <column id="customsOrder.businessClassify" width="80" title="customsOrder.businessClassify" visible="true" horizonAlign="left"/>
-            <column id="asn.status" width="60" title="asn.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="ASNStatus"/>
-            <column id="asn.orderDate" width="80" title="asn.orderDate" visible="true" horizonAlign="left" dataType="date"/>
-            <column id="asn.expectedQuantity" width="60" title="asn.expectedQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="asn.weight" width="60" title="asn.weight" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="asn.volume" width="60" title="毛重" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="asn.dock" width="80" title="checkRelea.dock.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="asn.billType.name" width="80" title="单据类型" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="asn.worker1" width="80" title="asn.worker1" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="asn.vehicle" width="80" title="asn.vehicle" visible="true" horizonAlign="left"/>
-            <column id="asn.receiveDateEnd" title="asn.receiveDateEnd" visible="true" horizonAlign="left" dataType="date"/>
-            <column id="asn.receivedQuantity" title="asn.receivedQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="asn.receivedDate" title="asn.receivedDate" visible="true" horizonAlign="left" dataType="date"/>
-            <column id="asn.submitCheckDate" width="80" title="asn.submitCheckDate" visible="true" horizonAlign="left"/>
-            <column id="asn.submitCheckBy" width="80" title="asn.submitCheckBy" visible="true" horizonAlign="left"/>
-            <column id="asn.submitReturnDes" width="80" title="asn.submitReturnDes" visible="true" horizonAlign="left"/>
-            <column id="asn.checkDate" width="80" title="asn.checkDate" visible="true" horizonAlign="left"/>
-            <column id="asn.checkBy" width="80" title="asn.checkBy" visible="true" horizonAlign="left"/>
-            <column id="asn.submit" width="80" title="提交移库申请" visible="true" horizonAlign="left"/>
-            <column id="asn.submitDate" width="80" title="申请时间" visible="true" horizonAlign="left"/>
-             <column id="asn.bewrong" width="80" title="是否移库" visible="true" horizonAlign="left" format="booleanFormat" formatParam="disabled"/>
-            <column id="asn.userName" title="v.creatPeople" visible="true" horizonAlign="center"  />
-            <column id="asn.updateTime" title="v.creatDate" visible="true" horizonAlign="center" dataType="date"/>
-          	 <column id="asn.order.businessType" title="类型" visible="true" horizonAlign="center"  />
-            <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="importASN" title="importASN" enableType="none" invisible="false" containId="false" pageId="importASNPage"/>
-<!--             <popup id="importASNGrounding" title="importASNGrounding" enableType="none" invisible="false" containId="false" pageId="importASNGroundingPage"/> -->
-            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editASNPage"/>
-            <popup id="modify" title="edit" enableType="single" invisible="false" containId="true" pageId="editASNPage"/>
-            <commit id="delete" title="delete_return" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
-                <enableExpression><![CDATA[(${asn.status}=='OPEN')||(${asn.status}=='ACTIVE')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="deleteAll" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--              <commit id="刷新" title="刷新车牌" enableType="multi" invisible="false" > -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="asnManager" methodName="refreshASN" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="false" editEnabled="false"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-            <popup id="printAsnRktz" title="printAsnRktz" enableType="single" invisible="false" containId="true" pageId="printAsnRktzPage">
-<!--                 <enableExpression><![CDATA[${asn.status} != 'OPEN' ]]></enableExpression> -->
-            </popup>
-              <popup id="Arrival" title="maintainASNPage.Arrival" enableType="multi" invisible="false" containId="true" pageId="modifyArrivalReceivePage">
-                <enableExpression><![CDATA[(${asn.status}=='OPEN'|| ${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING'|| ${asn.status}=='PUTAWAY' ) ]]></enableExpression>
-            </popup>
-             <popup id="receiveConfirm" title="上传图片" enableType="single" invisible="false" containId="true" pageId="modifyPhotoUploadPage">
-<!--                 <enableExpression><![CDATA[ (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
-            </popup>
-<!--              <popup id="Arrival" title="出口到货登记" enableType="multi" invisible="false" containId="true" pageId="modifyArrivalReceiveCKPage"> -->
-<!--                 <enableExpression><![CDATA[(${asn.status}=='OPEN'||${asn.status}=='ACTIVE' ||${asn.status}=='RECEIVING')  && ${asn.order.businessType}=='出口']]></enableExpression> -->
-<!--             </popup> -->
-<!--              <popup id="Arrival" title="非保到货登记" enableType="multi" invisible="false" containId="true" pageId="modifyCheckReleaFBPage"> -->
-<!--                 <enableExpression><![CDATA[(${asn.status}=='OPEN'||${asn.status}=='ACTIVE') && ${asn.order.businessType}=='非保税仓储']]></enableExpression> -->
-<!--             </popup> -->
-<!--             <commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="maintainASNPage.maintainReceivingDocPage.confirm.cancel"> -->
-<!--                 <enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="asnManager" methodName="cancelAll" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="false" editEnabled="false"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-<!--              <popup id="Arrival" title="maintainASNPage.Arrival" enableType="multi" invisible="false" containId="true" pageId="editArrivalReceivePage"> -->
-<!--                 <enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression> -->
-<!--             </popup> -->
-            
-           
-<!--             <commit id="active" title="active" enableType="multi" invisible="false"> -->
-<!--                 <enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="asnManager" methodName="activeAll" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="false" editEnabled="false"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-            <commit id="inactive" title="inactive" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[(${asn.status}=='ACTIVE')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="inactiveAll" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--              理货登记-->
-            <popup id="receiveConfirm" title="receiveConfirm" enableType="single" invisible="false" containId="true" pageId="asnReceiveConfirmPage">
-                <enableExpression><![CDATA[ (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY' || ${asn.status}=='RECEIVING')  ]]></enableExpression>
-            </popup>
-<!--              <popup id="unReceiveConfirm" title="unReceiveConfirm" enableType="single" invisible="false" containId="true" pageId="asnUnReceiveConfirmPage"> -->
-<!--                 <enableExpression><![CDATA[ (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
-<!--             </popup> -->
-<!-- 			<popup id="receiveConfirmImport" title="receiveConfirmImport" enableType="single" invisible="false" containId="true" pageId="editImportASNReceiveConfirmPage"> -->
-<!--                 <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.billType.code} != 'PO_STRAIGHT') && (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
-<!--             </popup> -->
-
-            <popup id="receiveBack" title="receiveBack" enableType="single" invisible="false" containId="true" pageId="asnAdjustReceivingDocPage">
-                <enableExpression><![CDATA[(${asn.status}=='PUTAWAY'||${asn.status}=='RECEIVING' || ${asn.status} =='RECEIVED' || ${asn.status} =='CLOSE')]]></enableExpression>
-            </popup>
-<!--             <popup id="quality" title="quality" enableType="single" invisible="false" containId="true" pageId="editASNQualityPage"> -->
-<!--                 <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status}=='RECEIVING' || ${asn.status}=='RECEIVED')]]></enableExpression> -->
-<!--             </popup> -->
-            <commit id="submitCheck" title="submitCheck" enableType="single" invisible="false" confirmMessage="maintainReceivingDocPage.submitCheck.confirm">
-                <enableExpression><![CDATA[(${asn.status} =='RECEIVING' || ${asn.status} =='RECEIVED')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="submitCheckASN" parameter="ids"/>
-                </actions>
-             <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-             <popup id="submitReturnASN" title="submitReturnASN" enableType="multi" invisible="false" containId="true" pageId="editSubmitReturnASNPage">
-                <enableExpression><![CDATA[(${asn.status}=='CHECKED')]]></enableExpression>
-            </popup>
-            <commit id="checkASNInv" title="checkASNInv" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[${asn.status} == 'CHECKED' ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="checkASNInv" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <commit id="turnNoASN" title="非保一键收货" enableType="multi" invisible="false">
-<!--                 <enableExpression><![CDATA[${asn.status} == 'CHECKED' ]]></enableExpression> -->
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="turnNoASN" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!--             <popup id="asnDetailBarCode" title="asnDetailBarCode" enableType="single" invisible="true" containId="true" pageId="asnDetailBarCodePage"> -->
-<!--                 <enableExpression><![CDATA[${asn.status} != 'OPEN' ]]></enableExpression> -->
-<!--             </popup> -->
-            
-            <popup id="editASNFBSHDPage" title="非保入区送货单" enableType="single" invisible="false" containId="true" pageId="editASNFBSHDPage"/>
-            <popup id="printAsnCKRktzPage" title="出口入库通知单" enableType="single" invisible="false" containId="true" pageId="printAsnCKRktzPage">
-<!--                 <enableExpression><![CDATA[${asn.status} != 'OPEN' ]]></enableExpression> -->
-            </popup>
-      		 <popup id="ASNPayFeePage" title="应付录入" enableType="single" invisible="false" containId="true" pageId="modifyASNPayFeePage"/>
-            
-            <popup id="viewReceivedRecord" title="maintainASNPage.viewReceivedRecord" enableType="single" invisible="false" containId="true" pageId="modifityReceivedRecordPage">
-                <enableExpression><![CDATA[${asn.status} != 'OPEN' && ${asn.status} != 'ACTIVE' && ${asn.status} != 'CANCEL']]></enableExpression>
-            </popup>
-            <commit id="submitCheckyk" title="提交移库" enableType="single" invisible="false" confirmMessage="提交移库确认">
-                <enableExpression><![CDATA[(${asn.status} =='CLOSE')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="submitCheckYKASN" parameter="ids"/>
-                </actions>
-             <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="submitCheckyk11" title="移库确认" enableType="single" invisible="false" confirmMessage="移库确认">
-                <enableExpression><![CDATA[(${asn.submit} !='-' && ${asn.submit} !='')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="wrongASN" parameter="ids"/>
-                </actions>
-             <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="createMoveDoc" title="生成移位单" enableType="single" invisible="false">
-                <enableExpression><![CDATA[${asn.status} =='CLOSE' && (${asn.bewrong} =='true' || ${asn.bewrong} =='1' )]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="moveDocManager" methodName="createMoveDoc" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-             <popup id="palletNumber" title="palletNumber" enableType="single" invisible="false" containId="true" pageId="printpalletNumberPage">
-<!--                 <enableExpression><![CDATA[${asn.status} != 'OPEN' ]]></enableExpression> -->
-            </popup>
-            <commit id="yjck" title="生成出库" enableType="single" invisible="false">
-                <enableExpression><![CDATA[${asn.status} =='CLOSE']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="asnManager" methodName="yjck" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--             <commit id="hbAsn" title="hbAsn" enableType="multi" invisible="false"> -->
-<!--                 <enableExpression><![CDATA[${asn.status} !='CLOSE']]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="asnManager" methodName="hbAsn" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="false" editEnabled="false"/> -->
-<!--                 </forwards> -->
-<!--             </commit> -->
-				<popup id="printLHD" title="printLHD" enableType="single" invisible="false" containId="true" pageId="printLHDPage"/>
-<!-- 				<popup id="seeLHD" title="查看照片" enableType="single" invisible="false" containId="true" pageId="seeOrderImagePage"/> -->
-        </buttons>
-    </maintainPage>
-</pages>