816 add method

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

@@ -15,10 +15,10 @@ public class MesEnumUtil {
      * 质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PASS_FAIL{
+    public enum PASS_FAIL {
 
-        PASS(1,"合格"),
+        PASS(1, "合格"),
-        FAIL(2,"不合格");
+        FAIL(2, "不合格");
 
         private int value;
         private String description;
@@ -52,10 +52,10 @@ public class MesEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum METHOD_TYPE{
+    public enum METHOD_TYPE {
 
-        EXEC(10,"执行方法"),
+        EXEC(10, "执行方法"),
-        COMPLETE(20,"完成方法");
+        COMPLETE(20, "完成方法");
 
         private int value;
         private String description;
@@ -88,12 +88,12 @@ public class MesEnumUtil {
      * MesPlanOrder实体对应的status值   计划状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PLAN_ORDER_STATUS{
+    public enum PLAN_ORDER_STATUS {
 
-        CREATE(10,"创建"),
+        CREATE(10, "创建"),
-        DE_COMPOSE_ING(20,"分解中"),
+        DE_COMPOSE_ING(20, "分解中"),
-        DE_COMPOSE_ED(30,"分解完成"),
+        DE_COMPOSE_ED(30, "分解完成"),
-        CLOSE(40,"关闭");
+        CLOSE(40, "关闭");
 
         private int value;
         private String description;
@@ -126,14 +126,14 @@ public class MesEnumUtil {
      * MesWorkOrder实体对应的workOrderStatus值  工单状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_ORDER_STATUS{
+    public enum WORK_ORDER_STATUS {
 
-        CREATE(10,"创建"),
+        CREATE(10, "创建"),
-        LANDED(20,"下达"),
+        LANDED(20, "下达"),
-        OPEN(30,"开启"),
+        OPEN(30, "开启"),
-        PAUSE(40,"暂停"),
+        PAUSE(40, "暂停"),
-        CANCEL(50,"撤销"),
+        CANCEL(50, "撤销"),
-        CLOSE(60,"关闭");
+        CLOSE(60, "关闭");
 
         private int value;
         private String description;
@@ -166,11 +166,11 @@ public class MesEnumUtil {
      * MesWorkOrder实体对应的workOrderType值  工单类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_ORDER_TYPE{
+    public enum WORK_ORDER_TYPE {
 
-        STANDARD_ORDER(10,"标准工单"),
+        STANDARD_ORDER(10, "标准工单"),
-        BTS_ORDER(20,"BTS工单"),
+        BTS_ORDER(20, "BTS工单"),
-        ATTEMPT_ORDER(30,"试制工单");
+        ATTEMPT_ORDER(30, "试制工单");
 
         private int value;
         private String description;
@@ -203,9 +203,9 @@ public class MesEnumUtil {
      * MesPlanOrder实体对应的planType值  计划类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PLAN_ORDER_TYPE{
+    public enum PLAN_ORDER_TYPE {
 
-        STANDARD_ORDER(10,"标准");
+        STANDARD_ORDER(10, "标准");
 
         private int value;
         private String description;
@@ -238,10 +238,10 @@ public class MesEnumUtil {
      * MesPlanOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PALN_ORDER_SOURCE{
+    public enum PALN_ORDER_SOURCE {
 
-        MES("MES","来源于MES"),
+        MES("MES", "来源于MES"),
-        SAP("SAP","来源于SAP");
+        SAP("SAP", "来源于SAP");
 
         private String value;
         private String description;
@@ -262,7 +262,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -274,11 +274,11 @@ public class MesEnumUtil {
      * MesPlanOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_ORDER_SOURCE{
+    public enum WORK_ORDER_SOURCE {
 
-        MES("MES","来源于MES"),
+        MES("MES", "来源于MES"),
-        AMES("AMES","来源于AMES"),
+        AMES("AMES", "来源于AMES"),
-        SAP("SAP","来源于SAP");
+        SAP("SAP", "来源于SAP");
 
         private String value;
         private String description;
@@ -299,7 +299,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -311,12 +311,13 @@ public class MesEnumUtil {
      * MesQueueOrder实体对应的status值  队列主表状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QUEUE_ORDER_STATUS{
+    public enum QUEUE_ORDER_STATUS {
 
-        NORMAL(10,"正常"),
+        NORMAL(10, "正常"),
-        ONLINE(20,"已上线"),
+        ONLINE(20, "已上线"),
-        OFFLINE(30,"已下线"),
+        OFFLINE(30, "已下线"),
-        CLOSE(40,"已关闭"),;
+        CLOSE(40, "已关闭"),
+        ;
 
         private int value;
         private String description;
@@ -337,7 +338,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -349,10 +350,10 @@ public class MesEnumUtil {
      * MesQueueOrderDetail实体对应的status值  队列详情状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QUEUE_ORDER_DETAIL_STATUS{
+    public enum QUEUE_ORDER_DETAIL_STATUS {
 
-        NORMAL(10,"正常"),
+        NORMAL(10, "正常"),
-        CLOSE(20,"关闭");
+        CLOSE(20, "关闭");
 
         private int value;
         private String description;
@@ -373,7 +374,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -385,14 +386,15 @@ public class MesEnumUtil {
      * MesProduceSn实体对应的snStatus值  条码表条码状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PRODUCE_SN_STATUS{
+    public enum PRODUCE_SN_STATUS {
 
-        CREATE(10,"创建"),
+        CREATE(10, "创建"),
-        PROCESS(20,"加工"),
+        PROCESS(20, "加工"),
-        OFFLINE(30,"下线"),
+        OFFLINE(30, "下线"),
-        INSTOCKED(40,"入库"),
+        INSTOCKED(40, "入库"),
-        SHIPING(50,"发运"),
+        SHIPING(50, "发运"),
-        CLOSE(90,"关闭"),;
+        CLOSE(90, "关闭"),
+        ;
 
         private int value;
         private String description;
@@ -413,7 +415,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -425,11 +427,11 @@ public class MesEnumUtil {
      * MesProduceSn实体对应的printStatus值  条码表条码打印状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PRODUCE_SN_PRINT_STATUS{
+    public enum PRODUCE_SN_PRINT_STATUS {
 
-        CREATE(10,"创建"),
+        CREATE(10, "创建"),
-        ONLINE(20,"上线打印"),
+        ONLINE(20, "上线打印"),
-        OFFLINE(30,"下线打印");
+        OFFLINE(30, "下线打印");
 
         private int value;
         private String description;
@@ -450,7 +452,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -462,11 +464,11 @@ public class MesEnumUtil {
      * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PRODUCE_SN_QC_STATUS{
+    public enum PRODUCE_SN_QC_STATUS {
 
-        QUALIFIED(10,"合格"),
+        QUALIFIED(10, "合格"),
-        DEFECTED(20,"不合格"),
+        DEFECTED(20, "不合格"),
-        SCRAPED(30,"报废");
+        SCRAPED(30, "报废");
 
         private int value;
         private String description;
@@ -487,7 +489,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -499,11 +501,11 @@ public class MesEnumUtil {
      * MesPartCategory实体对应的categoryType值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PART_CATEGORY_TYPE{
+    public enum PART_CATEGORY_TYPE {
 
-        CATEGORY_ONE("Category1","类型1"),
+        CATEGORY_ONE("Category1", "类型1"),
-        CATEGORY_TWO("Category2","类型2"),
+        CATEGORY_TWO("Category2", "类型2"),
-        CATEGORY_THREE("Category3","类型3");
+        CATEGORY_THREE("Category3", "类型3");
 
         private String value;
         private String description;
@@ -524,7 +526,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (val.equals(values()[i].value) ) {
+                if (val.equals(values()[i].value)) {
                     tmp = values()[i].description;
                 }
             }
@@ -536,12 +538,12 @@ public class MesEnumUtil {
      * 工位程序交互时的业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATION_BUSI_TYPE{
+    public enum STATION_BUSI_TYPE {
-        MESSAGE("message","返回信息"),
+        MESSAGE("message", "返回信息"),
-        STEP_LIST("stepList","工步列表"),
+        STEP_LIST("stepList", "工步列表"),
-        STEP_CONTENT("stepContent","工步内容"),
+        STEP_CONTENT("stepContent", "工步内容"),
-        MODULE_CONTENT("moduleContent","组件内容"),
+        MODULE_CONTENT("moduleContent", "组件内容"),
-        TASK_COMPLETE("taskComplete","整个扫描完成");
+        TASK_COMPLETE("taskComplete", "整个扫描完成");
 
         private String value;
         private String description;
@@ -562,7 +564,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (val.equals(values()[i].value) ) {
+                if (val.equals(values()[i].value)) {
                     tmp = values()[i].description;
                 }
             }
@@ -574,12 +576,12 @@ public class MesEnumUtil {
      * 工位程序交互时的数据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATION_DATA_TYPE{
+    public enum STATION_DATA_TYPE {
-        TABLE("table","表格"),
+        TABLE("table", "表格"),
-        TEXT("text","正常文本"),
+        TEXT("text", "正常文本"),
-        EXP_TEXT("exp_text","异常文本"),
+        EXP_TEXT("exp_text", "异常文本"),
-        IMAGE("image","图片"),
+        IMAGE("image", "图片"),
-        BUTTON("button","按钮");
+        BUTTON("button", "按钮");
 
         private String value;
         private String description;
@@ -600,7 +602,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (val.equals(values()[i].value) ) {
+                if (val.equals(values()[i].value)) {
                     tmp = values()[i].description;
                 }
             }
@@ -612,12 +614,12 @@ public class MesEnumUtil {
      * 组织模型树形菜单level
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PROD_ORG_LEVEL{
+    public enum PROD_ORG_LEVEL {
 
-        LEVEL_ONE(1,"一级目录"),
+        LEVEL_ONE(1, "一级目录"),
-        LEVEL_TWO(2,"二级目录"),
+        LEVEL_TWO(2, "二级目录"),
-        LEVEL_THREE(3,"三级目录"),
+        LEVEL_THREE(3, "三级目录"),
-        LEVEL_FOUR(4,"四级目录");
+        LEVEL_FOUR(4, "四级目录");
 
         private int value;
         private String description;
@@ -638,22 +640,23 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
             return tmp;
         }
     }
+
     /**
      * 工步参数类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STEP_PARAM_TYPE{
+    public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10,"数字"),
+        QUALIFIED(10, "数字"),
-        DEFECTED(20,"字符串"),
+        DEFECTED(20, "字符串"),
-        SCRAPED(30,"可选值");
+        SCRAPED(30, "可选值");
 
         private int value;
         private String description;
@@ -674,7 +677,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val ) {
+                if (values()[i].value == val) {
                     tmp = values()[i].description;
                 }
             }
@@ -710,4 +713,80 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 动作类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_TYPE {
+
+        SEATS(10, "座椅"),
+        METAL(20, "金属件"),
+        FOAMING(30, "发泡");
+
+        private int value;
+        private String description;
+
+        ACTION_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;
+        }
+    }
+
+    /**
+     * 事件类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EVENT_TYPE {
+
+        SEATS(10, "座椅"),
+        METAL(20, "金属件"),
+        FOAMING(30, "发泡");
+
+        private int value;
+        private String description;
+
+        EVENT_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;
+        }
+    }
+
+
 }

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

@@ -42,7 +42,7 @@ public class MesStepParam extends BaseBean {
     @Column(name = "PARAM_NAME")
     @ApiParam("参数名称")
     private String paramName;
-
+    //text select
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")
     private String paramAttribute;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java

@@ -16,7 +16,4 @@ import java.util.List;
 @Repository
 public interface MesActionRepository extends BaseRepository<MesAction, Long> {
 
-    List<MesAction> findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted);
-
-    List<MesAction> findByActionCodeAndIsValidAndIsDeleted(String actionCode,Integer isValid,Integer isDeleted);
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java

@@ -16,10 +16,4 @@ import java.util.List;
 @Repository
 public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
 
-    List<MesEvent> findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted);
-
-    List<MesEvent> findByButtonCodeAndIsValidAndIsDeleted(String buttonCode,Integer isValid,Integer isDeleted);
-
-    List<MesEvent> findByEventCodeAndIsValidAndIsDeleted(String eventCode,Integer isValid,Integer isDeleted);
-
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -474,6 +474,26 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){
+        DdlPackBean packBean=getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean);
+        DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
+        return packBean;
+    }
+    public static DdlPackBean getMesEventByEventCode(String eventCode,String org){
+        DdlPackBean packBean=getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean);
+        DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
+        return packBean;
+    }
+    public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){
+        DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean);
+        return packBean;
+    }
+
+
+
     /**
      * 动作分页获取封装
      *
@@ -521,6 +541,13 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
+        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
+            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
+        }
+        return packBean;
+    }
     /**
      * 事件动作分页获取封装
      *