Merge branch 'test' into dev

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

@@ -6098,4 +6098,54 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 扭矩枪版本
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TORQUE_VERSION {
+        PF6_2_0("PF6-2.0", "002000010030    00  \0", "PF6 2.0"),
+        PF6_3_0("PF6-3.0", "002000010060    00  \0", "PF6 3.0");
+
+        private String value;
+        private String code;
+        private String description;
+
+        TORQUE_VERSION(String code, String value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 TORQUE_VERSION getByCode(String code) {
+            for (TORQUE_VERSION torqueVersion : values()) {
+                if (torqueVersion.getCode().equals(code)) {
+                    return torqueVersion;
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -816,4 +816,102 @@ public class PtlEnumUtil {
         }
     }
 
+    /**
+     * 完成器音乐枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINISH_TAG_LIGHT_MUSIC_CMD {
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 标签显示器亮灯颜色枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAG_LIGHT_COLOR_CMD {
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
 }

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

@@ -138,6 +138,8 @@ public class StepPrintSnModel extends MesProduceSn {
     private String jitSeq;
     @ApiParam("产品位置名称")
     private String produceCategoryName;
+    @ApiParam("配置代码")
+    private String cfgCode;
 
     @ApiParam("版本号")
     private String versionNo;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -375,4 +375,47 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean);
         return packBean;
     }
+
+    /**
+     * 区段
+     * @param section
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlSection(PtlSection section, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(section, organizeCode);
+        DdlPreparedPack.getStringLikerPack(section.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionNo(), "sectionNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionName(), "sectionName", packBean);
+        return packBean;
+    }
+
+    /**
+     * 控制器
+     * @param control
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlControl(PtlControl control, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(control, organizeCode);
+        DdlPreparedPack.getStringLikerPack(control.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlNo(), "controlNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlName(), "controlName", packBean);
+        DdlPreparedPack.getNumEqualPack(control.getControlType(), "controlType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 物料
+     * @param part
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlPart(PtlPart part, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
+        DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(part.getPartType(), "partType", packBean);
+        return packBean;
+    }
 }