Merge remote-tracking branch 'origin/dev' into dev

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

@@ -316,7 +316,8 @@ public class MesEnumUtil {
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
-        CLOSE(40,"已关闭"),;
+        CLOSE(40, "已关闭"),
+        ;
 
         private int value;
         private String description;
@@ -392,7 +393,8 @@ public class MesEnumUtil {
         OFFLINE(30, "下线"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
-        CLOSE(90,"关闭"),;
+        CLOSE(90, "关闭"),
+        ;
 
         private int value;
         private String description;
@@ -645,6 +647,7 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 工步参数类型
      */
@@ -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;
+    }
     /**
      * 事件动作分页获取封装
      *

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

@@ -167,7 +167,7 @@ public class WmsTransQuan extends BaseBean {
 
     public WmsTransQuan(String organizeCode,String partNo,String partNameRdd,String transCode,String unit,String whNo,String zoneNo,
                         Double qty,Double failQty,Double holdQty,Double scrapQty,Double qcQty,Double rinQty,
-                        Double freezeQty,Double consignQty,Double lockQty){
+                        Double freezeQty,Double consignQty,Double lockQty,String createUser,String createDatetime){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -184,6 +184,8 @@ public class WmsTransQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
 
     }