diff --git a/src/webapp/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml b/src/webapp/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml
index db1e87a..9db98b6 100644
--- a/src/webapp/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml
@@ -7,8 +7,11 @@
                 <text id="customsRecord.hsCode" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="item.code" title="item.code" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 				<text id="itemtype" title="itemtype" defaultValue="非保二线" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true"/>
-				<text id="itemNumber" title="itemNumber"  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"/> -->
+				<text id="itemNumber" title="商品备案序号"  row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="item.name" title="品名" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="odd.lotInfo.propC1" title="批号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="odd.lotInfo.propC4" title="原产国" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[SELECT 
@@ -34,6 +37,9 @@
  /~customsRecord.hsCode: and customsRecord.hsCode like {customsRecord.hsCode}~/
  /~item.code: and item.code like {item.code}~/
   /~itemNumber: and customsRecord.itemNumber like {itemNumber}~/
+  /~item.name: and item.name like {item.name}~/
+  /~odd.lotInfo.propC1: and odd.lotInfo.propC1 like {odd.lotInfo.propC1}~/
+  /~odd.lotInfo.propC4: and odd.lotInfo.propC4 like {odd.lotInfo.propC4}~/
  order by od.id asc
 		]]></datasource>
         <columns>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml
index 9628a52..91125bb 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml
@@ -10,6 +10,8 @@
                 <hidden id="pickTicket.customsOrder.id" reserve="false"/>
                 <text id="item.code" title="item.code" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
                 <text id="item.name" title="item.name" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
+                <text id="ik.lotInfo.propC1" title="批号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+				<text id="ik.lotInfo.propC4" title="原产国" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[SELECT pdv.id,
@@ -36,6 +38,8 @@
  /~item.code: AND upper(ik.item.code) LIKE upper({item.code})~/
  /~item.name: AND ik.item.name LIKE {item.name}~/
  /~inventory.SOI: AND pdv.SOI LIKE {inventory.SOI}~/
+   /~ik.lotInfo.propC1: and ik.lotInfo.propC1 like {ik.lotInfo.propC1}~/
+  /~ik.lotInfo.propC4: and ik.lotInfo.propC4 like {ik.lotInfo.propC4}~/
  order by pdv.id asc
  ]]></datasource>
         <columns>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml b/target/jjwms/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml
