Merge remote-tracking branch 'remotes/origin/test'

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java

@@ -62,4 +62,8 @@ public class MesProdRouteOptParam extends BaseBean {
     public int getStepSeq() {
         return this.stepSeq == null ? 0 : this.stepSeq;
     }
+
+    public void setStepSeq(int stepSeq) {
+        this.stepSeq = stepSeq;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java

@@ -73,6 +73,10 @@ public class MesProdRouteOptParam extends BaseBean {
         return this.stepSeq == null ? 0 : this.stepSeq;
     }
 
+    public void setStepSeq(int stepSeq) {
+        this.stepSeq = stepSeq;
+    }
+
     public int getParamTypeVal() {
         return this.paramType == null ? 0 : this.paramType;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -40,4 +41,15 @@ public class WmsMessageStyleModel implements Serializable {
     public WmsMessageStyleModel(String message) {
         this.message = message;
     }
+
+    public WmsMessageStyleModel(String message, double transQty, double actQty) {
+        this.message = message;
+        if (actQty == 0) {//未处理
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
+        } else if (actQty > 0) {
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
+        } else if (actQty == transQty) {
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+        }
+    }
 }