diff --git a/src/main/java/com/dev/swms/server/model/inventory/Task.java b/src/main/java/com/dev/swms/server/model/inventory/Task.java
index 3504398..14328c7 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/Task.java
+++ b/src/main/java/com/dev/swms/server/model/inventory/Task.java
@@ -153,10 +153,25 @@ public class Task extends VersionalEntity {
 	private Date dateBill7;//
 	private Date dateBill8;//
 	private String  positionStatus;//位置状态
+	private String oldGzz;//原工作站
+	private String oldZrw;//原子任务
 	
-	
-	
-	
+	public String getOldGzz() {
+		return oldGzz;
+	}
+
+	public void setOldGzz(String oldGzz) {
+		this.oldGzz = oldGzz;
+	}
+
+	public String getOldZrw() {
+		return oldZrw;
+	}
+
+	public void setOldZrw(String oldZrw) {
+		this.oldZrw = oldZrw;
+	}
+
 	public Date getDateBill4() {
 		return dateBill4;
 	}
diff --git a/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml b/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
index 6868424..30ba7c2 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
@@ -171,6 +171,8 @@
 		<property name="dateBill6" column="dateBill6" type="timestamp" />
 		<property name="dateBill7" column="dateBill7" type="timestamp" />
 		<property name="dateBill8" column="dateBill8" type="timestamp" />
+		<property name="oldGzz" column="OLD_GZZ" type="string" length="100" />
+		<property name="oldZrw" column="OLD_ZRW" type="string" length="100" />
 		
 	</class>
 	<!-- <query name="getNotAllPickTasksByWaveDocId"> -->
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
index 8030e2e..5719082 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
@@ -10,6 +10,7 @@ import org.hibernate.Session;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
 import com.dev.swms.server.model.shipping.WaveDoc;
 import com.dev.swms.server.service.shipping.NewWaveManager;
 
@@ -39,6 +40,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements NewWave
 						+" for xml Path('')),1,1,'') as taskId,"
 						+ "item.code as liaohao  ,"
 						+ "max(z.NAME) as kuqu,"
+						+ "max(t.END_REGION) as gzz,"
 						+"sum(t.PLAN_QUANTITY_MU-t.MOVED_QUANTITY_MU) as jhsl,"
 						+ "MAX(s2.LP) as rqh ,"
 						+ "t.BILLCODE as zrwh,"
@@ -70,11 +72,21 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements NewWave
 			List<FenPei> list_fenpei= new ArrayList<FenPei>();
 			for(int i=0;i<list.size();i++){
 				FenPei bean=new FenPei();
-				bean. tsakId=(String)list.get(i)[0];
-				bean. liaohao=(String)list.get(i)[1];
+				bean.tsakId=(String)list.get(i)[0];
+				bean.liaohao=(String)list.get(i)[1];
 				logger.info(bean.tsakId+"---"+bean.liaohao);
 				
 			}
+			for(FenPei fp:list_fenpei ){
+				String[] ids=fp.tsakId.split(",");
+				for(int i=0;i<=ids.length;i++){
+					Task task=this.commonDao.get(Task.class, Long.parseLong(ids[i]));
+					//保留原有信息字段做对比分析
+					task.setOldGzz(fp.gzz);
+					task.setOldZrw(fp.zrwh);
+					this.commonDao.store(task);
+				}
+			}
 			
 		}catch (Exception e) {
 			session.close();
@@ -111,6 +123,10 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements NewWave
 		 * 工单号
 		 */
 		public String gdh;
+		/**
+		 * 工作站
+		 */
+		public String gzz;
 		/**
 		 * 工作中心
 		 */