deleted file mode 100644
index db1e87a..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/count/editInvoiceBoxFBPage.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="editInvoiceBoxFBPage" title="editInvoiceBoxPage" autoQuery="true"  width='800' height='500'>
-        <search>
-            <inputUIs>
-                <text id="customsRecord.hsCode" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-                <text id="item.code" title="item.code" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
-				<text id="itemtype" title="itemtype" defaultValue="非保二线" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true"/>
-				<text id="itemNumber" title="itemNumber"  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>
-        <datasource type="hql"><![CDATA[SELECT 
- od.id,
- od.qty-od.idvQty,
- item.customsRecord.hsCode,
- item.customsRecord.itemNumber,
- item.code,
- odd.lotInfo.propC5,
- item.name,
- odd.lotInfo.propC1,
- odd.lotInfo.propC4,
- item.specs,
- od.qty,
- odd.lotInfo.propC3,
- od.weight
- FROM AddInvoiceDetial od 
- left join od.item item 
- left join od.orderDetail odd
- left join item.bgxx as customsRecord
- left join item.customsRecord 
- WHERE 1=1   and  (od.qty-od.idvQty>0) and od.order.id={invoiceBox.customsOrder.id} and od.type='INVOICE3'
- /~customsRecord.hsCode: and customsRecord.hsCode like {customsRecord.hsCode}~/
- /~item.code: and item.code like {item.code}~/
-  /~itemNumber: and customsRecord.itemNumber like {itemNumber}~/
- order by od.id asc
-		]]></datasource>
-        <columns>
-           <column id="od.id" title="od.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="od.receivedQuantity" title="od.receivedQuantity" visible="true" horizonAlign="center" verticalAlign="middle" inputUI="text" inputUIValidator="integerRequired"/>
-            <column id="customsRecord.hsCode" title="customsRecord.hsCode" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsRecord.itemNumber" title="customsRecord.itemNumber" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="item.code" title="item.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="odd.lotInfo.propC5" title="lotInfo.propC5" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="customsRecord.name" title="productName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="od.lotInfo.propC1" title="od.lotInfo.propC1" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="od.lotInfo.propC4" title="od.lotInfo.propC4" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="item.specs" title="specs" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="od.expectedQuantity" title="quantity" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="od.lotInfo.propC3" title="od.lotInfo.propC3" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="od.weight" title="od.weight" visible="true" horizonAlign="center" verticalAlign="middle" />
-        </columns>
-        <buttons>
-<!--             <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="modifyInvoiceBoxPage"/> -->
-<!--             <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editCustomsOrderPage"/> -->
-            <commit id="add" title="保存" enableType="multi" invisible="false" >
-                <mappings>
-                    <mapping id="invoiceBox.id" className="long"/>
-                    <mapping id="map" className="map"/>
-                     <mapping id="itemtype" className="string"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="addInvoiceDetial" parameter="invoiceBox.id,map,itemtype"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-             <commit id="addAll" title="全部添加" enableType="none" invisible="false" >
-                <mappings>
-                    <mapping id="invoiceBox.id" className="long"/>
-                    <mapping id="itemtype" className="string"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="addFBInvoiceDetial" parameter="invoiceBox.id,itemtype"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-<!--             <popup id="customsOrderFee" title="customsOrderFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsOrderFeePage"/> -->
-<!-- 	        <popup id="customsOrderPayFee" title="customsOrderPayFee" enableType="single" invisible="false" containId="true" pageId="modifyCustomsPayFeePage"/> -->
-        </buttons>
-    </maintainPage>
-</pages>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml b/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml
deleted file mode 100644
index 9628a52..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainNewInventoryFBPage.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainNewInventoryFBPage" title="maintainNewInventoryFBPage" autoQuery="true" width="850" height="500" onClose="refreshParent" >
-        <search>
-            <inputUIs>
-                <hidden id="pickTicket.id" reserve="false"/>
-                <hidden id="pickTicket.relatedBill3" reserve="false"/>
-                <hidden id="pickTicket.company.id" reserve="false"/>
-                <hidden id="pickTicket.customsOrder.id" reserve="false"/>
-                <text id="item.code" title="item.code" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <text id="item.name" title="item.name" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT pdv.id,
- pdv.inv_qty-pdv.zy_qty,
- item.bgxx.itemNumber,
- item.bgxx.hsCode,
- item.bgxx.code,
- ik.item.code,
- ik.item.name, 
- ik.lotInfo.propC1,
- ik.lotInfo.propC3,
- ik.lotInfo.propC4,
- ik.lotInfo.propD1,
- ik.lotInfo.propD2,
- pdv.inv_qty-pdv.zy_qty,
- pdv.zy_qty,
- pdv.soi 
- FROM AddPickDetailView pdv 
- left join pdv.itemKey ik 
- left join pdv.itemKey.item item
- left join pdv.itemKey.item.bgxx 
- WHERE 1=1  and pdv.soi={pickTicket.relatedBill3}
- and (pdv.inv_qty-pdv.zy_qty) > 0
- /~item.code: AND upper(ik.item.code) LIKE upper({item.code})~/
- /~item.name: AND ik.item.name LIKE {item.name}~/
- /~inventory.SOI: AND pdv.SOI LIKE {inventory.SOI}~/
- order by pdv.id asc
- ]]></datasource>
-        <columns>
-            <column id="pdv.id" title="ID" visible="false"/>
-            <column id="unPickQu" width="80" title="unPickQu" visible="true" horizonAlign="center" verticalAlign="middle" inputUI="text" inputUIValidator="integerRequired"/>
-            <column id="item.bgxx.itemNumber" width="50" title="item.bgxx.itemNumber" visible="true" horizonAlign="left" />
-            <column id="item.bgxx.hsCode" width="60"  title="item.bgxx.hsCode" visible="true" horizonAlign="left"/>
-            <column id="item.bgxx.code" width="80" title="item.bgxx.code" visible="true" horizonAlign="left"/>
-            <column id="item.code" width="70" title="item.code" visible="true" horizonAlign="left" sortIndex="4"/>
-            <column id="item.name" width="70" title="item.name" visible="true" horizonAlign="left"/>
-            <column id="lotInfo.propC1" width="80"  title="lotInfo.propC1" visible="true" horizonAlign="left"/>
-           	<column id="lotInfo.propC3" width="80"  title="lotInfo.propC3" visible="true" horizonAlign="left"/>
-           	<column id="lotInfo.propC4" width="80"  title="lotInfo.propC4" visible="true" horizonAlign="left"/>
-           	<column id="lotInfo.propD1" width="80"  title="lotInfo.propD1" visible="true" horizonAlign="left"/>
-           	<column id="lotInfo.propD2" width="80"  title="lotInfo.propD2" visible="true" horizonAlign="left"/>
-            <column id="inventory.quantity" width="70" title="inventory.quantity" visible="true" horizonAlign="right"/>
-             <column id="pdv.zy_qty" width="70" title="占用" visible="true" horizonAlign="right"/>
-            <column id="inventory.SOI" title="inventory.SOI" visible="true" horizonAlign="left"/>
-        </columns>
-        <buttons>
-            <commit id="addInventoryToDetail2" title="add" enableType="multi" invisible="false">
-                <mappings>
-                  	    <mapping id="map" className="map"/>
-                        <mapping id="pickTicket.id" className="long"/>
-                </mappings>
-                <actions>
-                     <action managerName="pickTicketManager" methodName="addInventoryToDetail" parameter="map,pickTicket.id"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-        </buttons>
-    </maintainPage>
-</pages>