Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -12,6 +12,44 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes工步类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_STEP_TYPE {
+
+        COMMON_STEP("10", "公用工步"),
+        JIT_STEP("20", "JIT工步"),
+        WORK_ORDER_STEP("30", "工单工步"),
+        BACK_STEP("40", "后台工步");
+
+        private String value;
+        private String description;
+
+        MES_STEP_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes工作单元参数类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -46,9 +46,9 @@ public class WmsMessageStyleModel implements Serializable {
         this.message = message;
         if (actQty == 0) {//未处理
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
-        } else if (actQty > 0) {
+        } else if (transQty > actQty) {//处理中
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
-        } else if (actQty == transQty) {
+        } else if (actQty == transQty) {//处理完成
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         }
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -149,6 +149,21 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("业务类型编码")
     private Integer busiTypeCode;
 
+    @Transient
+    private String workCenterCode;
+
+    @Transient
+    private String fPartNo;
+
+    @Transient
+    private String fPartName;
+
+    @Transient
+    private Double qty;
+
+    @Transient
+    private String createDateTime;
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -174,6 +189,21 @@ public class WmsMoveDetails extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
+    public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty,
+                            String createDateTime,String sn){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.fPartNo = fPartNo;
+        this.fPartName = fPartName;
+        this.unit = unit;
+        this.qty = qty;
+        this.createDateTime = createDateTime;
+        this.sn = sn;
+
+    }
+
     public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
             ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
                           String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,