天津麦格纳添加出入库事务表枚举

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

@@ -3322,7 +3322,8 @@ public class MesEnumUtil {
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
         private String description;
@@ -7095,4 +7096,86 @@ public class MesEnumUtil {
         }
 
     }
+
+    /**
+     * 涂装导入--反喷标识（Y-正常；F-反喷）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REVERSE_SPRAY_MARK {
+        REVERSE_SPRAY("F", "反喷"),
+        NORMAL("Y", "正常");
+
+        private String value;
+        private String description;
+
+        REVERSE_SPRAY_MARK(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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MES_出入库事务表--事务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TRANS_TYPE {
+
+        OUTSTOCK(10, "出库"),
+        INSTOCK(20, "入库"),
+        GOBACK(30, "退回");
+
+        private int value;
+        private String description;
+
+        PACKAGE_TRANS_TYPE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer 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/sqlpack/MesHqlPack.java

@@ -3326,4 +3326,28 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 预装区域查询
+     *
+     * @param packageTrans
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode);
+        if (!StringUtils.isEmpty(packageTrans.getTransType())) {
+            DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean);
+        }
+        if (!StringUtils.isEmpty(packageTrans.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    packageTrans.getCreateDateTimeStart(),
+                    packageTrans.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }