diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml
index 5f668e5..4a1f945 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml
@@ -61,8 +61,6 @@
             <datasource><![CDATA[SELECT 
  asnDetail.id,
  asnDetail.lineNo,
- item.barcode,
- item.strExtend3,
  item.code,
  item.name,
  item.specs, 
@@ -80,12 +78,9 @@
     when mod(asnDetail.expectedQuantity,item.CAcoefficient)>0 then  (floor(asnDetail.expectedQuantity/item.CAcoefficient)) end
  end ,
  asnDetail.dock.code,
- item.CAname,
  CAST(asnDetail.expectedQuantity as integer),
  pu.unit,
- CAST(asnDetail.receivedQuantity as integer),
- asnDetail.lotInfo.propD1,
- asnDetail.lotInfo.propD2
+ CAST(asnDetail.receivedQuantity as integer)
  FROM ASNDetail asnDetail
  left join asnDetail.item item 
  left join asnDetail.item.company as company
@@ -97,20 +92,15 @@
             <columns>
                 <column id="asnDetail.id" title="asnDetail.id" visible="false"/>
                 <column id="asnDetail.lineNo" title="序号"  visible="true" horizonAlign="left"/>
-                <column id="item.barcode" title="货品条码"  visible="true" horizonAlign="left"/>
-                <column id="item.strExtend3" title="外条码"  visible="true" horizonAlign="left"/>
                 <column id="asnDetail.item.code" title="item.code"  visible="true" horizonAlign="left"/>
                 <column id="asnDetail.item.name" title="item.name"  visible="true" horizonAlign="left"/>
                 <column id="asnDetail.item.specs" title="item.specs"  visible="true" horizonAlign="left"/>
                 <column id="a" title="销售单位数" width="100" 	visible="true" horizonAlign="right"/>
                 <column id="asnDetail.dock.code" title="库位" width="100" 	visible="true" horizonAlign="right"/>
-                <column id="item.CAname" title="销售单位" width="80" visible="true" horizonAlign="center"/>
                 <column id="asnDetail.expectedQuantity" title="包装规格数" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
                 <column id="pu.unit" title="包装单位" width="80" visible="true" horizonAlign="center"/>
                 <column id="asnDetail.receivedQuantity" width="85" title="asnDetail.receivedQuantity" visible="true" horizonAlign="right"/>
-                <column id="asnDetail.lotInfo.propD1" width="100" title="生产日期" visible="true" horizonAlign="left"/>
-                <column id="asnDetail.lotInfo.propD2" width="100" title="到期日期" visible="true" horizonAlign="left"/>
-            </columns>
+               </columns>
             <buttons>
                 <popup id="newDetail" title="newDetail" enableType="none" invisible="false" containId="false" pageId="editASNDetailPage">
                     <enableExpression><![CDATA[${asn.status} == 'OPEN']]></enableExpression>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
index f28674b..2289da0 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
@@ -63,8 +63,6 @@
             <datasource><![CDATA[SELECT
  pickTicketDetail.id,
  pickTicketDetail.lineNumber,
- pickTicketDetail.item.barcode,
- pickTicketDetail.item.strExtend3,
  pickTicketDetail.item.code,
  pickTicketDetail.item.name,
  pickTicketDetail.item.specs, 
@@ -73,12 +71,9 @@ case
     when item.CAcoefficient=0 then  (mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit)
     when pickTicketDetail.orderQuantity<item.CAcoefficient then 0
     when mod(pickTicketDetail.orderQuantity,item.CAcoefficient)=0 then (floor(pickTicketDetail.orderQuantity/item.CAcoefficient))
-    when mod(pickTicketDetail.orderQuantity,item.CAcoefficient)>0 then  (floor(pickTicketDetail.orderQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit) end, item.CAname,
+    when mod(pickTicketDetail.orderQuantity,item.CAcoefficient)>0 then  (floor(pickTicketDetail.orderQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit) end, 
  CAST(pickTicketDetail.orderQuantity as integer),
- pu.unit,
  item.location.code,
- pickTicketDetail.newLotInfo.propD1,
- pickTicketDetail.newLotInfo.propD2,
  CAST(pickTicketDetail.preAllocatedQuantity as integer),
  CAST(pickTicketDetail.allocatedQuantity as integer),
  CAST(pickTicketDetail.pickedQuantity as integer),
@@ -96,18 +91,12 @@ case
             <columns>
                 <column id="pickTicketDetail.id" title="ID" visible="false"/>
                 <column id="pickTicketDetail.lineNumber" width="50" title="序号" visible="true" horizonAlign="center"/>
-                <column id="pickTicketDetail.item.barcode" width="100" title="货品条码" visible="true" horizonAlign="center"/>
-                <column id="pickTicketDetail.item.strExtend3" width="100" title="外条码" visible="true" horizonAlign="center"/>
                 <column id="pickTicketDetail.item.code" title="item.code" visible="true" horizonAlign="center"/>
                 <column id="pickTicketDetail.item.name" title="item.name" visible="true" horizonAlign="center"/>
                 <column id="pickTicketDetail.item.specs" width="100" title="item.specs" visible="true" horizonAlign="center"/>
 				<column id="xsdws" title="销售单位数" width="80" visible="true" horizonAlign="center"/>
-				<column id="item.CAname" title="销售单位" width="80" visible="true" horizonAlign="center"/>
 				<column id="pickTicketDetail.orderQuantity" width="90" title="包装规格数" visible="true" horizonAlign="center"/>
-				<column id="pu.unit" title="包装单位" width="80" visible="true" horizonAlign="center"/>
 				<column id="item.location.code" title="库位" width="80" visible="true" horizonAlign="center"/>
-                <column id="pickTicketDetail.newLotInfo.propD1" title="生产日期" visible="true" horizonAlign="center" />
-                <column id="pickTicketDetail.newLotInfo.propD2" title="到期日期" visible="true" horizonAlign="center" />
                 <column id="pickTicketDetail.preAllocatedQuantity" width="90" title="pickTicketDetail.preAllocatedQuantity" visible="true" horizonAlign="center"/>
                 <column id="pickTicketDetail.allocatedQuantity" width="90" title="pickTicketDetail.allocatedQuantity" visible="true" horizonAlign="center"/>
                 <column id="pickTicketDetail.pickedQuantity" width="90" title="pickTicketDetail.pickedQuantity" visible="true" horizonAlign="center" verticalAlign="middle"/>