From 6baeeee71e32b05e18e6a6badc0b888f9f6ed1e4 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 15 Jan 2020 11:26:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?task=20`1392`=20=E8=B0=83=E6=95=B4=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5=20=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 39d2606..067cb20 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3379,7 +3379,7 @@ public class MesEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + STOP_PCS_CTL("stopPcsCtl", "停止监控"); private String value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index a17cee1..bff2ef0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1533,10 +1533,10 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), - SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), - SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), - SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java index d34c46d..ab30bd7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -19,11 +19,11 @@ public class StepResult { private String msg; public static StepResult getSuccessComplete() { - return new StepResult(true); + return new StepResult(true,""); } public static StepResult getNonComplete() { - return new StepResult(false); + return new StepResult(false,""); } public static StepResult getSuccessComplete(String msg) { From 61303a9f381fe981df62d3e4e8f48c0b7da38cae Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jan 2020 11:59:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 12 +++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 20 ++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 24 +++++++++++++++++++++- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index ecc426c..47b50bd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -266,6 +266,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index e474fc7..189a4f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean { @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") public Integer packageQty; + + @Column(name="PACK_SPEC") + @ApiParam(value = "包装规格") + public String packSpec; + + @Column(name="POCKET_NO") + @ApiParam(value = "容器编号") + public String pocketNo; + + @Column(name="PRINT_STATUS") + @ApiParam(value = "打印状态", example = "1") + public Integer printStatus; + + @Column(name="PACK_LEVEL") + @ApiParam(value = "包装层级", example = "1") + public Integer packLevel; + + @Column(name="MEMO") + @ApiParam(value = "备注") + public String memo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cdf4f66..0572e84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -171,11 +171,33 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); getStringBuilderPack(swebProcurementPlanOrder, packBean); return packBean; } /** + * 物理包装封装 + * + * @param wmsPackage + * @return + */ + public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) { + DdlPackBean packBean = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + getStringBuilderPack(wmsPackage, packBean); + return packBean; + } + + /** * 库存移动单查询封装 * * @param wmsDocMovementMaster @@ -1064,7 +1086,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); +// DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); From 9e34d99d9e8d1dde534fac4b895f0dc6a1990352 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Jan 2020 13:09:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 694c22a..91456a6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -121,14 +121,17 @@ public class Material extends BaseAPS { @Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小库存数量") + @FieldAnnotation(property = false) private Double minStockCount; @Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="安全库存数量") + @FieldAnnotation(property = false) private Double safeStockCount; @Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大库存数量") + @FieldAnnotation(property = false) private Double maxStockCount; @Column(name="ORDER_BATCH_PERIOD") From 68e7dc89064793bed9dc50351b4eeb74b6deecb5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 15 Jan 2020 17:23:32 +0800 Subject: [PATCH 4/6] =?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; } From 3f0646403f59f59cb9782283c74c88d496f5fcdf Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 15 Jan 2020 18:05:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7408=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=961=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/MesProduceSn.java | 3 ++- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 3 ++- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 3 ++- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 22 +++++++++++----------- 6 files changed, 20 insertions(+), 15 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 630ac63..f9f2eaf 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 @@ -30,7 +30,8 @@ import javax.persistence.Table; @Table(name = "MES_PROD_BIND_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "KP_SN"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "ITEM_PART_NO") }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { 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 a1585c7..440f2b9 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 @@ -26,7 +26,8 @@ import java.math.BigDecimal; @Table(name = "MES_PRODUCE_SN", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO") }) @Api("产品条码表") public class MesProduceSn extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index ab88546..a423281 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -26,6 +26,7 @@ import javax.persistence.*; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO"), @Index(columnList = "MODIFY_DATE_TIME") }) @Api("产品条码履历表") 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 eda7105..5bfd7b3 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 @@ -25,7 +25,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_DATA", indexes = { @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") + @Index(columnList = "SN"), + @Index(columnList = "partNo") }) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 6d526a0..b382132 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -27,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO") }) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { 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 071eb03..dbf4e42 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 @@ -1822,13 +1822,13 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); @@ -1871,7 +1871,7 @@ public class MesHqlPack { DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean); @@ -1935,10 +1935,10 @@ public class MesHqlPack { public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode); if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean); @@ -1974,13 +1974,13 @@ public class MesHqlPack { public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode); if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { - DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); + DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean); } if (mesQcCheckData.getCheckType() != null) { DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); @@ -2013,13 +2013,13 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean); From a1ec8d7293b5069e0857a8e7a2535232d78eb572 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jan 2020 19:52:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index b12010a..1f2f1d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.qty=qty; } + + public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){ + this.orderNo=orderNo; + this.partNo=partNo; + this.partNameRdd=partNameRdd; + this.qty=qty; + this.factQty=factQty; + this.locateNo=locateNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index dac3089..755a876 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean { @Column(name = "LOCATE_NO") @ApiParam("库位编号") + @AnnoOutputColumn(hidden = true) public String locateNo; @Column(name = "UNIT") @@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean { public String unit; @Transient - @ApiParam("存储区编号") + @ApiParam("存储区编号组") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; public WmsCSRange(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 0572e84..deee914 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1387,6 +1387,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); getStringBuilderPack(wmsCSOrderDetails, result);