From 20b40ce29475e4b919299efe06011ce32c52f6c5 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 18 Sep 2020 15:02:14 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=AD=E8=88=AA-D?= =?UTF-8?q?B=E5=A4=8D=E6=A0=B8=E9=A1=B9=20=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) 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 9c495fe..dfb9f7f 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 @@ -5211,4 +5211,45 @@ public class MesPcnEnumUtil { } } + /** + * 中航DB数据检查配置-DB复核项 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DB_DATA_CHECK_ITEM { + PART_NO_NULL(10, "物料为空复核"), + PART_NO_ORDER(20, "零件工单匹对复核"), + SERIA_LNUMBER_REPEAT(30, "过程条码重复复核"), + SERIA_LNUMBER_NULL(40, "过程条码为空复核"), + PRODUCT_SN_REPEAT(50, "产品二维码重复复核"), + PRODUCT_SN_NULL(60, "产品二维码为空复核"), + KEY_DATA_FILED_NULL(70, "质量关键字段为空复核"), + QC_FAIL_MAX_COUNT(80, "缺陷类型连续超过设定数复核"); + + private int value; + private String description; + + MES_DB_DATA_CHECK_ITEM(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From fa467a2e0d814a1eb32a80d25615e213b0547af0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 22:10:50 +0800 Subject: [PATCH 02/25] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6dev=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 95f008a60267ad9f38361a1585410f57b6a43663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 19 Sep 2020 13:20:40 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E7=BB=84=E8=A3=85=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=89=98=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=89=A9=E6=96=99=E9=A2=9C=E8=89=B2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BB=8E=E7=89=A9=E6=96=99=E8=A1=A8=E4=B8=AD=E5=8F=96=E9=97=AE?= =?UTF-8?q?=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/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index bd59557..eb0072f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -104,6 +104,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("颜色代码") private String colorCode; + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") private Integer shelvesAmount; From 895eb461aba98df24c36e1bda4426567bf8a9ec8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 19 Sep 2020 13:31:40 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 8 +++++++ .../i3plus/pojo/mes/model/DataReviewModel.java | 9 ++++++++ .../pojo/mes/model/ProductDataCacheModel.java | 3 +++ 4 files changed, 46 insertions(+) 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 a4c6cd6..ebde426 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 @@ -13,6 +13,32 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 物料校验项数据查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CHECK_DATA_TYPE { + ALL_DATA(1, "所有数据"), + LAST_DATA(2, "最后一条数据"); + + private int value; + private String description; + + PART_CHECK_DATA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + } + + /** * 注塑生产操作模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 8cbe1c3..90ec210 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -53,6 +53,14 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("记录数量表达式") private String recordNumSpelExpress; + @Column(name = "DATA_TYPE") + @ApiParam("数据查询类型") + private Integer dataType = 1; + + @Column(name = "LIMIT_TIMES") + @ApiParam("限定检测次数") + private Integer limitTimes; + @Column(name = "RECORD_NUM_DESC") @ApiParam("校验表达式描述") private String recordNumDesc; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 843eb9c..77997e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,6 +22,12 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; + @ApiParam("限定次数") + private String limitTimes; + + @ApiParam("检测次数") + private String checkTimes; + @ApiParam("对象代码") private String objectCode; @@ -31,6 +37,9 @@ public class DataReviewModel { @ApiParam("是否合格") private String reviewResult; + @ApiParam("显示标识") + private String showFlag; + @ApiParam("关键件颜色") private String keyPartColor; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java index 16d5f94..ae6e97a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -21,4 +21,7 @@ public class ProductDataCacheModel { @ApiParam("字段名称") private List productDataModelList; + @ApiParam("创建时间") + private String createDatetime; + } From 10edb8ebaedebe43b23cbf051c07219ee265137b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 19 Sep 2020 17:51:17 +0800 Subject: [PATCH 05/25] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184=20?= =?UTF-8?q?06=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 1840675..e221563 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -74,16 +74,16 @@ public class WmsWorkCenter extends BaseBean { @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer preReadyMinute; @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "拉动区间时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullRangeMinute; @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") @ApiParam(value = "下次拉动时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private String nextPullTime; } 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 01ba990..366c361 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 @@ -219,13 +219,18 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); + + getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; From 72502a863bb3b65e68a31ff129c7e70b6734585d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 19 Sep 2020 19:32:21 +0800 Subject: [PATCH 06/25] Fix Bug #11490 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 55 +++++++++++++++++++++- .../pojo/mes/bean/MesQueueJitActualDetail.java | 2 +- .../pojo/mes/bean/MesWorkCellPointGroup.java | 4 ++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 5 +- 5 files changed, 67 insertions(+), 5 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 69d0cb2..769dc34 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 @@ -3326,7 +3326,8 @@ public class MesEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -6658,7 +6659,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"); + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); private Integer value; private String code; 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 ebde426..c076230 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 @@ -1915,7 +1915,8 @@ public class MesPcnEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -5374,4 +5375,56 @@ public class MesPcnEnumUtil { } } + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); + + private Integer value; + private String code; + private String description; + + GROUP_SIDE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index ca86eb4..f0f5944 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -110,7 +110,7 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "IS_EMPTY") @ApiParam("是否放空") - private Integer isEmpty; + private Integer isEmpty = 2; @Transient @ApiParam("工单类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 91a7275..719ae64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -75,6 +75,10 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("显示颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b16d1f9..5268375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -336,7 +336,8 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + String partNo, String prodCfgTypeCode) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; @@ -344,6 +345,8 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.produceCategoryCode = produceCategoryCode; this.workType = workType; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; } // getQueueJitActualJitSeq From 352db6a7fad14c0f4a61484fda78d6d535b4d0c6 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 19 Sep 2020 19:39:28 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsServiceLog.java | 71 ++++++++++++++++++++++ .../wms/repository/WmsServiceLogRepository.java | 16 +++++ 2 files changed, 87 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java new file mode 100644 index 0000000..0e015db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : 用户需要查询的服务调用详细日志 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 15:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SERVICE_LOG") +@Api("服务调用详细日志") +public class WmsServiceLog extends BaseBean { + + private static final long serialVersionUID = 1285495680337747968L; + + @Column(name = "CALL_TIME") + @ApiParam("调用时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String callTIme; + + @Column(name = "SERVICE_CODE") + @ApiParam("服务代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceCode; + + @Column(name = "SERVICE_NAME") + @ApiParam("服务名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceName; + + @Column(name = "JOB_CODE") + @ApiParam(value = "JOB代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobCode; + + @Column(name = "JOB_NAME") + @ApiParam(value = "JOB名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobName; + + @Lob + @Column(name = "OUTPUT_MESSAGE") + @ApiParam(value = "输出信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String outPutMessage; + + @Column(name = "LEVEL") + @ApiParam(value = "日志级别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String level; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java new file mode 100644 index 0000000..75ea2be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsServiceLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 服务调用详细日志表 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 16:04 + * @Modify: + **/ +@Repository +public interface WmsServiceLogRepository extends BaseRepository { +} From d0553746133788d6762f3b83130e66ad0288d585 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 20 Sep 2020 11:11:21 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2SQL=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From 0c93ee587787071010ea290b968d430506b18438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 11:19:14 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E5=92=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93=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/mes/sqlpack/MesPcnHqlPack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index bcac673..05301f8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -394,6 +394,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); } + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); } From 16a2d75a1720660c15f5fcc148a2dbd8c2de008f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sun, 20 Sep 2020 11:20:20 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5job=E7=9A=84sqlserver=E4=B8=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=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/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From d5e356938ee53b5ca1561b805636811c442768c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 16:59:54 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=98=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index c809906..4c1f98a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -156,6 +156,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("明细总数") private Integer detailTotal = 0; + @Transient + @ApiParam("托包规数量") + private Double qty2; + public MesPackage() { } 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 772a97b..b9a1af3 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 @@ -206,6 +206,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("电检结果") private String electricResult; + @Transient + @ApiParam("包规数量") + private Double packageQty; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 232abdafd328a045d4e82f8a1c4ee106df9e9c3d Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 20 Sep 2020 20:21:16 +0800 Subject: [PATCH 12/25] =?UTF-8?q?10984=20=E7=BB=84=E8=A3=85=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=AE=B1=E6=9D=A1=E7=A0=81=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=EF=BC=81-2020-09-01,=E9=9C=80=E6=B1=82?= =?UTF-8?q?=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/mes/sqlpack/MesPcnHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index bcac673..bf668e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -107,6 +107,8 @@ public class MesPcnHqlPack { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; } From 8fb9760f82e5bff4f20a68bd1297cb859b50b3ac Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 20 Sep 2020 20:37:46 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E5=B5=8C=E5=A5=97=E4=BA=86=EF=BC=8C=E6=AD=A4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E7=94=A8=E5=B0=B1=E5=88=A0=E6=8E=89?= =?UTF-8?q?=E3=80=82StationRequestBean->MesStateMachineStatus->StepResult-?= =?UTF-8?q?>StationRequestBean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 2fb1c74..db1831e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -98,9 +98,9 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("前端显示颜色") private String color; - @Transient - @ApiParam("状态执行情况") - private StepResult stepResult; +// @Transient +// @ApiParam("状态执行情况") +// private StepResult stepResult; @Transient @ApiParam("是否执行下个扫描信息") From 07f6aabd72f5700be42c8e9baa5236865f8144f8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 10:36:59 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 8169f1f..01fecb2 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 @@ -334,6 +334,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "电话号码") private String custTel; + @Transient + @ApiParam(value = "过滤业务类型") + private String filterBusiType; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } 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 366c361..541097e 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 @@ -218,10 +218,18 @@ public class WmsHqlPack { public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); - //查询参数封装 + //查询参数封装PROD_SCRAP DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + //滤掉业务类型 + if (!StringUtil.isEmpty(wmsDocMovementMaster.getFilterBusiType())) { + List filterBusiType = new ArrayList<>(); + for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { + filterBusiType.add(Integer.parseInt(busiType)); + } + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", packBean); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); From f22239501530b743763e73132b9f6169d948e005 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 21 Sep 2020 10:50:05 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E8=A5=84=E9=98=B3=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E6=A0=B8=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B7=A5=E6=AD=A5=E3=80=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E6=A0=B8=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 84 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java | 69 ++++++++++++++++++ .../mes/repository/MesDbCheckRecordRepository.java | 12 ++++ .../mes/repository/MesDbDataCheckRepository.java | 12 ++++ 4 files changed, 177 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java new file mode 100644 index 0000000..f25605d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: MES-中航DB数据复核不通过记录表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB_CHECK_RECORD") +@Api("中航复核异常记录表") +public class MesDbCheckRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6727925715356900171L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 + @Column(name = "DB_CHECK_ITEM") + @ApiParam("DB复核项") + private String dbReview; + + @Column(name = "ERROR_FILED_CODE") + @ApiParam("异常取值字段") + private String errorFiledCode; + + @Column(name = "ERROR_DESC") + @ApiParam("异常描述") + private String errorDesc; + + @Column(name = "PRODUCT_DATA_ID") + @ApiParam("生产记录表主键ID") + private String productDataId; + + //是否停线：1=是，2=否 + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + //审批状态：10=待审批，20=已审批 + @Column(name = "STATUS") + @ApiParam("审批状态") + private Integer status; + + @Transient + @ApiParam("按钮名称") + private String btnName; + + @Transient + @ApiParam("按钮颜色") + private String btnColor; + + @Transient + @ApiParam("按钮类别") + private String btnType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java new file mode 100644 index 0000000..d59c599 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES-中航DB数据检查配置表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB_DATA_CHECK") +@Api("中航DB数据检查配置表") +public class MesDbDataCheck extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6889751438239451959L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 + @Column(name = "DB_CHECK_ITEM") + @ApiParam("DB复核项") + private Integer dbCheckItem; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + //是否停线：1=是，2=否 + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "KEY_DATA_FILED") + @ApiParam("质量关键字段") + private String keyDataFiled; + + @Column(name = "QC_FILED_CODE") + @ApiParam("缺陷类型字段") + private String qcFiledCode; + + @Column(name = "QC_FILED_VALUE") + @ApiParam("缺陷类型合格值") + private String qcFiledValue; + + @Column(name = "QC_FAIL_MAX_COUNT") + @ApiParam("缺陷连续不合格预警次数") + private String qcFailMaxCount; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java new file mode 100644 index 0000000..076d22a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbCheckRecord; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java new file mode 100644 index 0000000..b9c44b8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbDataCheck; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbDataCheckRepository extends BaseRepository { +} From d92c669f79194f7269a9a3d43021ab6ae112de64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 21 Sep 2020 11:37:07 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E3=80=9011493=2020042=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=9D=A1=E7=A0=81=E6=A8=A1=E7=89=88=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=200921?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 505fd9c..3e94f7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -200,6 +200,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("等级名称") private String gradeName; + @Transient + @ApiParam("客户产线代码") + private String custProdLineCode; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } From 706d0fc43d04bcc2bed0b6ff79e01fc69be78d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 21 Sep 2020 12:16:43 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 4d0bcef..1843779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -183,6 +183,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("父阶物料号") private String parentPartNo; + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus = 10; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index bdaa9c9..a364f73 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -169,6 +169,12 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPrintStatus()) && mesWorkOrder.getPrintStatus() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getPrintStatus(), "printStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } else { From 4ffe517015397a52aae22d28a62f9a151712c9a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 14:53:57 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 19 +++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 20 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 341490d..0205650 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 @@ -624,6 +624,25 @@ public class DdlPreparedPack { } } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param sufColumnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, String sufColumnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + String destColumnName = columnName; + if (!StringUtil.isEmpty(sufColumnName)) { + destColumnName = destColumnName + "_" + System.currentTimeMillis(); + } + packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data); + } + } + /** * 封装in String查询语句 * 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 541097e..0634370 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 @@ -228,7 +228,7 @@ public class WmsHqlPack { for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { filterBusiType.add(Integer.parseInt(busiType)); } - DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", packBean); + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean); } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); From 0d0905c454ffc8b90aca990661df9e1192e19d93 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 21 Sep 2020 14:56:51 +0800 Subject: [PATCH 19/25] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6dev=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") From 0c044eed9136b825646be473f70360721256a5a8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 15:11:04 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 01fecb2..7cd233a 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 @@ -251,7 +251,7 @@ public class WmsDocMovementMaster extends BaseBean { /**备注3**/ @Column(name = "THIRD_REMAKE") - @ApiParam(value = "客户类型") + @ApiParam(value = "财务类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") private String thirdRemake; From 735838e27f12c69f1724faba1dd71a3adb8c3cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 21 Sep 2020 18:41:31 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=B4=A7=E6=80=A5=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/mes/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 1843779..0d056b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -185,7 +185,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "PRINT_STATUS") @ApiParam("打印状态") - private Integer printStatus = 10; + private Integer printStatus; @Version @Column(name = "LOCK_VERSION") From 41efdd4de8d02fdf839c5cab97854cba1192b13b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 21 Sep 2020 18:51:00 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E3=80=902798=20=E6=AD=A6=E6=B1=89PRD-AMP?= =?UTF-8?q?-WMS2AMP=E5=90=8C=E6=AD=A5=E6=8B=89=E5=8A=A8=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/util/StringUtil.java | 13 +++++++++++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 6a7a274..d9c48c7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -12,11 +12,11 @@ import java.util.regex.Pattern; public class StringUtil { public static boolean isEmpty(Object obj){ - + if(obj ==null || obj.toString().trim().equals("")){ return true; } - + return false; } @@ -33,4 +33,13 @@ public class StringUtil { } return fieldNames; } + + public static boolean isEmptyAndNull(Object obj){ + + if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){ + return true; + } + + return false; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f9b3812..df3cbdf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("数量总和") + private Double sumQty; + public WmsStockSn() { } @@ -850,5 +854,11 @@ public class WmsStockSn extends BaseBean { this.organizeCode = organizeCode; } - + public WmsStockSn(WmsStockSn wmsStockSn, Double sumQty) { + this.partNo = wmsStockSn.getPartNo(); + this.vendorNo = wmsStockSn.getVendorNo(); + this.unit = wmsStockSn.getUnit(); + this.partNameRdd = wmsStockSn.getPartNameRdd(); + this.sumQty = sumQty; + } } From ffb45cf3dd9b9f9e66ea5799b43c672ef9b7099b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 22:15:24 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 0634370..9f24499 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 @@ -1666,6 +1666,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getItem(), "item", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); From c4f161e958a7462314bf277dc4729717d70a97af Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 09:28:08 +0800 Subject: [PATCH 24/25] Start Task #2795 --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index ce53f9e..297711e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "重量") private Double weight; + @Column(name = "VEN_PRODUCT_TIME") + @ApiParam(value = "供应商生产日期") + private String venProductTime; + @Transient @ApiParam(value = "合同号") private String refNo; From 73809df82700f32aa44f3d98a0a6fb34516f3447 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 13:48:48 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E5=90=88=E5=B9=B6swebtest=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 3e8547b..4d7e3b7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean { @ApiParam("周") private String countWeek; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam("日期") private String dateStart;