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

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

@@ -4484,7 +4484,9 @@ public class MesEnumUtil {
     public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        CANCEL(30, "取消");
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
 
         private int value;
         private String description;

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

@@ -5102,4 +5102,42 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 客户JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "FORMULA_CONTENT")
     @ApiParam("配方内容")
     private String formulaContent;
+
+    @Transient
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Transient
+    @ApiParam("子物料名称")
+    private String itemPartNo;
+
+    @Transient
+    @ApiParam("数量")
+    private long qty;
+
+    public MesQueueJitPlanDetail() {
+
+    }
+
+    public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) {
+        this.partNo = partNo;
+        this.itemPartNo = itemPartNo;
+        this.qty = qty;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java

@@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean {
     private String snp;
 
     @ApiParam(value = "包装规格")
-    @AnnoOutputColumn
+    @AnnoOutputColumn(required = false)
     private String packageSpec;
 
     @ApiParam(value = "备注")

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

@@ -157,4 +157,23 @@ public class WmsPartExtend extends BaseBean {
     @ApiParam(value = "自动采购数量")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Integer autoPurchaseQty;
+
+    @Column(name = "QC_SKIP_CYCLE")
+    @ApiParam(value = "质检跳批周期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer qcSkipCycle;
+
+    @Column(name = "QC_PASS_COUNT")
+    @ApiParam(value = "质检合格次数")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer qcPassCount;
+
+    @Column(name = "LAST_QC_TIME")
+    @ApiParam(value = "上次质检时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lastQcTime;
+
+    public Integer getQcPassCount() {
+        return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
+    }
 }