From f1afdf92e9d3df1b7801f1430e766eb12346f292 Mon Sep 17 00:00:00 2001
From: qianhs <huasheng.qian@estsh.com>
Date: Mon, 13 Jan 2020 22:22:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?=
 =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?=
 =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?=
 =?UTF-8?q?=09=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java     | 2 +-
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 0d4fb51..69772a7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -89,7 +89,7 @@ public class WmsCSFactTrans extends BaseBean {
 
     @Transient
     @AnnoOutputColumn(hidden = true)
-    @ApiParam(value = "剩余数量", example = "1")
+    @ApiParam(value = "差异数量", example = "1")
     public Double surplusQty;
 
     @Column
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 086e420..b12010a 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
@@ -122,7 +122,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Double factQty;
 
     @Transient
-    @ApiParam(value = "剩余数量", example = "1")
+    @ApiParam(value = "差异数量", example = "1")
     @AnnoOutputColumn(hidden = true)
     public Double surplusQty;
 

From 28587fbb98aca9398d7a0b9b4fee45c79d3b7b00 Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Tue, 14 Jan 2020 00:01:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?task=20`1392`=20=E8=B0=83=E6=95=B4=E5=B7=A5?=
 =?UTF-8?q?=E6=AD=A5=20=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/pcn/model/StepResult.java      | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
new file mode 100644
index 0000000..d34c46d
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Collection;
+
+@Data
+@Api("工步返回信息")
+public class StepResult<T> {
+
+    private boolean isCompleted;
+
+    private T data;
+
+    private Collection<T> dataCollection;
+
+    private String msg;
+
+    public static StepResult getSuccessComplete() {
+        return new StepResult(true);
+    }
+
+    public static StepResult getNonComplete() {
+        return new StepResult(false);
+    }
+
+    public static StepResult getSuccessComplete(String msg) {
+        return new StepResult(true, msg);
+    }
+
+    public static StepResult getNonComplete(String msg) {
+        return new StepResult(false, msg);
+    }
+
+    public static <T> StepResult<T> getSuccessData(T data, String msg) {
+        return new StepResult<>(true, data, msg);
+    }
+
+    public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
+        return new StepResult<T>(true, data, msg);
+    }
+
+    private StepResult() {
+    }
+
+    private StepResult(boolean isCompleted) {
+        this.isCompleted = isCompleted;
+    }
+
+    private StepResult(boolean isCompleted, String msg) {
+        this.isCompleted = isCompleted;
+        this.msg = msg;
+    }
+
+    public StepResult(boolean isCompleted, T data, String msg) {
+        this.isCompleted = isCompleted;
+        this.data = data;
+        this.msg = msg;
+    }
+
+    public StepResult(boolean isCompleted, Collection<T> dataCollection, String msg) {
+        this.isCompleted = isCompleted;
+        this.dataCollection = dataCollection;
+        this.msg = msg;
+    }
+
+}