[任务：1435 计划管理]

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

@@ -4243,4 +4243,40 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * mes生产队列是否锁定
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_IS_LOCK {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_IS_LOCK(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/MesQueueJitActual.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -100,4 +101,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("特殊标识名称")
     private String specialFlagName;
 
+    @Transient
+    @ApiParam(value = "下达按钮编号")
+    public String buttonCode;
+
 }

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

@@ -81,7 +81,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     private String custCode;
 
     @Column(name = "WORK_TYPE")
-    @ApiParam("区域代码")
+    @ApiParam("工单类型")
     private String workType;
 
     @Column(name = "QUEUE_TYPE")
@@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("截至车号")
     private String custFlagNoEnd;
 
+    @Transient
+    @ApiParam("工单类型名称")
+    private String workTypeName;
+
+    @Transient
+    @ApiParam("锁定标识名称")
+    private String isLockName;
+
+    @Transient
+    @ApiParam("队列类型名称")
+    private String queueTypeName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -227,16 +227,16 @@ public class MesHqlPack {
         }
 
         if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
-            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean);
+            DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
-            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
-            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
         }
         if (mesQueueOrder.getQueueType() != null) {
-            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean);
+            DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);
         }
 
         // 只查询创建状态的队列
@@ -2219,4 +2219,22 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 生产组
+     *
+     * @param produceGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProduceGroup(MesProduceGroup produceGroup, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(produceGroup, organizeCode);
+        if (!StringUtils.isEmpty(produceGroup.getPgCode())) {
+            DdlPreparedPack.getStringLikerPack(produceGroup.getPgCode(), "pgCode", packBean);
+        }
+        if (!StringUtils.isEmpty(produceGroup.getPgName())) {
+            DdlPreparedPack.getStringLikerPack(produceGroup.getPgName(), "pgName", packBean);
+        }
+        return packBean;
+    }
 }