diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
index 91456a6..ca8b7f2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@@ -61,14 +61,17 @@ public class Material extends BaseAPS {
 
     @Column(name="PURCHASE_LEAD_TIME")
     @ApiParam(value ="采购提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String purchaseLeadTime;
 
     @Column(name="MANUF_LEAD_TIME")
     @ApiParam(value ="制造提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String manufLeadTime;
 
     @Column(name="SHIPMENT_LEAD_TIME")
     @ApiParam(value ="配送提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String shipmentLeadTime;
 
     @Column(name="UNIT_PURCHASE")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
index e9c592a..11cedff 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
@@ -61,10 +61,12 @@ public class OperInput extends BaseAPS {
 
     @Column(name="MAX_SPACE_TIME")
     @ApiParam(value ="最大时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
     public Operation getOperation() {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
index 0568af5..b6923c0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
@@ -46,27 +46,32 @@ public class OperResource extends BaseAPS {
 
     @Column(name="PREV_TIME")
     @ApiParam(value ="前设置时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String prevTime;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
-    @FieldAnnotation(notEmpty = true)
+    @FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String produceTime;
 
     @Column(name="POST_TIME")
     @ApiParam(value ="后设置时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String postTime;
 
     @Column(name="MAX_PREV_SD_TIME")
     @ApiParam(value ="最大前设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPrevSdTime;
 
     @Column(name="MAX_PRODUCE_SD_TIME")
     @ApiParam(value ="最大生产中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxProduceSdTime;
 
     @Column(name="MAX_POST_SD_TIME")
     @ApiParam(value ="最大后设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPostSdTime;
 
     @Column(name="PRIORITY")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
index d115131..274574b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@@ -77,10 +77,12 @@ public class Operation extends BaseAPS {
 
     @Column(name="MAX_SPACE_TIME")
     @ApiParam(value ="最大时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
     public ProductRouting getProductRouting() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index f3856c7..dbd5e1f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -184,6 +184,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "标签")
     private String tag;
 
+    @Transient
+    @ApiParam("物料编号组")
+    public String[] partNos;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
index 442e993..99b223f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
@@ -74,4 +74,14 @@ public class WmsSearchElement extends BaseBean {
      * 搜索组连接符
      */
     private String groupConnector;
+
+    /**
+     * 开始时间字符串
+     */
+    private String startDateTimeStr;
+
+    /**
+     * 结束时间字符串
+     */
+    private String endDateTimeStr;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 189877c..8c32ae6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1906,6 +1906,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);