From c49092e877587c7b2c4f9305fd2d0868b93cc0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Thu, 19 Dec 2024 15:41:33 +0800
Subject: [PATCH 1/5] no message
---
 .classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.classpath b/.classpath
index e589d0d..c7f02b9 100644
--- a/.classpath
+++ b/.classpath
@@ -118,6 +118,6 @@
 	
 	
 	
-	
+	
 	
 
From ac48084cea11fbc285c0d7eac5e47f5d27885719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Thu, 19 Dec 2024 15:44:55 +0800
Subject: [PATCH 2/5] no message
---
 .../dev/swms/server/model/base/ShiXiao.java   | 27 +++++
 .../swms/server/model/base/shixiao.hbm.xml    | 11 ++-
 .../config/origen/base/editShiXiaoPage.xml    | 56 +++++------
 .../origen/base/maintainShiXiaoPage.xml       | 98 ++++++++++---------
 4 files changed, 114 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/dev/swms/server/model/base/ShiXiao.java b/src/main/java/com/dev/swms/server/model/base/ShiXiao.java
index e680d4b..7314bf3 100644
--- a/src/main/java/com/dev/swms/server/model/base/ShiXiao.java
+++ b/src/main/java/com/dev/swms/server/model/base/ShiXiao.java
@@ -13,9 +13,36 @@ public class ShiXiao extends VersionalEntity{
 	private double pandian;//盘点效率
 	
 	private double zhengli;//整理效率
+	private double taskD;//任务拆分行数
+	private double gzzD;//工作站自动补波行
+	private double gzzT;//补波时长(分)
 	
 	private WarehouseArea warehouseArea;//库区
 
+	public double getTaskD() {
+		return taskD;
+	}
+
+	public void setTaskD(double taskD) {
+		this.taskD = taskD;
+	}
+
+	public double getGzzD() {
+		return gzzD;
+	}
+
+	public void setGzzD(double gzzD) {
+		this.gzzD = gzzD;
+	}
+
+	public double getGzzT() {
+		return gzzT;
+	}
+
+	public void setGzzT(double gzzT) {
+		this.gzzT = gzzT;
+	}
+
 	/** 是否有效 */
 	private boolean disabled = false;
 	
diff --git a/src/main/java/com/dev/swms/server/model/base/shixiao.hbm.xml b/src/main/java/com/dev/swms/server/model/base/shixiao.hbm.xml
index 0b39ba8..6cf4664 100644
--- a/src/main/java/com/dev/swms/server/model/base/shixiao.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/base/shixiao.hbm.xml
@@ -8,7 +8,7 @@
 			
 			
 		
-		
+
 		
 			
@@ -17,12 +17,15 @@
 		
 		
 		
+		
+		
+		
 		
 			
 		
-		
-		
-		
+		
+		
+
 	
 
\ No newline at end of file
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editShiXiaoPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editShiXiaoPage.xml
index 81e6fe5..a1b7a7f 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/editShiXiaoPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editShiXiaoPage.xml
@@ -2,21 +2,16 @@
 
 
 	
 		
 			
-			
-			  
 -->
+			
 				
 			
-			
-			
-			
-			
+			
+			
+			
+			
+			
+			
+			
 		
 		
 			
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainShiXiaoPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainShiXiaoPage.xml
index 2fa172b..ea5ff64 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/maintainShiXiaoPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainShiXiaoPage.xml
@@ -4,17 +4,12 @@
 	
 		
-		
+
 			
-				
+				
 				
@@ -28,7 +23,7 @@ where 1=1]]>
 					row="1" col="2" defaultValue="false" span="1" readOnly="false"
 					required="false" reserve="false" forceOverride="true" inVisible="false" />
 			
-			
+
 		
 		
  shixiao.number,
  shixiao.pandian,
  shixiao.zhengli,
+ shixiao.taskD,
+ shixiao.gzzD,
+ shixiao.gzzT,
  warehouseArea.name,
  shixiao.disabled,
  shixiao.efficiency
@@ -47,52 +45,60 @@ where 1=1]]>
  /~shixiao.disabled: and shixiao.disabled = {shixiao.disabled} ~/
  /~shixiao.locationStorage.id : and locationStorage.id = {shixiao.locationStorage.id}~/
 		]]>
-		
+
 		
-		
+
 			
-			
 			
 			
-			
-			
-			
-			
+			
+			
+			
+			
+			
+			
-			
+			
 		
-		
+
 		
-			
-			 
-			 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-			
-			    
-			
+			
+			
+
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+
+			
+			
 				
 				
 					
