From ade905350227a9972a2e18bd91722f85b55e6bae Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 10:25:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93=E5=85=A5?= =?UTF-8?q?GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 24e0a52..9ce9917 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 @@ -2084,7 +2084,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); From 23bbde205707f357400ff3eb7d15c61127c6f95d Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:13:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?13315=2020027-=E8=BF=94=E4=BF=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4=E7=A0=81-202012-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index ef071db..0847a20 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("维修状态名称") private String repairStatusName; + @Transient + @ApiParam("产品二维码") + private String productSn; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c6b869821d31881d7a973614aa041dc2f924bcf Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:19:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93=E5=85=A5?= =?UTF-8?q?GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 09faa0d..efd9773 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 @@ -2081,7 +2081,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode); if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); @@ -2093,7 +2093,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -2102,7 +2102,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); } if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);