JIS

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

@@ -187,15 +187,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -69,9 +69,9 @@ public class MesPart extends BaseBean {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CATEGORY")
+    @Column(name = "PRODUCE_CTGY_CODE")
-    @ApiParam("产品类型")
+    @ApiParam("产品类型代码")
-    private String produceCategory;
+    private String produceCategoryCode;
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +42,20 @@ public class QueueJisModel implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("明细状态名称")
+    private String detailStatusName;
+
+    public String getStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
+    }
+
+    public String getDetailStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
+    }
+
     public QueueJisModel() {
     }
 
@@ -57,4 +72,5 @@ public class QueueJisModel implements Serializable {
         this.detailStatus = detailStatus;
         this.serialNumber = serialNumber;
     }
+
 }