From e268ed86a999d89a604973f73189fbf7e0465cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 20 Oct 2020 15:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9011934=2019081-=E5=B7=A5=E4=BD=8DBOM?= =?UTF-8?q?=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=92=8C=E5=B7=A5=E4=BD=8D=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6-20201020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 ++ 2 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 4cd5e8a..c14092e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -217,6 +217,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient + @ApiParam("缺陷名称") + private String defectName; + + @Transient + @ApiParam("维修状态") + private Integer repairStatus; + public MesProduceSn() { } 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 9b7067b..5e60a3c 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 @@ -783,6 +783,8 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); return packBean; }