From cf203390b8729e1cfbb5941005c4322674dd7937 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Sun, 19 Jan 2020 11:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java      | 3 +++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java     | 2 ++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java  | 7 ++++++-
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java     | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

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() {