diff --git a/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java b/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java
index a7f9e83..cf4d02a 100644
--- a/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java
+++ b/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java
@@ -136,8 +136,17 @@ public class MasterBOL extends Entity {
 	
 	private Set<PickTicket> pickTickets = new HashSet<PickTicket>();
 	
+	//工单个数
+	private double gdQty;
 	
 	
+	public double getGdQty() {
+		return gdQty;
+	}
+
+	public void setGdQty(double gdQty) {
+		this.gdQty = gdQty;
+	}
 
 	public Set<PickTicket> getPickTickets() {
 		return pickTickets;
diff --git a/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml
index d395e68..c92c853 100644
--- a/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml
@@ -124,6 +124,9 @@
 			<column name="WORKER4_ID"/>
 		</many-to-one>
 		
+		<property name="gdQty" formula="(select  count(pt.id)   from  PICK_TICKET pt where pt.MASTER_BOL_ID=ID     )" />
+		
+		
 	</class>
 	<query name="getMasterBOLCountByCarrierID">
 		<![CDATA[SELECT COUNT(masterBol) FROM MasterBOL masterBol WHERE masterBol.carrier.id = :carrierId]]>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml
index bb54814..a2725b9 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml
@@ -11,6 +11,7 @@
  masterBOL.id,
  masterBOL.code,
  CAST(masterBOL.orderQuantity as integer),
+ CAST(masterBOL.gdQty as integer),
  masterBOL.status,
  masterBOL.updateTime
  FROM MasterBOL masterBOL
@@ -35,6 +36,7 @@
             <column id="masterBOL.id" title="ID" visible="false"/>
             <column id="masterBOL.code"   title="PLDH" visible="true" horizonAlign="center" />
 			<column id="masterBOL.orderQuantity" title="pickTicket.orderQuantity" visible="true" horizonAlign="center" dataType="double" />
+			<column id="masterBOL.gdQty" title="工单个数" visible="true" horizonAlign="center" dataType="double" />
 			<column id="masterBOL.status" title="masterBOL.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MasterBOLStatus"/>
             <column id="masterBOL.updateTime" title="masterBOL.updateTime" visible="true" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
         </columns>
diff --git a/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class b/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class
deleted file mode 100644
index 5cf8d6b..0000000
Binary files a/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class and /dev/null differ
diff --git a/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/masterBOL.hbm.xml b/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/masterBOL.hbm.xml
deleted file mode 100644
index d395e68..0000000
--- a/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/masterBOL.hbm.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC 
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-    <class name="com.dev.swms.server.model.shipping.MasterBOL" table="MASTER_BOL">
-        <id name="id" column="ID" type="long">
-            <generator class="native">
-                <param name="sequence">wms_masterBOL</param>
-                <param name="parameters">START WITH 1000</param>
-            </generator>
-        </id>
-        <discriminator column="DISCRIMINATOR" type="string"/>
-		<many-to-one name="warehouse" class="com.dev.swms.server.model.base.Warehouse">
-			<column name="WAREHOUSE_ID" not-null="true" unique-key="UK_MASTER_BOL"/>
-		</many-to-one>
-		<many-to-one name="company" class="com.dev.swms.server.model.base.Structure">
-			<column name="COMPANY_ID" />
-		</many-to-one>
-		<property name="code" type="string">
-			<column name="CODE" not-null="true" length="20" unique-key="UK_MASTER_BOL"/>
-		</property>
-
-		<many-to-one name="carrier" class="com.dev.swms.server.model.base.Structure">
-			<column name="CARRIER_ID"/>
-		</many-to-one>
-		
-		<property name="shipToName" type="string" length="100" column="SHIP_TO_NAME"/>
-        <component name="shipToAddress" class="com.dev.swms.server.model.base.Address">
-            <property name="address" type="string">
-                <column name="ADDRESS" length="255"/>
-            </property>
-            <property name="postCode" type="string">
-                <column name="POSTCODE" length="10"/>
-            </property>
-        </component>
-        <component name="shipToContact" class="com.dev.swms.server.model.base.Contact">
-            <property name="person" type="string">
-                <column name="PERSON" length="20"/>
-            </property>
-            <property name="telephone" type="string">
-                <column name="TELEPHONE" length="50"/>
-            </property>
-            <property name="fax" type="string">
-                <column name="FAX" length="50"/>
-            </property>
-            <property name="email" type="string">
-                <column name="EMAIL" length="100"/>
-            </property>
-        </component>		
-		<property name="trailer" type="string" length="20" column="TRAILER"/>
-		<property name="sealNumber" type="string" length="20" column="SEAL_NUMBER"/>
-		<property name="status" type="string" length="20" column="STATUS"/>
-		
-        <property name="allShippedVolume" type="double" column="VOLUME"/>
-        <property name="allShippedWeight" type="double" column="WEIGHT"/>
-
-		<property name="description" type="string" length="255" column="DESCRIPTION"/>
-		
-		<set name="BOLs" lazy="true">
-			<key column="MASTER_BOL_ID"/>
-			<one-to-many class="com.dev.swms.server.model.shipping.BOL"/>
-		</set>
-
-		<property name="userID" column="USER_ID" type="long"/>
-		<property name="userName" column="USER_NAME" type="string" length="20"/>
-		<property name="updateTime" column="UPDATE_TIME" type="timestamp"/>
-		<property name="storeType" column="STORETYPE" type="string" length="20"/>
-		<property name="inputDate" type="timestamp" column="INPUTDATE"/>
-		<property name="outputDate" type="timestamp" column="OUTPUTDATE"/>
-		<many-to-one name="inputWorker" class="com.dev.swms.server.model.base.Worker">
-			<column name="INPUTWORKER_ID"/>
-		</many-to-one> 
-		<many-to-one name="outputWorker" class="com.dev.swms.server.model.base.Worker">
-			<column name="OUTPUTWORKER_ID"/>
-		</many-to-one> 
-		<property name="shipmentMethod" type="string" length="20" column="SHIPMENT_METHOD"/>
-		<property name="loading" type="string" length="20" column="LOADING"/>
-		<many-to-one name="startPosition" class="com.dev.swms.server.model.base.TransSite">
-			<column name="START_POSITION_ID"/>
-		</many-to-one>
-		<many-to-one name="aimPosition" class="com.dev.swms.server.model.base.TransSite">
-			<column name="AIM_POSITION_ID"/>
-		</many-to-one>
-		<property name="leaveTime" type="timestamp">
-			<column name="LEAVE_TIME"/>
-		</property>
-		<many-to-one name="transportation" class="com.dev.swms.server.model.base.Transportation">
-			<column name="TRANSPORTATION_ID"/>
-		</many-to-one>
-		
-		<many-to-one name="pilot" class="com.dev.swms.server.model.base.Pilot">
-			<column name="PILOT_ID"/>
-		</many-to-one>
-		<property name="pilotName" column="PILOT_NAME" type="string" length="50"/>
-		<property name="pilotTel" column="PILOT_TEL" type="string" length="50"/>
-		
-		<many-to-one name="line" class="com.dev.swms.server.model.base.Line" >
-       		<column name="LINE_ID" />
-       	</many-to-one>
-       	
-       	<many-to-one name="vehicle" class="com.dev.swms.server.model.base.Vehicle" >
-       		<column name="VEHICLE_ID" />
-       	</many-to-one>
-       	
-      	<set name="pickTickets" table="com.dev.swms.server.model.shipping.PickTicket" lazy="true" inverse="true" cascade="all-delete-orphan">
-			<key column="MASTER_BOL_ID"/>
-			<one-to-many class="com.dev.swms.server.model.shipping.PickTicket"/>
-		</set>
-		
-		<property name="orderQuantity" type="double" column="ORDER_QUANTITY"/>
-        <property name="pickQuantity" type="double" column="PICK_QUANTITY"/>
-		<property name="shipQuantity" type="double" column="SHIP_QUANTITY"/>
-		<many-to-one name="worker1" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER1_ID"/>
-		</many-to-one>
-		<many-to-one name="worker2" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER2_ID"/>
-		</many-to-one>
-		<many-to-one name="worker3" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER3_ID"/>
-		</many-to-one>
-		<many-to-one name="worker4" class="com.dev.swms.server.model.base.Worker">
-			<column name="WORKER4_ID"/>
-		</many-to-one>
-		
-	</class>
-	<query name="getMasterBOLCountByCarrierID">
-		<![CDATA[SELECT COUNT(masterBol) FROM MasterBOL masterBol WHERE masterBol.carrier.id = :carrierId]]>
-	</query>
-	<query name="getMasterBolByCode">
-		<![CDATA[FROM MasterBOL masterBol WHERE masterBol.code = :code]]>
-	</query>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml b/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml
deleted file mode 100644
index bb54814..0000000
--- a/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainMasterBolPage" title="maintainMasterBolPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <dateRanger id="masterBOL.updateTime" title="masterBOL.updateTime" row="3" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="order.beginDate" toDate="order.endDate"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT 
- masterBOL.id,
- masterBOL.code,
- CAST(masterBOL.orderQuantity as integer),
- masterBOL.status,
- masterBOL.updateTime
- FROM MasterBOL masterBOL
- LEFT JOIN masterBOL.startPosition
- LEFT JOIN masterBOL.aimPosition
- LEFT JOIN masterBOL.transportation
- LEFT JOIN masterBOL.transportation.type
- LEFT JOIN masterBOL.carrier
- LEFT JOIN masterBOL.line
- LEFT JOIN masterBOL.company
- WHERE 1=1 
- /~SESSION_WAREHOUSE: AND masterBOL.warehouse = #{SESSION_WAREHOUSE} ~/
- /~masterBOL.code:AND masterBOL.code like {masterBOL.code} ~/
- /~masterBOL.carrier.id: AND masterBOL.carrier.id = {masterBOL.carrier.id} ~/
- /~masterBOL.trailer:AND masterBOL.trailer like {masterBOL.trailer} ~/
- /~masterBOL.sealNumber:AND masterBOL.sealNumber like {masterBOL.sealNumber} ~/
- /~order.beginDate: AND trunc(masterBOL.updateTime) >= {order.beginDate} ~/
- /~order.endDate: AND trunc(masterBOL.updateTime) <= {order.endDate} ~/
-  /~masterBOL.company.id: AND masterBOL.company.id = {masterBOL.company.id} ~/
- order by masterBOL.id desc ]]></datasource>
-        <columns>
-            <column id="masterBOL.id" title="ID" visible="false"/>
-            <column id="masterBOL.code"   title="PLDH" visible="true" horizonAlign="center" />
-			<column id="masterBOL.orderQuantity" title="pickTicket.orderQuantity" visible="true" horizonAlign="center" dataType="double" />
-			<column id="masterBOL.status" title="masterBOL.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MasterBOLStatus"/>
-            <column id="masterBOL.updateTime" title="masterBOL.updateTime" visible="true" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
-        </columns>
-        <buttons>
-            <popup id="new" title="new" invisible="false" containId="false" pageId="editMasterBOLPage"/>
-            <popup id="edit" title="edit" enableType="single" invisible="false" containId="true" pageId="editMasterBOLPage"/>
-            <commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="maintainMasterBolPage.delete.confirmMessage">
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="masterBolManager" methodName="delete" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-        </buttons>
-    </maintainPage>
-</pages>