From 85c4f94dcb6feb1bc0f7594fb3e5862c8f64806d Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Wed, 22 May 2019 13:20:58 +0800
Subject: [PATCH] =?UTF-8?q?MES=20model=E8=BD=AC=E7=A7=BB=E8=87=B3pojo-mes?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/model}/MesRouteModel.java      |  4 +---
 .../pojo/mes/model}/MesRouteProcessModel.java      |  3 +--
 .../i3plus/pojo/model/mes/SysOrganizeModel.java    | 23 ----------------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/MesRouteModel.java (78%)
 rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/MesRouteProcessModel.java (91%)
 delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java
similarity index 78%
rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java
index 46163cf..670a8bc 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java
@@ -1,7 +1,5 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
-import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java
similarity index 91%
rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java
index 14a8d46..1ce5e08 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java
@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
-import cn.estsh.i3plus.pojo.wms.bean.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java
deleted file mode 100644
index 6880ac3..0000000
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.model.mes;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesArea;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import io.swagger.annotations.ApiParam;
-
-import javax.persistence.Transient;
-import java.util.List;
-
-public class SysOrganizeModel extends SysOrganize{
-
-    @Transient
-    @ApiParam(value ="子集列表")
-    private List<MesArea> childTreeList;
-
-    public List<MesArea> getChildTreeList() {
-        return childTreeList;
-    }
-
-    public void setChildTreeList(List<MesArea> childTreeList) {
-        this.childTreeList = childTreeList;
-    }
-}