From 26fc821d1ac14e5a04cf7047fea61c7245d8c701 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 22 May 2019 10:48:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?MES=20model=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 12 ++-- .../i3plus/pojo/mes/model/SysOrganizeModel.java | 46 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 82 ++++++++++++++++++++++ 3 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index fa81998..228465a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -33,17 +33,21 @@ public class MesPartScheduleBom extends BaseBean { @Column(name="ITEM_PART_NO") @ApiParam("关联物料号") - private Integer itemPartNo; + private String itemPartNo; @Column(name="ITEM_QTY") @ApiParam("用量") - private String itemQty; + private Double itemQty; @Column(name="SCHEDULE_TYPE") @ApiParam("排程类型") - private Double scheduleType; + private Integer scheduleType; + + public double getItemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } public double getScheduletTypeVal() { - return this.scheduleType == null ? 0.0d : this.scheduleType; + return this.scheduleType == null ? 0 : this.scheduleType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java new file mode 100644 index 0000000..a3d574c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel { + + @Transient + @ApiParam(value ="父节点") + private Long parentId; + + @Transient + @ApiParam(value ="名称") + private String name; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 65347c7..06b8339 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -632,4 +632,86 @@ public class MesHqlPack { return packBean; } + + /** + * MES 物料分类信息查询条件封装 + * @param partCategory + * @return + */ + public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); + if (StringUtils.isNotEmpty(partCategory.getCategoryCode())){ + DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); + } + if (StringUtils.isNotEmpty(partCategory.getCategoryName())){ + DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); + } + + return packBean; + } + + /** + * MES 包装规格信息查询条件封装 + * @param packSpec + * @return + */ + public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); + if (StringUtils.isNotEmpty(packSpec.getSpecCode())){ + DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); + } + if (StringUtils.isNotEmpty(packSpec.getSpecName())){ + DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); + } + + return packBean; + } + + /** + * MES 产品类型信息查询条件封装 + * @param produceCategory + * @return + */ + public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())){ + DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); + } + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())){ + DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); + } + + return packBean; + } + + /** + * MES 关键件条码规则信息查询条件封装 + * @param kpsnRule + * @return + */ + public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); + if (StringUtils.isNotEmpty(kpsnRule.getPartNo())){ + DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); + } + + return packBean; + } + + /** + * MES 产品排程清单信息查询条件封装 + * @param partScheduleBom + * @return + */ + public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); + if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())){ + DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())){ + DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); + } + + return packBean; + } } From b581cbee63b30be177a22d3e33f1ef48fd1d9119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 22 May 2019 13:01:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 05c7e9d..eb0887c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -130,14 +130,26 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "呼叫人") private String callUser; + @Transient + @ApiParam(value = "呼叫人名字") + private String callUserName; + @Column(name = "CONFIRM_USER") @ApiParam(value = "响应人") private String confirmUser; + @Transient + @ApiParam(value = "响应人名字") + private String confirmUserName; + @Column(name = "RESET_USER") @ApiParam(value = "解决人") private String resetUser; + @Transient + @ApiParam(value = "解决人名字") + private String resetUserName; + @Column(name = "IS_SHIFT_CALL") @ApiParam(value = "是否转呼", example = "1") private Integer isShiftCall; From 85c4f94dcb6feb1bc0f7594fb3e5862c8f64806d Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 22 May 2019 13:20:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?MES=20model=E8=BD=AC=E7=A7=BB=E8=87=B3pojo-?= =?UTF-8?q?mes=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 childTreeList; - - public List getChildTreeList() { - return childTreeList; - } - - public void setChildTreeList(List childTreeList) { - this.childTreeList = childTreeList; - } -}