From 5739ac27bb64088bd52d83c709b50dca2d7fdf07 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 4 Aug 2020 20:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 4 ++++ .../i3plus/pojo/mes/bean/{template => }/MesWorkCellDefect.java | 10 +++++++++- .../pojo/mes/repository/MesWorkCellDefectRepository.java | 2 +- .../pojo/mes/repository/MesWorkCellDefectsRepository.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{template => }/MesWorkCellDefect.java (85%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index a4a2dca..c7cdeb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable { private String defectLocation; @Transient + @ApiParam("颜色值") + private String colorValue; + + @Transient @ApiParam("缺陷类型子集") private List mesDefectList; public MesDefect() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 9f87ea7..3b1c38e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "BUSINESS_TYPE_NAME") @ApiParam("业务类型名称") private String businessTypeName; + + @Column(name = "COLOR_VALUE") + @ApiParam("颜色值") + private String colorValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 025ae54..25ac166 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.bean.template; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @ApiParam("物料集") private String partAssemble; + @Column(name = "AREA_CODE") + @ApiParam("物料集") + private String areaCode; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + @Transient @ApiParam("缺陷名称") private String defectCodeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java index 43b09f2..6cf2246 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java index be056c0..ad54293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** * @Description: 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 cd30d03..d0caed6 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 @@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils;