Jenkins自动合并

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;
+    }
+
+}

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

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;