From 712555609078eecc43c30a6e93616695d0b52edd Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Mon, 7 Jun 2021 19:44:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index 97c1591..d7dd874 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -170,6 +170,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
     public List<Integer> differenceTypeList;
 
+    @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

From 4d5cdc710ed9f965a7aac789cd416c97943599f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Tue, 8 Jun 2021 09:33:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=9016023=2019081-=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=AE=89=E7=81=AF=E5=91=BC=E5=8F=AB=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94=E3=80=81=E5=91=BC=E5=8F=AB=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E5=92=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86-20210525=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index 0e4b269..d3770f8 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@@ -298,6 +298,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     private Integer brokenTime;
 
     @Transient
+    @ApiParam(value ="响应时长(分钟)")
+    private Double sumDowntime;
+
+    @Transient
+    @ApiParam(value ="故障时长(分钟)")
+    private Double sumBrokenTime;
+
+    @Transient
     @ApiParam(value ="故障字符串")
     private String faultStr;