From c6bd2faffc6db20accaef12e0036605692d7937f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Fri, 20 Dec 2024 09:51:13 +0800
Subject: [PATCH 3/5] no message
---
 .../server/model/shipping/WaveDocFig.java     | 38 ++++++++++++++
 .../server/model/shipping/waveDocFig.hbm.xml  | 17 +++++++
 .../service/shipping/WaveDocFigManager.java   |  7 +++
 .../pojo/DefaultWaveDocFigManager.java        |  9 ++++
 src/main/java/daoContext.xml                  |  6 +++
 .../config/origen/base/editWaveDocFigPage.xml | 36 +++++++++++++
 .../classes/config/origen/menuConfig.xml      |  1 +
 .../shipping/maintainWaveDocFigPage.xml       | 51 +++++++++++++++++++
 8 files changed, 165 insertions(+)
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/WaveDocFig.java
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/waveDocFig.hbm.xml
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/base/editWaveDocFigPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
diff --git a/src/main/java/com/dev/swms/server/model/shipping/WaveDocFig.java b/src/main/java/com/dev/swms/server/model/shipping/WaveDocFig.java
new file mode 100644
index 0000000..8e49f99
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/WaveDocFig.java
@@ -0,0 +1,38 @@
+package com.dev.swms.server.model.shipping;
+
+import java.util.Date;
+import java.util.Set;
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.Structure;
+import com.dev.swms.server.model.base.Warehouse;
+import com.dev.swms.server.model.base.Worker;
+import com.dev.energy.server.model.Entity;
+
+public class WaveDocFig extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 下发单量 */
+	private double pickD;
+	/** 拆分行数*/
+	private double taskD;
+	/** 工作站效能*/
+	private double gzzD;
+	public double getPickD() {
+		return pickD;
+	}
+	public void setPickD(double pickD) {
+		this.pickD = pickD;
+	}
+	public double getTaskD() {
+		return taskD;
+	}
+	public void setTaskD(double taskD) {
+		this.taskD = taskD;
+	}
+	public double getGzzD() {
+		return gzzD;
+	}
+	public void setGzzD(double gzzD) {
+		this.gzzD = gzzD;
+	}
+	
+}
diff --git a/src/main/java/com/dev/swms/server/model/shipping/waveDocFig.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/waveDocFig.hbm.xml
new file mode 100644
index 0000000..a2bad12
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/waveDocFig.hbm.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+		
+			
+				wms_waveDocFig
+				START WITH 1000
+			
+		
+		
+		
+		
+	
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java b/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
new file mode 100644
index 0000000..0f0ad3c
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
@@ -0,0 +1,7 @@
+package com.dev.swms.server.service.shipping;
+
+import com.dev.energy.server.service.BaseManager;
+
+public interface WaveDocFigManager extends BaseManager {
+	
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
new file mode 100644
index 0000000..f439581
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
@@ -0,0 +1,9 @@
+package com.dev.swms.server.service.shipping.pojo;
+
+import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.service.shipping.WaveDocFigManager;
+
+public class DefaultWaveDocFigManager extends DefaultBaseManager implements
+		WaveDocFigManager {
+	
+}
diff --git a/src/main/java/daoContext.xml b/src/main/java/daoContext.xml
index 528cecf..233a00c 100644
--- a/src/main/java/daoContext.xml
+++ b/src/main/java/daoContext.xml
@@ -495,6 +495,12 @@
             com/dev/swms/server/model/shipping/waveDoc.hbm.xml
         
     
+    
+    
+        
+            com/dev/swms/server/model/shipping/waveDocFig.hbm.xml
+        
+    
     
    
    
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocFigPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocFigPage.xml
new file mode 100644
index 0000000..9561bb4
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocFigPage.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+		
+			
+			
+			
+			
+		
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+					
+				
+			
+		
+	
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index d590873..528171a 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -136,6 +136,7 @@
 
 
 
+        	
         	
         	
         		
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
new file mode 100644
index 0000000..2ca57b6
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
@@ -0,0 +1,51 @@
+
+
+
+	
+		
+			
+				
+				
+					
+					
+				 
+				
+			
+		
+		
+		
+			
+			
+			
+			
+		
+		
+			
+		
+	
+
From a49b77019ee138ec72514841f61920885469c1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Fri, 20 Dec 2024 13:10:19 +0800
Subject: [PATCH 4/5] no message
---
 .../swms/server/service/shipping/WaveDocFigManager.java  | 7 ++++++-
 .../service/shipping/pojo/DefaultWaveDocFigManager.java  | 9 ++++++++-
 src/main/java/serviceContext.xml                         | 9 +++++++++
 .../classes/config/origen/base/editWaveDocFigPage.xml    | 6 +++---
 4 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java b/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
index 0f0ad3c..e58cbec 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java
@@ -1,7 +1,12 @@
 package com.dev.swms.server.service.shipping;
 
+import org.springframework.transaction.annotation.Transactional;
+
 import com.dev.energy.server.service.BaseManager;
+import com.dev.swms.server.model.shipping.WaveDoc;
+import com.dev.swms.server.model.shipping.WaveDocFig;
 
 public interface WaveDocFigManager extends BaseManager {
-	
+	@Transactional
+	public void saveWaveDocFig(WaveDocFig wdf);
 }
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
index f439581..bccd1a9 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java
@@ -1,9 +1,16 @@
 package com.dev.swms.server.service.shipping.pojo;
 
 import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
+import com.dev.swms.server.model.shipping.WaveDocFig;
 import com.dev.swms.server.service.shipping.WaveDocFigManager;
 
 public class DefaultWaveDocFigManager extends DefaultBaseManager implements
 		WaveDocFigManager {
-	
+
+	@Override
+	public void saveWaveDocFig(WaveDocFig wdf) {
+		// TODO 自动生成的方法存根
+		commonDao.store(wdf);
+	}
 }
diff --git a/src/main/java/serviceContext.xml b/src/main/java/serviceContext.xml
index 76dfd40..35dfc88 100644
--- a/src/main/java/serviceContext.xml
+++ b/src/main/java/serviceContext.xml
@@ -581,6 +581,15 @@
 			
 		
 	
+	
+		
+			
+				
+			
+		
+	
 	
 		
 			
 			
 				
-					
+					
 				
 				
-					
+					
 				
 				
 					
Date: Mon, 23 Dec 2024 14:03:54 +0800
Subject: [PATCH 5/5] no message
---
 .../swms/server/model/shipping/TaskSort.java  | 49 +++++++++++++++++++
 .../server/model/shipping/WaveDocSort.java    | 49 +++++++++++++++++++
 .../server/model/shipping/taskSort.hbm.xml    | 18 +++++++
 .../server/model/shipping/waveDocSort.hbm.xml | 18 +++++++
 .../service/shipping/TaskSortManager.java     | 13 +++++
 .../service/shipping/WaveDocSortManager.java  | 13 +++++
 .../shipping/pojo/DefaultTaskSortManager.java | 20 ++++++++
 .../pojo/DefaultWaveDocSortManager.java       | 20 ++++++++
 src/main/java/daoContext.xml                  | 13 ++++-
 src/main/java/serviceContext.xml              | 18 +++++++
 .../config/origen/base/editTaskSortPage.xml   | 37 ++++++++++++++
 .../origen/base/editWaveDocSortPage.xml       | 37 ++++++++++++++
 .../classes/config/origen/menuConfig.xml      |  6 ++-
 .../origen/shipping/maintainTaskSortPage.xml  | 33 +++++++++++++
 .../shipping/maintainWaveDocFigPage.xml       | 26 +---------
 .../shipping/maintainWaveDocSortPage.xml      | 35 +++++++++++++
 16 files changed, 378 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/TaskSort.java
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml
 create mode 100644 src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java
 create mode 100644 src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/base/editTaskSortPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocSortPage.xml
diff --git a/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java b/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java
new file mode 100644
index 0000000..cd76e41
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java
@@ -0,0 +1,49 @@
+package com.dev.swms.server.model.shipping;
+
+import java.util.Date;
+import java.util.Set;
+
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.Structure;
+import com.dev.swms.server.model.base.Warehouse;
+import com.dev.swms.server.model.base.Worker;
+import com.dev.energy.server.model.Entity;
+
+public class TaskSort extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 名称 */
+	private String name;
+	/** 数据库字段名 */
+	private String colume;
+	/** 顺序*/
+	private double sort;
+	/** 是否禁用*/
+	private boolean disabled=false;
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getColume() {
+		return colume;
+	}
+	public void setColume(String colume) {
+		this.colume = colume;
+	}
+	public double getSort() {
+		return sort;
+	}
+	public void setSort(double sort) {
+		this.sort = sort;
+	}
+	public boolean isDisabled() {
+		return disabled;
+	}
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java b/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java
new file mode 100644
index 0000000..26613be
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java
@@ -0,0 +1,49 @@
+package com.dev.swms.server.model.shipping;
+
+import java.util.Date;
+import java.util.Set;
+
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.Structure;
+import com.dev.swms.server.model.base.Warehouse;
+import com.dev.swms.server.model.base.Worker;
+import com.dev.energy.server.model.Entity;
+
+public class WaveDocSort extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 名称 */
+	private String name;
+	/** 数据库字段名 */
+	private String colume;
+	/** 顺序*/
+	private double sort;
+	/** 是否禁用*/
+	private boolean disabled=false;
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getColume() {
+		return colume;
+	}
+	public void setColume(String colume) {
+		this.colume = colume;
+	}
+	public double getSort() {
+		return sort;
+	}
+	public void setSort(double sort) {
+		this.sort = sort;
+	}
+	public boolean isDisabled() {
+		return disabled;
+	}
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml
new file mode 100644
index 0000000..e506bab
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+		
+			
+				wms_taskSort
+				START WITH 1000
+			
+		
+		
+		
+		
+		
+	
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
new file mode 100644
index 0000000..eb2ae89
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+		
+			
+				wms_waveDocSort
+				START WITH 1000
+			
+		
+		
+		
+		
+		
+	
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java
new file mode 100644
index 0000000..c9a0f1d
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java
@@ -0,0 +1,13 @@
+package com.dev.swms.server.service.shipping;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import com.dev.energy.server.service.BaseManager;
+import com.dev.swms.server.model.shipping.TaskSort;
+import com.dev.swms.server.model.shipping.WaveDoc;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+
+public interface TaskSortManager extends BaseManager {
+	@Transactional
+	public void saveTaskSort(TaskSort ts);
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java
new file mode 100644
index 0000000..c0849e4
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java
@@ -0,0 +1,13 @@
+package com.dev.swms.server.service.shipping;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import com.dev.energy.server.service.BaseManager;
+import com.dev.swms.server.model.shipping.WaveDoc;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.model.shipping.WaveDocSort;
+
+public interface WaveDocSortManager extends BaseManager {
+	@Transactional
+	void saveWaveDocSort(WaveDocSort wds);
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java
new file mode 100644
index 0000000..686ebdf
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java
@@ -0,0 +1,20 @@
+package com.dev.swms.server.service.shipping.pojo;
+
+import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
+import com.dev.swms.server.model.shipping.TaskSort;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.service.shipping.TaskSortManager;
+import com.dev.swms.server.service.shipping.WaveDocFigManager;
+import com.dev.swms.server.service.shipping.WaveDocSortManager;
+
+public class DefaultTaskSortManager extends DefaultBaseManager implements
+	TaskSortManager {
+
+	@Override
+	public void saveTaskSort(TaskSort ts) {
+		// TODO 自动生成的方法存根
+		commonDao.store(ts);
+	}
+	
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java
new file mode 100644
index 0000000..3e9ed4f
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java
@@ -0,0 +1,20 @@
+package com.dev.swms.server.service.shipping.pojo;
+
+import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.model.shipping.WaveDocSort;
+import com.dev.swms.server.service.shipping.WaveDocFigManager;
+import com.dev.swms.server.service.shipping.WaveDocSortManager;
+
+public class DefaultWaveDocSortManager extends DefaultBaseManager implements
+	WaveDocSortManager {
+
+	@Override
+	public void saveWaveDocSort(WaveDocSort wds) {
+		// TODO 自动生成的方法存根
+		commonDao.store(wds);
+	}
+
+	
+}
diff --git a/src/main/java/daoContext.xml b/src/main/java/daoContext.xml
index 233a00c..376a78f 100644
--- a/src/main/java/daoContext.xml
+++ b/src/main/java/daoContext.xml
@@ -501,7 +501,18 @@
             com/dev/swms/server/model/shipping/waveDocFig.hbm.xml
         
     
-    
+    
+    
+        
+            com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
+        
+    
+    
+    
+        
+            com/dev/swms/server/model/shipping/taskSort.hbm.xml
+        
+    
    
    
         
diff --git a/src/main/java/serviceContext.xml b/src/main/java/serviceContext.xml
index 35dfc88..bb09a00 100644
--- a/src/main/java/serviceContext.xml
+++ b/src/main/java/serviceContext.xml
@@ -590,6 +590,24 @@
 			
 		
 	
+	
+		
+			
+				
+			
+		
+	
+	
+		
+			
+				
+			
+		
+	
 	
 		
 			
+
+
+	
+		
+			
+			
+			
+			
+			
+		
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+					
+				
+			
+		
+	
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml
new file mode 100644
index 0000000..e597672
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+		
+			
+			
+			
+			
+			
+		
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+					
+				
+			
+		
+	
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 528171a..8860398 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -136,7 +136,11 @@
 
 
 
-        	
+			
         	
         	
         		
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml
new file mode 100644
index 0000000..ee284b8
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml
@@ -0,0 +1,33 @@
+
+
+
+	
+		
+			
+				
+			
+		
+		
+		
+			
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
index 2ca57b6..bf460ef 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
@@ -3,31 +3,7 @@
 
 	
 		
-			
-				
-				
-					
-					
-				 
-				
-			
+			
 		
 		
+
+
+	
+		
+			
+				
+			
+		
+		
+		
+			
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+