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

.gitignore

@@ -12,4 +12,5 @@ target
 *.class
 .md
 *.log
-*.properties
+*.properties
+.DS_Store

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

@@ -5532,4 +5532,52 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY_NAME {
+
+        FL("FL", "前右"),
+        FR("FR", "前左"),
+        RL("RL", "后左"),
+        RR("RR", "后右");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY_NAME(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;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -95,6 +95,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("后移数量")
     private Integer backwardNum;
 
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -170,4 +170,12 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam(value = "零件号")
     public String partNo;
 
+    @Transient
+    @ApiParam(value = "客户零件号")
+    public String custPartNo;
+
+    @Transient
+    @ApiParam(value = "qty")
+    public Integer qty;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1375,7 +1375,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
-            DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
+            DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result);
         }
         if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
             wmsStockSn.setQualityDateTimeStart("");