From 68e7dc89064793bed9dc50351b4eeb74b6deecb5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 15 Jan 2020 17:23:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7408=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 3 +- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 20 ++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 58 +++++++++++++--------- 3 files changed, 56 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index b11e807..630ac63 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -29,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_BIND_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") + @Index(columnList = "KP_SN"), + @Index(columnList = "CREATE_DATE_TIME") }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 1daf186..eda7105 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -93,4 +93,24 @@ public class MesQcCheckData extends BaseBean { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("班次") + private String shiftCode; + + @Transient + @ApiParam("班组") + private String shiftGroupName; + + @Transient + @ApiParam("班长") + private String squadLeader; + + @Transient + @ApiParam("工作单元名称") + private String workCellName; } 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 934414c..071eb03 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 @@ -1849,10 +1849,12 @@ public class MesHqlPack { // mesProduceSn.getOutWorkCenterEndTime(), // "outWorkCenterTime", packBean, true); } - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -1865,8 +1867,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode); - if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean); + if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) { + DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); @@ -1892,15 +1894,17 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); } - DdlPreparedPack.timeBuilder( - mesProdBindRecord.getCreateDateTimeStart(), - mesProdBindRecord.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProdBindRecord.getCreateDateTimeStart(), + mesProdBindRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } /** - * 物料追溯 + * 包装明细 * * @param ifPackageDetail * @param organizeCode @@ -1951,10 +1955,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) { DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean); } - DdlPreparedPack.timeBuilder( - mesRepairRecord.getCreateDateTimeStart(), - mesRepairRecord.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesRepairRecord.getCreateDateTimeStart(), + mesRepairRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -1976,7 +1982,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); } - if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) { + if (mesQcCheckData.getCheckType() != null) { DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) { @@ -1985,10 +1991,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean); } - DdlPreparedPack.timeBuilder( - mesQcCheckData.getCreateDateTimeStart(), - mesQcCheckData.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesQcCheckData.getCreateDateTimeStart(), + mesQcCheckData.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -2028,10 +2036,12 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - DdlPreparedPack.timeBuilder( - mesProduceSnTravel.getCreateDateTimeStart(), - mesProduceSnTravel.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSnTravel.getCreateDateTimeStart(), + mesProduceSnTravel.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; }