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 childTreeList; - - public List getChildTreeList() { - return childTreeList; - } - - public void setChildTreeList(List childTreeList) { - this.childTreeList = childTreeList; - } -}