From c442845f942958f549bfd93c425cd4596d1150ec Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Tue, 13 Oct 2020 20:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E5=BA=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java  | 11 +++++++----
 .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java    |  3 ++-
 .../cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java   |  8 ++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 3af6f5c..03ff681 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -2063,7 +2063,8 @@ public class MesEnumUtil {
         MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"),
         MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"),
         MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
-        MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入");
+        MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
+        MES_JISA(640, "jisaExcelService", "JISA导入");
 
         private int value;
         private String service;
@@ -3415,7 +3416,7 @@ public class MesEnumUtil {
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
         SPARE_RETURN_REPAIR(140, "客退备件返修"),
-        HOP_SEQ_ORDER(150, "跳序工单");
+        SEIZE_SEAT_ORDER(150, "占位工单");
 
         private int value;
         private String description;
@@ -4612,7 +4613,8 @@ public class MesEnumUtil {
         LANDED(20, "下达"),
         CANCEL(30, "取消"),
         OFFLINE(40, "下线"),
-        SHIPMENT(50, "发运");
+        SHIPMENT(50, "发运"),
+        SPECIAL(60, "特殊标识");
 
         private int value;
         private String description;
@@ -4648,7 +4650,8 @@ public class MesEnumUtil {
     public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空"),
-        ERR_PERCH(30, "异常占位");
+        ERR_PERCH(30, "异常占位"),
+        PERCH_HANDLE(40, "占位处理");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 99133a8..bcf75a5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -1916,7 +1916,7 @@ public class MesPcnEnumUtil {
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
         SPARE_RETURN_REPAIR(140, "客退备件返修"),
-        HOP_SEQ_ORDER(150, "跳序工单");
+        SEIZE_SEAT_ORDER(150, "占位工单");
 
         private int value;
         private String description;
@@ -2071,6 +2071,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_STATUS {
 
+        WAIT_LANDED(5, "待下达"),
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
index 64e9e70..31edd81 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java
@@ -4,6 +4,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Description:
  * @Author: jokelin
@@ -71,6 +74,11 @@ public class QueueJitActualModel {
     @ApiParam("物料号")
     private String partName;
 
+    @ApiParam("mgn标识")
+    private String mgnFlag;
+
+    @ApiParam("单元格编号")
+    private Map<String, String> cellNoMap = new HashMap<>();
 
     public QueueJitActualModel() {