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 9ed40b7..fe0d595 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
@@ -2279,21 +2279,21 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
 	    		//FeeType ft=commonDao.load(FeeType.class, 2010L);
 	    		//FeeType ft=commonDao.load(FeeType.class, 4221L);
 	    		Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble1(),invoiceBox.getExtendDouble2());
-	    		f.setDescription(invoiceBox.getExtend5()+" 散货");
+	    		f.setDescription(invoiceBox.getExtend5()+" 散货 "+invoiceBox.getFromAddress());
 	    			saveFee(f,invoiceBox.getId(),"INVOICEBOX");
 	    	}
 	    	if(invoiceBox.getExtendDouble11()>0&&invoiceBox.getExtendDouble12()>0) {
 	    		//FeeType ft=commonDao.load(FeeType.class, 2010L);
 	    		//FeeType ft=commonDao.load(FeeType.class, 4221L);
 	    		Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble11(),invoiceBox.getExtendDouble12());
-	    				f.setDescription(invoiceBox.getExtend5()+" 大柜");
+	    				f.setDescription(invoiceBox.getExtend5()+" 大柜 "+invoiceBox.getFromAddress());
 	    				saveFee(f,invoiceBox.getId(),"INVOICEBOX");
 	    	}
 	    	if(invoiceBox.getExtendDouble13()>0&&invoiceBox.getExtendDouble14()>0) {
 	    		//FeeType ft=commonDao.load(FeeType.class, 2010L);
 	    		//FeeType ft=commonDao.load(FeeType.class, 4221L);
 	    		Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble13(),invoiceBox.getExtendDouble14());
-	    		f.setDescription(invoiceBox.getExtend5()+" 小柜");
+	    		f.setDescription(invoiceBox.getExtend5()+" 小柜 "+invoiceBox.getFromAddress());
 	    		saveFee(f,invoiceBox.getId(),"INVOICEBOX");
 	    	}
 	    	}
diff --git a/src/webapp/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml b/src/webapp/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
index 306eea9..1dd9de7 100644
--- a/src/webapp/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-    <reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="s_id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
+    <reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
         <inputUIs>
+        <list id="id" title="库区"  row="1" col="1" span="1"  width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
+                    <hql><![CDATA[ select
+ zone.id,              
+ zone.code
+ from WarehouseArea zone 
+ where 1=1
+ and zone.disabled=0
+ and zone.code in ('AA','AH','BA','RC','RD','RE','D','RA','RB')
+ order by zone.code
+ ]]></hql>
+        </list>
 			
         </inputUIs>
     </reportPage>
diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.class b/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.class
deleted file mode 100644
index b277a7d..0000000
Binary files a/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.class and /dev/null differ
diff --git a/target/jjwms/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml b/target/jjwms/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
deleted file mode 100644
index 306eea9..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="s_id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
-        <inputUIs>
-			
-        </inputUIs>
-    </reportPage>
-</pages>