diff --git a/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml
index 3e4ba1a..18c767c 100644
--- a/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml
@@ -7,6 +7,8 @@
                 <text id="customsOrder.code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="customsOrder.client.name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 				<text id="customsOrder.extend17" title="检疫检疫编号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="customsOrder.itemName" title="品名" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				
 <!--                 <checkbox id="organization.disabled" title="organization.disabled" row="3" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
             </inputUIs>
         </search>
@@ -52,9 +54,10 @@
  and (customsOrder.client.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})
  )
- /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
-  /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/
+ /~customsOrder.code: and customsOrder.code like ({customsOrder.code})~/
+ /~customsOrder.extend17: and upper(customsOrder.extend17) like ({customsOrder.extend17})~/
  /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/
+ /~customsOrder.itemName: and customsOrder.itemName like {customsOrder.itemName}~/
  order by customsOrder.id desc
 		]]></datasource>
         <columns>
diff --git a/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml
index 078ff7c..8f1905d 100644
--- a/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml
@@ -7,6 +7,9 @@
                 <text id="customsOrder.code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="customsOrder.client.name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 				<text id="customsOrder.extend17" title="检疫检疫编号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="customsOrder.itemName" title="品名" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="customsOrder.electronicLedger" title="电子底帐序号" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				
 <!--                 <checkbox id="organization.disabled" title="organization.disabled" row="3" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
             </inputUIs>
         </search>
@@ -52,9 +55,11 @@
  and (customsOrder.client.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})
  )
- /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
-  /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/
+ /~customsOrder.code: and customsOrder.code like {customsOrder.code}~/
+ /~customsOrder.extend17: and customsOrder.extend17 like {customsOrder.extend17}~/
  /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/
+ /~customsOrder.itemName: and customsOrder.itemName like {customsOrder.itemName}~/
+ /~customsOrder.electronicLedger: and customsOrder.electronicLedger like {customsOrder.electronicLedger}~/
  order by customsOrder.id desc
 		]]></datasource>
         <columns>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml b/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml
