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}~/
]]>
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+