From 3a9e719005442c4d53c699941a0a742c40978e1c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 14 Jan 2020 10:45:56 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E3=80=90vda=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E5=88=86=E7=BB=84=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3311b77..a9b133d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + public String groupNo; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 35839db806dcc7e5561677e88a532ff9cacd1290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 13:26:23 +0800 Subject: [PATCH 02/16] =?UTF-8?q?BUG#7359=20=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E5=92=8C=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e618c9d..db1551c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -736,6 +736,16 @@ public class WmsEnumUtil { return tmp; } + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index fac11e3..e55cf6c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据业务类型") - private String busiTypeDesc; + @ApiParam(value = "关联单据业务类型代码") + private String busiTypeCode; @ApiParam(value = "计划日期") private String zdate; @@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "创建人") public String createUser; + @ApiParam(value = "关联单据类型") + public String refType; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.busiTypeDesc = busiTypeDesc; + this.busiTypeCode = busiTypeCode; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ea889c4..ef16765 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - public Integer busiType; - - @Column(name = "BUSI_TYPE_DESC") - @ApiParam("业务类型描述") - public String busiTypeDesc; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("业务类型代码") + public String busiTypeCode; @Column(name = "TRANS_TYPE_CODE_RDD") @ApiParam("交易类型") From fd1a0ebdb816fe05b43b4f27e02e29f3255a8d5b Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 14 Jan 2020 14:18:05 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1404?= =?UTF-8?q?=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 61 ++-------------------- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 13 +++++ 2 files changed, 16 insertions(+), 58 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java index b038988..f2ec4a3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -18,63 +18,8 @@ public class QcCheckStandardModel { private Long id; - @ApiParam("物料编码") - private String partNo; + @ApiParam("列头") + private String title; - @ApiParam("工作中心代码") - private String workCenterCode; - - @ApiParam("工作单元代码") - private String workCellCode; - - @ApiParam("检测类型") - private Integer checkType; - - @ApiParam("检测项") - private String checkItem; - - @ApiParam("检测标准") - private String checkStandard; - - @ApiParam("检测指导") - private String checkGuide; - - @ApiParam("频率") - private String checkFrequency; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("检测结果") - private String checkResult; - - @ApiParam("检测值") - private String checkValue; - - @ApiParam("检测项类型") - private String checkItemType; - - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - private List childQcList; - - public QcCheckStandardModel() { - } - - public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } + private List resultList; } 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 32ad09c..b11e807 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 @@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "动作类型") private String actionType; + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + + @ApiParam(value = "动作类型名称") + private String actionTypeName; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("原材料零件名称") + private String itemPartName; + + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; } From ad8e51dfaed814399af83969dddc1d2bfca6634e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 14 Jan 2020 17:36:36 +0800 Subject: [PATCH 04/16] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 0d4e335..8f9fb9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -224,6 +224,7 @@ public class WmsPart extends BaseBean { @Column(name="verb_num") @ApiParam(value = "单次拆包数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") From 0e54d9a5b6b220535380dd67e9a71b1ea34e9dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 19:53:13 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1403=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8BisCommitRefMove=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BAcom?= =?UTF-8?q?mitMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a220465..4da9c3f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4875,4 +4875,50 @@ public class WmsEnumUtil { } } + + /** + * 流程提交类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_COMMIT_MODE { + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), + REF_GROUP(30, 30, "关联分组号提交"); + + private int value; + private int code; + private String description; + + GROUP_COMMIT_MODE(int value, int code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } \ No newline at end of file From cb7f868d648dd0927f3285332cbde709313488a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 20:14:24 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1403=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8BisCommitRefMove=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BAcom?= =?UTF-8?q?mitMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 41e57d1..5528099 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer autoInit; - // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) - @ApiParam(value = "是否连带提交创建状态移动单", example = "2") - @AnnoOutputColumn - private Integer isCommitRefMove; + @Column(name = "COMMIT_MODE", nullable = false) + @ApiParam(value = "提交移动单模式") + @AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class) + private Integer commitMode; // 1=true, 2 = false @Column(name = "IS_AUTO_COMMIT", nullable = false) - @ApiParam(value = "是否自动提交", example = "1") + @ApiParam(value = "是否自动提交") @AnnoOutputColumn private Integer isAutoCommit; @@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } - public int getIsCommitRefMoveVal() { - return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + public int getCommitModeVal() { + return this.commitMode == null ? 0 : this.commitMode.intValue(); } public int getIsAutoCommitVal() { From fff79a784690dc32d853f12256e356b7d98c2a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 15 Jan 2020 09:52:58 +0800 Subject: [PATCH 07/16] =?UTF-8?q?GROUP=5FCOMMIT=5FMODE=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 4da9c3f..b3eb04f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4881,8 +4881,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_MODE { - JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), - REF_GROUP(30, 30, "关联分组号提交"); + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交"); private int value; private int code; From 6baeeee71e32b05e18e6a6badc0b888f9f6ed1e4 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 15 Jan 2020 11:26:37 +0800 Subject: [PATCH 08/16] =?UTF-8?q?task=20`1392`=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=20=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AE=9E=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 09/16] =?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 10/16] =?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 11/16] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7408=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=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 12/16] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7408=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=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 b64327831a683994087e0799f5c5b74aa93a8125 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Jan 2020 18:58:46 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E3=80=90=207402=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN?= =?UTF-8?q?=E7=BB=84=E5=8F=B7=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E4=B9=9F=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN?= =?UTF-8?q?=E7=BB=84=E5=8F=B7=20=E3=80=91bug7402?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index c9a988d..417c5f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable { @Transient public String vendorEmail; + @ApiParam(value = "集装箱号") + @Transient + public String containerNo; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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..31bab21 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 @@ -231,7 +231,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); @@ -635,6 +635,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result); // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { @@ -2434,6 +2435,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); From a1ec8d7293b5069e0857a8e7a2535232d78eb572 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jan 2020 19:52:49 +0800 Subject: [PATCH 14/16] =?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); From 7f7c9ebf6e92f61a2d19e8ff9f62aca4c6906f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 15 Jan 2020 19:53:27 +0800 Subject: [PATCH 15/16] =?UTF-8?q?SAP=E6=8C=87=E4=BB=A4=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=E8=8B=A5=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=B0=E4=BA=86=E8=AE=B0=E5=BD=95=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=96=B0=E5=A2=9E=E4=BA=86=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=AD=A4=E7=BB=84=E4=BB=B6=E6=97=B6=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=B8=AD=E4=B8=80=E5=AE=9A=E5=BE=97=E5=AD=98=E5=9C=A8?= =?UTF-8?q?ORDER=5FNO;=20=E5=AE=9A=E6=97=B6=E9=87=8D=E6=8E=A8=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=85=A5JOB?= =?UTF-8?q?=E5=AE=B9=E9=94=99=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9+?= =?UTF-8?q?=E7=95=99=E4=B8=AASWAGGER=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 99eb8af..f3856c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -187,4 +187,8 @@ public class WmsDocMovementMaster extends BaseBean { public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } + + public int getBusiTypeVal() { + return this.busiType == null ? 0 : this.busiType; + } } From f7c98e39825e3d1f7b673231fc27bc6cacf0e2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 16 Jan 2020 09:18:56 +0800 Subject: [PATCH 16/16] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/annotation/FieldAnnotation.java | 4 +++- .../estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 +++++++------- .../estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 4 ++++ .../i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 6067155..d23889d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -9,7 +9,7 @@ import java.lang.annotation.*; */ @Documented @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) +@Target({ElementType.FIELD, ElementType.TYPE}) public @interface FieldAnnotation { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); @@ -33,4 +33,6 @@ public @interface FieldAnnotation { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; + // 下拉枚举名称 + String enumName() default ""; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java index 22e8533..4704dd1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,4 +18,7 @@ public class WmsSearchGroupModel { @ApiParam(value = "组列表") private List searchElementModelList; + + @ApiParam(value = "分页组件") + private Pager pager; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8f9fb9f..58179a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -112,7 +112,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -137,7 +137,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @@ -182,7 +182,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -207,7 +207,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -228,12 +228,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index b1f3e68..22dfa8d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "字段类型") private String fieldType; + @Column(name = "ENUM_NAME") + @ApiParam(value = "字段枚举名称") + private String enumName; + @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") private String entityName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index 302f426..5fd19b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -21,6 +21,7 @@ import javax.persistence.*; @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { @Index(columnList = "FIELD_NAME"), + @Index(columnList = "FIELD_TYPE"), @Index(columnList = "SEARCH_NAME"), @Index(columnList = "USER_CODE") }) @@ -40,6 +41,10 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "标题名称") private String titleName; + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + @Column(name = "CONDITION_EXPRE") @ApiParam(value = "条件表达式:>,<,>=等") private String conditionExpre; 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 18b3395..ba45abb 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 @@ -2767,8 +2767,8 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result); - DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result); + DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); getStringBuilderPack(searchElementFunction, result); return result; }