deleted file mode 100644
index 3e4ba1a..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/order/maintainBJCustomsOrderPage.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainBJCustomsOrderPage" title="maintainBJCustomsOrderPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="customsOrder.code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="customsOrder.client.name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-				<text id="customsOrder.extend17" title="检疫检疫编号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-<!--                 <checkbox id="organization.disabled" title="organization.disabled" row="3" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT 
- customsOrder.id,
- customsOrder.code,
- customsOrder.client.name,
- customsOrder.status,
- customsOrder.businessType,
- customsOrder.businessClassify,
- customsOrder.modeTransport,
- customsOrder.beCertificate,
- customsOrder.beSubmit,
- customsOrder.extend14,
- customsOrder.sale,
- customsOrder.customerService,
- customsOrder.extend13,
- customsOrder.businessUnit.name,
- customsOrder.itemName,
- customsOrder.quantity,
- customsOrder.contractNo,
- customsOrder.planBerthingDate,
- customsOrder.changeOrder,
- customsOrder.berthingDate,
- customsOrder.extend15,
- customsOrder.extend16,
- customsOrder.extend17,
- customsOrder.electronicLedger,
- customsOrder.certificate,
- customsOrder.description,
- 'CustomsOrder',
- 'CustomsOrder'
- FROM OrderBase ob 
- left join ob.order customsOrder
- left join customsOrder.client
- left join customsOrder.portDeparture
- left join customsOrder.portDestination
- left join customsOrder.businessUnit
- WHERE 1=1 
- and customsOrder.status not in('作废') 
- and customsOrder.businessClassify='出口报检'
- and customsOrder.warehouse = #{SESSION_WAREHOUSE}
- and (customsOrder.client.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})
- )
- /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
-  /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/
- /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/
- order by customsOrder.id desc
-		]]></datasource>
-        <columns>
-            <column id="customsOrder.id" title="customsOrder.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.code" title="customsOrder.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.client.name" title="customsOrder.client.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.status" title="customsOrder.status" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessType" title="customsOrder.businessType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessClassify" title="customsOrder.businessClassify" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.modeTransport" title="customsOrder.modeTransport" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.beCertificate" title="customsOrder.beCertificate" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="customsOrder.beSubmit" title="是否提交" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="customsOrder.extend14" title="输往国家" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.sale" title="customsOrder.sale" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.customerService" title="制单人" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend13" title="境外收货人" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessUnit.name" title="经营单位" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.itemName" title="customsOrder.itemName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.quantity" title="customsOrder.quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.contractNo" title="合同号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.planBerthingDate" title="申报日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.changeOrder" title="出证日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.berthingDate" title="寄证日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend15" title="快递单号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend16" title="申请号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend17" title="检疫检疫编号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.electronicLedger" title="customsOrder.electronicLedger" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.certificate" title="customsOrder.certificate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.description" title="customsOrder.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-        </columns>
-        <buttons>
-            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editBJCustomsOrderPage"/>
-            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editBJCustomsOrderPage"/>
-            <popup id="inventory" title="inventory" enableType="single" invisible="false" containId="true" pageId="modifyInventoryListPage"/>
-
-			<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="确认">
-                <enableExpression><![CDATA[(${customsOrder.status}=='打开')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="deleteCustomsOrder" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <popup id="customsOrderPayFee" title="customsOrderPayFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsPayFeePage"/>
-<!--             <popup id="customsOrderFee" title="customsOrderFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsOrderFeePage"/> -->
-			<popup id="enclosureUpload" title="enclosureUpload" enableType="single" invisible="false" containId="true" pageId="editCustomsOrderUploadPage"/>
-	        <commit id="copyDocument" title="copyDocument" enableType="single" invisible="false" confirmMessage="确认是否复制单据?">
-<!--                 <enableExpression><![CDATA[(${organization.disabled}=='false')]]></enableExpression> -->
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="copyDocument" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <popup id="pay" title="提交结算" enableType="single" invisible="false" containId="true" pageId="editPaySubmitPage"/>
-            <popup id="lookPayDetail" title="应付明细查看" enableType="single" invisible="false" containId="true" pageId="modifyLookCustomsPayFeePage"/>
-            <popup id="pay" title="操作记录" enableType="single" invisible="false" containId="true" pageId="printOrderLogPage"/>
-	     </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml b/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml
deleted file mode 100644
index 078ff7c..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/order/maintainWXPBZCustomsOrderPage.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainWXPBZCustomsOrderPage" title="maintainWXPBZCustomsOrderPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="customsOrder.code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="customsOrder.client.name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-				<text id="customsOrder.extend17" title="检疫检疫编号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-<!--                 <checkbox id="organization.disabled" title="organization.disabled" row="3" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT 
- customsOrder.id,
- customsOrder.code,
- customsOrder.client.name,
- customsOrder.status,
- customsOrder.businessType,
- customsOrder.businessClassify,
- customsOrder.modeTransport,
- customsOrder.beCertificate,
- customsOrder.beSubmit,
- customsOrder.extend14,
- customsOrder.sale,
- customsOrder.customerService,
- customsOrder.extend13,
- customsOrder.businessUnit.name,
- customsOrder.itemName,
- customsOrder.quantity,
- customsOrder.contractNo,
- customsOrder.planBerthingDate,
- customsOrder.changeOrder,
- customsOrder.berthingDate,
- customsOrder.extend15,
- customsOrder.extend16,
- customsOrder.extend17,
- customsOrder.electronicLedger,
- customsOrder.certificate,
- customsOrder.description,
- 'CustomsOrder',
- 'CustomsOrder'
- FROM OrderBase ob 
- left join ob.order customsOrder
- left join customsOrder.client
- left join customsOrder.portDeparture
- left join customsOrder.portDestination
- left join customsOrder.businessUnit
- WHERE 1=1 
- and customsOrder.status not in('作废') 
- and customsOrder.businessClassify='危险品包装'
- and customsOrder.warehouse = #{SESSION_WAREHOUSE}
- and (customsOrder.client.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})
- )
- /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
-  /~customsOrder.extend17: and upper(customsOrder.extend17) like upper({customsOrder.extend17})~/
- /~customsOrder.client.name: and customsOrder.client.name like {customsOrder.client.name}~/
- order by customsOrder.id desc
-		]]></datasource>
-        <columns>
-            <column id="customsOrder.id" title="customsOrder.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.code" title="customsOrder.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.client.name" title="customsOrder.client.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.status" title="customsOrder.status" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessType" title="customsOrder.businessType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessClassify" title="customsOrder.businessClassify" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.modeTransport" title="customsOrder.modeTransport" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.beCertificate" title="customsOrder.beCertificate" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="customsOrder.beSubmit" title="是否提交" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
-            <column id="customsOrder.extend14" title="输往国家" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.sale" title="customsOrder.sale" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.customerService" title="制单人" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend13" title="境外收货人" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.businessUnit.name" title="经营单位" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.itemName" title="customsOrder.itemName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.quantity" title="customsOrder.quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.contractNo" title="合同号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.planBerthingDate" title="申报日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.changeOrder" title="出证日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.berthingDate" title="寄证日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend15" title="快递单号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend16" title="申请号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.extend17" title="检疫检疫编号" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.electronicLedger" title="customsOrder.electronicLedger" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.certificate" title="customsOrder.certificate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsOrder.description" title="customsOrder.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-        </columns>
-        <buttons>
-            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editWXPBZCustomsOrderPage"/>
-            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editWXPBZCustomsOrderPage"/>
-            <popup id="inventory" title="inventory" enableType="single" invisible="false" containId="true" pageId="modifyInventoryListPage"/>
-
-			<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="确认">
-                <enableExpression><![CDATA[(${customsOrder.status}=='打开')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="deleteCustomsOrder" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <popup id="customsOrderPayFee" title="customsOrderPayFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsPayFeePage"/>
-<!--             <popup id="customsOrderFee" title="customsOrderFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsOrderFeePage"/> -->
-			<popup id="enclosureUpload" title="enclosureUpload" enableType="single" invisible="false" containId="true" pageId="editCustomsOrderUploadPage"/>
-	        <commit id="copyDocument" title="copyDocument" enableType="single" invisible="false" confirmMessage="确认是否复制单据?">
-<!--                 <enableExpression><![CDATA[(${organization.disabled}=='false')]]></enableExpression> -->
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="copyDocument" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <popup id="pay" title="提交结算" enableType="single" invisible="false" containId="true" pageId="editPaySubmitPage"/>
-            <popup id="lookPayDetail" title="应付明细查看" enableType="single" invisible="false" containId="true" pageId="modifyLookCustomsPayFeePage"/>
-            
-	     </buttons>
-    </maintainPage>
-</pages>