提交

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

@@ -162,16 +162,18 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLAN_ORDER_STATUS {
 
-        CREATE(10, "创建"),
+        CREATE(10, "CREATED", "创建"),
-        DE_COMPOSE_ING(20, "分解中"),
+        DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"),
-        DE_COMPOSE_ED(30, "分解完成"),
+        DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"),
-        CLOSE(40, "关闭");
+        CLOSE(40, "CLOSE", "关闭");
 
         private int value;
+        private String code;
         private String description;
 
-        PLAN_ORDER_STATUS(int value, String description) {
+        PLAN_ORDER_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -179,6 +181,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -830,7 +836,7 @@ public class MesEnumUtil {
     public enum CONFIG_TYPE {
 
         FASTDFS_SAVE_PATH(10, "savePath"),
-        NGINX_IP(20,"nginxIp");
+        NGINX_IP(20, "nginxIp");
 
         private int value;
         private String description;

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

@@ -67,4 +67,8 @@ public class GenSerialNoModel extends BaseBean {
     private String currentNumber;
 
 
+    public GenSerialNoModel(String ruleCode){
+        this.ruleCode=ruleCode;
+    }
+
 }

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

@@ -454,7 +454,7 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
@@ -519,6 +519,12 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesActionExcludeById(MesAction mesAction, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesAction.getId(), "id", packBean);
+        return packBean;
+    }
 
     /**
      * 动作分页获取封装
@@ -860,7 +866,7 @@ public class MesHqlPack {
      */
 
     public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1112,6 +1118,7 @@ public class MesHqlPack {
 
     /**
      * Mes条码生成规则
+     *
      * @param numberRule
      * @param organizeCode
      * @return
@@ -1137,6 +1144,7 @@ public class MesHqlPack {
 
     /**
      * mes-pcn定时任务清单
+     *
      * @param mesPcnTask
      * @param organizeCode
      * @return