diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml
index bc63bc7..bd133e0 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml
@@ -143,6 +143,7 @@
             <popup id="printDeliveryNoteArrow" title="printDeliveryNoteArrow" enableType="single" invisible="false" containId="true" pageId="printDeliveryNoteArrowPage"/>
             <popup id="printDeliveryNoteAbbott" title="printDeliveryNoteAbbott" enableType="single" invisible="false" containId="true" pageId="printDeliveryNoteAbbottPage"/>
             <popup id="printquecaoreport" title="打印送货单(雀巢版)" enableType="single" invisible="false" containId="true" pageId="printquecaoreportPage"/>
+             <popup id="printjhdreport" title="打印拣货单" enableType="single" invisible="false" containId="true" pageId="printjhdreport"/>
              
 <!--             <popup id="outCheckReleaRegister" title="outCheckReleaRegister" enableType="single" invisible="false" containId="true" pageId="modifyOutCheckReleaRegisterPage"/> -->
 <!--             <popup id="printOutCheckRelea" title="printOutCheckRelea" enableType="single" invisible="false" containId="true" pageId="printOutCheckReleaPage"/> -->
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/printjhdreport.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/printjhdreport.xml
new file mode 100644
index 0000000..7248b5c
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/printjhdreport.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <reportPopupPage id="printjhdreport" title="打印拣货单" reportFile="jj_jhd_report.raq" parameter="id,userId=#{SESSION_USERS}" width="850" height="600"/>
+</pages>
\ No newline at end of file
diff --git a/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml b/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml
deleted file mode 100644
index bc63bc7..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainPickTicketPage" title="maintainPickTicketPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <remote id="company.id" title="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="status" title="status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="PickTicketStatus">
-                    <hql><![CDATA[ SELECT 
- enumerate.enumValue,
- enumerate.enumValue From Enumerate enumerate 
- where enumerate.enumType = 'PickTicketStatus']]></hql>
-                </list>
-                <text id="code" title="pickTicket.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <text id="relatedBill3" title="pickTicket.relatedBill3" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <dateRanger id="pickTicket.orderDate" title="pickTicket.orderDate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.orderDate.begin" toDate="pickTicket.orderDate.end"/>
-                 <date id="pickTicket.orderDate" title="pickTicket.orderDate" row="6" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="true" showTime="false" manualEditable="false" defaultCurrentDate="true"/>
-                
-                <dateRanger id="pickTicket.shipDate" title="pickTicket.shipDate" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.shipDate.begin" toDate="pickTicket.shipDate.end"/>
-                <text id="pickTicket.waveCode" title="pickTicket.waveCode" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                <text id="pickTicket.lineName" title="pickTicket.lineName" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                <text id="mdh" title="store.code" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                <text id="pickTicket.shipToName" title="pickTicket.shipToName" row="7" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                <text id="pickTicket.userName" title="v.creatPeople" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
-                <text id="relatedBill2" title="pickTicket.relatedBill2" row="8" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-<!--                 <checkbox id="ordersAll" title="ordersAll" row="9" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ select 
- pickTicket.id,
- pickTicket.relatedBill3,
- company.shortName,
- pickTicket.code,
- pickTicket.customsOrder.businessType,
- pickTicket.customsOrder.businessClassify,
- pickTicket.invoiceBox.beBonded,
- pickTicket.shipToName,
- pickTicket.status,
- pickTicket.orderDate,
- pickTicket.orderQuantity,
- pickTicket.allocatedQuantity  ,
- pickTicket.pickedQuantity ,
- pickTicket.shippedQuantity  ,
- pickTicket.shipDate,
- pickTicket.userName,
- pickTicket.updateTime,
- pickTicket.priority, 
- pickTicket.relatedBill1 
- from PickTicket pickTicket 
- left join pickTicket.company company
- left join pickTicket.invoiceBox
- left join pickTicket.invoiceBox.customsOrder
- left join pickTicket.dock dock
- left join pickTicket.billType
- left join pickTicket.customsOrder
- where 1=1  
- and pickTicket.status !='PRE_OPEN'  
- and pickTicket.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})
- )
- /~company.id: AND pickTicket.company.id = {company.id} ~/
- /~code: AND pickTicket.code LIKE {code} ~/
-  /~pickTicket.userName: AND pickTicket.userName LIKE {pickTicket.userName} ~/
- /~relatedBill3: AND pickTicket.relatedBill3 like upper({relatedBill3}) ~/
- /~relatedBill2: AND pickTicket.relatedBill2 like {relatedBill2} ~/
- /~status: AND pickTicket.status = {status} ~/
- /~pickTicket.orderDate.begin: AND pickTicket.orderDate >= {pickTicket.orderDate.begin} ~/
- /~pickTicket.orderDate.end: AND pickTicket.orderDate <= {pickTicket.orderDate.end} ~/
- /~pickTicket.shipDate.begin: AND pickTicket.shipDate >= {pickTicket.shipDate.begin} ~/
- /~pickTicket.shipDate.end: AND pickTicket.shipDate <= {pickTicket.shipDate.end} ~/
-  /~shipDateStart1: AND pickTicket.shipDateStart >= {shipDateStart1} ~/
- /~shipDateStart2: AND pickTicket.shipDateStart <= {shipDateStart2} ~/
- /~userName: AND pickTicket.userName LIKE {userName} ~/
- /~pickTicket.waveCode: and pickTicket.waveCode like {pickTicket.waveCode} ~/
- /~pickTicket.carrier.id: AND carrier.id = {pickTicket.carrier.id} ~/
- /~pickTicket.dock.id: AND dock.id = {pickTicket.dock.id} ~/ 
- /~pickTicket.lineName: AND pickTicket.lineName like {pickTicket.lineName} ~/
- /~pickTicket.shipToName: AND pickTicket.shipToName like {pickTicket.shipToName} ~/
- /~mdh: AND store.code like {mdh} ~/
- order by pickTicket.updateTime desc ]]></datasource>
-        <columns>
-            <column id="pickTicket.id" title="pickTicket" visible="false"/>
-            <column id="pickTicket.relatedBill3"  width="120"  title="pickTicket.relatedBill3" visible="true" horizonAlign="left"/>
-            <column id="pickTicket.company.name" width="60" title="pickTicket.company" visible="true" horizonAlign="left"/>
-            <column id="pickTicket.code"  width="120"  title="pickTicket.code" visible="true" horizonAlign="left" />
-            <column id="pickTicket.invoiceBox.customsOrder.businessType"  width="80"  title="billType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="pickTicket.invoiceBox.customsOrder.businessClassify"  width="80"  title="customsOrder.businessClassify" visible="true" horizonAlign="center" verticalAlign="middle"/>
-             <column id="pickTicket.invoiceBox.beBonded" title="invoiceBox.beBonded"  width="70"  visible="true" horizonAlign="left" format="booleanFormat"/>
-            <column id="pickTicket.shipToName" title="pickTicket.shipToName" visible="true" horizonAlign="left"/>
-            <column id="pickTicket.status"  width="90"  title="pickTicket.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="PickTicketStatus"/>
-            <column id="pickTicket.orderDate"  width="90"  title="pickTicket.orderDate" visible="true" horizonAlign="left" dataType="date"/>
-            <column id="pickTicket.orderQuantity" width="60" title="pickTicket.orderQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="pickTicket.allocatedQuantity" width="60" title="pickTicket.allocatedQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="pickTicket.pickedQuantity" width="60" title="pickTicket.pickedQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="pickTicket.shippedQuantity" width="60" title="pickTicket.shippedQuantity" visible="true" horizonAlign="right" dataType="double" />
-            <column id="pickTicket.shipDate" width="100"  title="pickTicket.shipDate" visible="true" horizonAlign="left"  dataType="date"/>
-            <column id="pickTicket.userName" title="v.creatPeople" visible="true" horizonAlign="left"/>
-            <column id="pickTicket.updateTime" title="v.creatDate" visible="true" horizonAlign="left"/>
-            <column id="pickTicket.priority" title="pickTicket.priority" visible="false" horizonAlign="left"/>
-        	<column id="pickTicket.relatedBill1" width="60" title="pickTicket.relatedBill1" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        </columns>
- 
-        <buttons>
-            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editPickTicketPage"/>
-            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editPickTicketPage"/>
-            <commit id="delete" title="delete_return" enableType="multi" invisible="false" confirmMessage="title1168842884125">
-                <enableExpression><![CDATA[(${pickTicket.status} =='OPEN'||${pickTicket.status} =='ACTIVE' ||${pickTicket.status} =='RECEIVING')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="pickTicketManager" methodName="returnBack" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="printWarehouseListOut" title="printWarehouseListOut" enableType="single" invisible="false" containId="true" pageId="printWarehouseListOutPage"/>
-            <popup id="maintaininformation" title="maintaininformation" enableType="single" invisible="false" containId="true" pageId="editmaintaininformationPage"/>
-            <popup id="arrivalPickTicket" title="arrivalPickTicket" enableType="single" invisible="false" containId="true" pageId="modifyArrivalPickTicketPage">
-<!--              <enableExpression><![CDATA[(${pickTicket.invoiceBox.beBonded} =='true' &&${pickTicket.status} !='SHIP_ALL' ) ]]></enableExpression> -->
-            </popup>
-            <popup id="pickTicketPhoto" title="pickTicketPhoto" enableType="single" invisible="false" containId="true" pageId="modifyPickTicketPhotoPage"/>
-<!--             <popup id="ckdh" title="出库单号登记" enableType="single" invisible="false" containId="true" pageId="editPickTicketCKDHPage"/> -->
-<!--             <popup id="ckdh" title="非保出库单号登记" enableType="single" invisible="false" containId="true" pageId="editPickTicketDBDJPage"/> -->
-<!--             <popup id="printWarehouseListOut" title="非保出口通知单" enableType="single" invisible="false" containId="true" pageId="printFBOutPage"/> -->
-            
-            <popup id="printDeliveryNotePublic" title="printDeliveryNotePublic" enableType="single" invisible="false" containId="true" pageId="printDeliveryNotePublicPage"/>
-            <popup id="printDeliveryNoteArrow" title="printDeliveryNoteArrow" enableType="single" invisible="false" containId="true" pageId="printDeliveryNoteArrowPage"/>
-            <popup id="printDeliveryNoteAbbott" title="printDeliveryNoteAbbott" enableType="single" invisible="false" containId="true" pageId="printDeliveryNoteAbbottPage"/>
-            <popup id="printquecaoreport" title="打印送货单(雀巢版)" enableType="single" invisible="false" containId="true" pageId="printquecaoreportPage"/>
-             
-<!--             <popup id="outCheckReleaRegister" title="outCheckReleaRegister" enableType="single" invisible="false" containId="true" pageId="modifyOutCheckReleaRegisterPage"/> -->
-<!--             <popup id="printOutCheckRelea" title="printOutCheckRelea" enableType="single" invisible="false" containId="true" pageId="printOutCheckReleaPage"/> -->
-			<popup id="enclosureUpload" title="enclosureUpload" enableType="single" invisible="false" containId="true" pageId="editPickTicketUploadPage"/>
-<!-- 	        <popup id="registerDeliveryNoteNo" title="registerDeliveryNoteNo" enableType="single" invisible="false" containId="true" pageId="editregisterDeliveryNoteNoPage"/> -->
-
-			<popup id="turnNoInsurance" title="turnNoInsurance" enableType="single" invisible="false" containId="true" pageId="editTurnNoInsurancePage">
-				<enableExpression><![CDATA[(${pickTicket.invoiceBox.beBonded} =='true' &&${pickTicket.status} !='SHIP_ALL' ) ]]></enableExpression>
-			</popup>
-	      <!--   <commit id="turnNoInsurance" title="turnNoInsurance" enableType="multi" invisible="false" confirmMessage="是否确认转非保仓?">
-                 <enableExpression><![CDATA[(${pickTicket.invoiceBox.beBonded} =='true' &&${pickTicket.status} !='SHIP_ALL' ) ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="turnNoInsurance" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit> -->
-            <commit id="快放出库" title="快放出库" enableType="multi" invisible="false" confirmMessage="maintainMasterBolPage.shipConfirm">
-                <enableExpression><![CDATA[( ${pickTicket.status} !='SHIP_ALL' && ${pickTicket.invoiceBox.beBonded} =='false') ]]></enableExpression>
-             <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="pickTicketManager" methodName="allPickConfirm" parameter="ids"/>
-<!--                     <action managerName="customsOrderManager" methodName="turnNoInsurance" parameter="ids"/> -->
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-
-            <commit id="allocate" title="maintainPickTicketPage.allocate" enableType="multi" invisible="false">
-              <enableExpression><![CDATA[( ${pickTicket.status} !='SHIP_ALL' && ${pickTicket.invoiceBox.beBonded} =='false') ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="allocateManager" methodName="pickAllocate" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="manualAllocate" title="manualAllocate" enableType="single" invisible="false" containId="true" pageId="manualPickingAllocatePage">
-          <enableExpression><![CDATA[( ${pickTicket.status} !='SHIP_ALL' && ${pickTicket.invoiceBox.beBonded} =='false') ]]></enableExpression>
-            </popup>
-            <commit id="unallocate" title="maintainPickTicketPage.unallocate" enableType="multi" invisible="false" confirmMessage="maintainPickTicketPage.unallocate.confirmMessage">
-				<enableExpression><![CDATA[( ${pickTicket.status} !='SHIP_ALL' && ${pickTicket.invoiceBox.beBonded} =='false') ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="pickTicketManager" methodName="unallocate" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="singlePickConfirm" title="singlePickConfirm" enableType="single" invisible="false" containId="true" pageId="editPickConfirmPage">
-                <enableExpression><![CDATA[((${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
-            </popup>
-            
-            <commit id="multiPickConfirm" title="multiPickConfirm" enableType="multi" invisible="false" confirmMessage="maintainPickTicketPage.multiPickConfirm.confirmMessage">
-                <enableExpression><![CDATA[((${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
-           		<mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="pickTicketManager" methodName="multiPickConfirm" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="pickedBack" title="pickedBack" enableType="single" invisible="false" containId="true" pageId="pickBackPage">
-                <enableExpression><![CDATA[(${pickTicket.status} =='PICKUP' || ${pickTicket.status} =='PICK_ALL') ]]></enableExpression>
-            </popup>
-            <commit id="shipConfirm" title="shipConfirm" enableType="multi" invisible="false" confirmMessage="maintainMasterBolPage.shipConfirm">
-                <enableExpression><![CDATA[(${pickTicket.status} =='PICKUP' || ${pickTicket.status} =='PICK_ALL') ]]></enableExpression>
-             <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="masterBolManager" methodName="multiShipConfirm" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            
-<!--            <commit id="close" title="qzClose" enableType="multi" invisible="false" confirmMessage="title1168843351703"> -->
-<!--                 <enableExpression><![CDATA[(${pickTicket.status} =='PICKUP')]]></enableExpression> -->
-<!--                 <mappings> -->
-<!--                     <mapping id="ids" className="list"/> -->
-<!--                 </mappings> -->
-<!--                 <actions> -->
-<!--                     <action managerName="pickTicketManager" methodName="qzClose" parameter="ids"/> -->
-<!--                 </actions> -->
-<!--                 <forwards> -->
-<!--                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
-<!--                 </forwards> -->
-<!--             </commit>  -->
-			<popup id="pickTicketPayFeePage" title="应付录入" enableType="single" invisible="false" containId="true" pageId="modifypickTicketPayFeePage"/>
-            
-            <popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage">
-                <enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
-            </popup>
-             <popup id="查看照片" title="查看照片" enableType="single" invisible="false" containId="true" pageId="seePickTicketImagePage">
-<!--                 <enableExpression><![CDATA[(${pickTicket.status} =='PICKUP' || ${pickTicket.status} =='PICK_ALL') ]]></enableExpression> -->
-            </popup>
-<!--             <popup id="printing" title="printing" enableType="single" invisible="false" containId="true" pageId="printPickticketPage"/> -->
-        </buttons>
-    </maintainPage>
-</pages>