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

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;
 

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

@@ -1908,6 +1908,84 @@ public class WmsEnumUtil {
     }
 
     /**
+     * PO 单据质检状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_QC_STATUS {
+        INQUALITY(10, "INQUALITY", "质检中"),
+        NORMAL(20, "NORMAL", "合格"),
+        ABNORMAL(30, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_QC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static PO_QC_STATUS codeOfs(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 质检业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,6 +13,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;
@@ -198,6 +198,14 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
+    @Transient
+    @ApiParam(value = "窗口开始时间")
+    public String windowStartTime;
+
+    @Transient
+    @ApiParam(value = "窗口结束时间")
+    public String windowEndTime;
+
     public WmsASNMaster() {
     }
 

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;

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

@@ -56,11 +56,20 @@ public class WmsQCMaster extends BaseBean {
      * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
      */
     @Column(name = "ORDER_STATUS")
-    @ApiParam(value = "状态", example = "1")
+    @ApiParam(value = "单据状态", example = "1")
     @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_STATUS")
     public Integer orderStatus;
 
+    /**
+     * 状态:10=质检中,20=合格,30=不合格
+     */
+    @Column(name = "QC_STATUS")
+    @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PO_QC_STATUS")
+    public Integer qcStatus;
+
     @Column(name = "REMARK")
     @ApiParam("备注")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -369,6 +369,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否寄售 1-是 2-否")
     private Integer consignation;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
     @Transient
     @ApiParam(value = "是否最早批次")
     public String isFifo;