From a3115601a7f127fb19d3bfa857f59860c51fb418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:06 +0800 Subject: [PATCH 001/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9caeb95..5345a36 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 modules/i3plus-pojo-model From d62aec1c626aa8fd781e7f729c54ed1756b3b4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:20 +0800 Subject: [PATCH 002/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-andon/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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 From e43d593db6524804151d59037e46f060d8f1d648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:38 +0800 Subject: [PATCH 003/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-aps/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index c052a9d..b0a3f82 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 From 5d57bc44d86eca1679ef5594546cc41850e46471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:51 +0800 Subject: [PATCH 004/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-base/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 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 From f8356637aee112688d761d1d44679bd3589c6992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:07 +0800 Subject: [PATCH 005/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-form/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-form/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 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 From fda76e06c830f4bd867ab58adcf88bb4826a28f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:21 +0800 Subject: [PATCH 006/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-hardswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 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 From 071c218a2e51b7851ae8323f10928d8b86dad290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:42 +0800 Subject: [PATCH 007/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-jobflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-jobflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 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 From e09345984da27c450c20029d117a2d69a08a8e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:56 +0800 Subject: [PATCH 008/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-lac/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-lac/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 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 From b703c9394cca809a5598277f6013edd6d4d03f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:09 +0800 Subject: [PATCH 009/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-mes/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 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 From 5b672e7d68e7086761ce9cab73f4fd703bf4675e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:31 +0800 Subject: [PATCH 010/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-mes-pcn/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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 From 4911d184e0c9b0e58320a698d9afd1da6ce90a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:36 +0800 Subject: [PATCH 011/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-model/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 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 From 711116d04126347c28c891478eea68025700cef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:50 +0800 Subject: [PATCH 012/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-platform/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-platform/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 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 From b2210e74258c8e974883694ff197c2a9deb97256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:03 +0800 Subject: [PATCH 013/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-report/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-report/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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 From be04366551bbc8dda0e99af3ba20898850b66038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:14 +0800 Subject: [PATCH 014/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-softswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-softswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 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 From ea8f5273099bf11955adc4bb850ecc07b9959925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:26 +0800 Subject: [PATCH 015/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-sweb/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-sweb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 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 From a2548413854cd58f2dcd74b764a814b289c618d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:38 +0800 Subject: [PATCH 016/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-wms/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-wms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 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 From 3df5888a699a8ea705230448b84d2fb0445f82d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:48 +0800 Subject: [PATCH 017/138] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-po?= =?UTF-8?q?jo-workflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-workflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 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 From bc5beeba7d9c8b8fa2e2b8521384700ae9dfb98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Dec 2019 10:26:03 +0800 Subject: [PATCH 018/138] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 14 ++++++++------ .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 14 ++++++++------ .../i3plus/pojo/softswitch/bean/BsSuitRecordParam.java | 5 ++++- .../i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java | 10 +++++----- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 403d234..fc7941e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -9,11 +9,8 @@ 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; -import javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_DATA_DETAIL") +@Table(name = "BS_SUIT_DATA_DETAIL",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), + @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME") +}) @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 260df43..bf91b56 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -9,11 +9,8 @@ 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; -import javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_RECORD") +@Table(name = "BS_SUIT_RECORD",indexes = { + @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), + @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME"), + @Index(name="index_process_time",columnList = "PROCESS_TIME"), +}) @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index 5b384ce..979b61d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "SUIT_RECORD_PARAM") +@Table(name = "SUIT_RECORD_PARAM",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index e00832f..b2cebdb 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -9,10 +9,8 @@ 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; + +import javax.persistence.*; /** * @Description : 请求适配记录 @@ -26,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_REQUEST_RECORD") +@Table(name = "BS_SUIT_REQUEST_RECORD",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { From c7d4253e5ef07ccc5a79bbd1ebc7d7e8aadb55ed Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Mon, 9 Dec 2019 14:36:59 +0800 Subject: [PATCH 019/138] =?UTF-8?q?=E3=80=90bug=206872=20-=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=8F=91=E8=BF=90=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=8A=A0=E8=BD=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 93 ++++++++++++++++++++++ 1 file changed, 93 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 385c27e..652aa48 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 @@ -4304,4 +4304,97 @@ public class WmsEnumUtil { } } + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RECEIVING_GOODS_STATUS { + WAIT_RECEIVING(10, "待收货"), + RECEIVING(20, "收货中"), + COMPLETE_RECEIVING(30, "收货完成"), + UN_RECEIVED(40, "延迟未收货"), + ELSE(50,"其他"); + + private int value; + private String description; + + RECEIVING_GOODS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RECEIVING_GOODS_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 发运看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINAL_SHIPMENT_STATUS { + CREATE(10, "新建"), + PROCESSING(20, "处理中"), + COMPLETE(30, "已完成"); + + private int value; + private String description; + + FINAL_SHIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static FINAL_SHIPMENT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + } \ No newline at end of file From bba25ad2de59f36566dfcc6a0d700c3ea2e81402 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 Dec 2019 14:52:41 +0800 Subject: [PATCH 020/138] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85mod?= =?UTF-8?q?el=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index fc94a50..ba753cc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -67,9 +66,6 @@ public class ProdPackageModel { @ApiParam("包装集合") private List packageList; - @ApiParam("工单集合") - private List workOrderList; - @ApiParam("打印状态文字") private String printStrStatus; From 222e1b020d1227fa799643c2a5e2528ced4b9bac Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 19:27:12 +0800 Subject: [PATCH 021/138] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=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/aps/bean/ImportDetail.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 2589083..0eaaeaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; - @Column(name="TYPE") + @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") @FieldAnnotation(defaultValue = "REPLACE") - private ApsEnumUtil.IMPORT_DETAIL_TYPE type; + private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; + + @Column(name="SKIP_ROWS") + @ApiParam(value ="跳过行数") + @FieldAnnotation(defaultValue = "0") + private Integer skipRows; @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") From efb29aa8f4d8fc479862d0b834478d3c29dcfd28 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 9 Dec 2019 19:48:00 +0800 Subject: [PATCH 022/138] =?UTF-8?q?task=20`1294-1`=20=E6=9F=A5=E6=89=BEwor?= =?UTF-8?q?kcell=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index b4fff69..87fcaeb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -120,9 +120,9 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Transient @ApiParam("返回信息") @@ -187,7 +187,7 @@ public class MesProduceSn extends BaseBean implements Serializable { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", resultMsg='" + resultMsg + '\'' + ", operateType=" + operateType + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index d25f92d..89717dc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 9fc108a..4232d0d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -76,7 +76,7 @@ public class MesHqlPack { public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); +// DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return packBean; } 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 02de63d..824d9a8 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 @@ -117,9 +117,9 @@ public class MesProduceSn extends BaseBean { @ApiParam("条码类型") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Column(name="OPERATE_TYPE") @ApiParam("操作类型") @@ -184,7 +184,7 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", operateType=" + operateType + ", resultMsg='" + resultMsg + '\'' + '}'; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 40c70b2..dd0909a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; From 68bba613e3972981db07a10dd51f2259739a086c Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:35:29 +0800 Subject: [PATCH 023/138] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=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/aps/bean/BaseOrder.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 2 -- 2 files changed, 14 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index e032535..52363f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; import java.util.Date; import java.util.List; @@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode { public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } - - @JsonBackReference - public List getUpperOrders() { - return BeanRelation.list(this, EBaseOrder.UpperOrders); - } - - @JsonBackReference - public List getLowerOrders() { - return BeanRelation.list(this, EBaseOrder.LowerOrders); - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index e4c5238..28e4b51 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -5,6 +5,4 @@ public enum EBaseOrder { Material, PrevRelations, PostRelations, - UpperOrders, - LowerOrders } From f5181072b5702c5d519274023e6a33da4459a024 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:48:39 +0800 Subject: [PATCH 024/138] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/pcn/repository/MesESOPRepository.java | 17 ------ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/repository/MesESOPRepository.java | 17 ------ 4 files changed, 158 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java deleted file mode 100644 index 548ed5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java deleted file mode 100644 index 9f76128..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesESOPRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java deleted file mode 100644 index 0ea3263..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ /dev/null @@ -1,62 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java deleted file mode 100644 index 367ef81..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; -import cn.estsh.i3plus.pojo.mes.bean.MesESOP; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesESOPRepository extends BaseRepository { -} From a1a3d1e838c743c585ed30eb61cc0ee9eff6d448 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 10 Dec 2019 09:30:03 +0800 Subject: [PATCH 025/138] =?UTF-8?q?=E3=80=90Bug=E6=B8=85=E5=8D=95=E3=80=91?= =?UTF-8?q?------------------------------?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 39 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 2 +- .../cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 51 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 49 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++-- 5 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java 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 385c27e..c63485e 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 @@ -1347,6 +1347,45 @@ public class WmsEnumUtil { return valueOf(val); } } + /** + * 库存移动单状态状态:10=新建,20=已处理,30=处理出错 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMSSHIPPING_ORDER_STATUS { + CREATE(10, "新建"), + PENDING(20, "已处理"), + ERROR(30, "处理出错"); + + private int value; + private String description; + + WMSSHIPPING_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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); + } + } /** * 库存移动单明细状态 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 6342635..741493d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -30,7 +30,7 @@ import javax.persistence.*; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO") }) -@Api("库存移动单主表信息") +@Api("库存移动单处理成功后的记录") public class WmsMoveToERP extends BaseBean { private static final long serialVersionUID = -6223527594941733060L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java new file mode 100644 index 0000000..530bdee --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +@Data +public class WmsCarDto implements Serializable { + + @Column(name="CAR_NO") + @ApiParam(value ="车牌号") + private String carNo; + + @Column(name="CAR_DESC") + @ApiParam(value ="车辆描述") + private String carDesc; + + @Column(name="MAX_CAPACITY") + @ApiParam(value ="载重量(KG)") + private String maxCapacity; + + @Column(name="DRIVER_NO") + @ApiParam(value ="默认驾驶员") + private String driverNo; + + @Column(name="PHONE") + @ApiParam(value ="车主电话") + private String phone; + + @Column(name="VENDOR_NO") + @ApiParam(value ="所属供应商") + private String vendorNo; + + @Transient + @ApiParam("司机名称") + private String driverNameRdd; + + @Transient + @ApiParam(value = "供应商名称") + private String vendorNameRdd; + + @ApiParam(value = "是否删除，默认否") + private Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + private Integer isValid = 1; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java new file mode 100644 index 0000000..b4bbd06 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.io.Serializable; + +@Data +public class WmsTmsDriverDto implements Serializable { + + @Column(name="DRIVER_NO") + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @Column(name="DRIVER_NAME") + @ApiParam(value ="驾驶员姓名") + private String driverName; + + @Column(name="SEX") + @ApiParam(value ="驾驶员性别") + private Integer sex; + + @Column(name="AGE") + @ApiParam(value ="驾驶员年龄") + private String age; + + @Column(name="ID_NO") + @ApiParam(value ="驾驶员身份证号") + private String idNo; + + @Column(name="ADRESS") + @ApiParam(value ="驾驶员籍贯") + private String adress; + + @Column(name="PHONE") + @ApiParam(value ="车牌号") + private String phone; + + @Column(name="LOGIN_NO") + @ApiParam(value =" 登录账号") + private String loginNo; + + @ApiParam("是否删除，默认否") + private Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + private Integer isValid = 1; +} 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 882630d..c1d0d98 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 @@ -44,14 +44,14 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - // 封装有效状态、删除状态、创建人和创建时间 - DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); + DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } + // 封装有效状态、删除状态、创建人和创建时间 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr; } From 571ab9bd3e445ca600d6b1da399e9396360f385a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 10 Dec 2019 11:08:42 +0800 Subject: [PATCH 026/138] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 4232d0d..d7a6052 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -69,14 +69,12 @@ public class MesHqlPack { /** * 根据打印模板的模板代码查询模板信息 * - * @param organizeCode * @param mesLabelTemplate * @return */ - public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { + public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); -// DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return packBean; } From c6c57dd82979153dac781ba548daefbcf7e097f7 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 10 Dec 2019 11:49:41 +0800 Subject: [PATCH 027/138] =?UTF-8?q?task=20`1294-1`=20=E6=9F=A5=E6=89=BEwor?= =?UTF-8?q?kcell=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index 092f887..597b60a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean { @ApiParam("设备代码") private String equipmentCode; + @Override + public String toString() { + return "MesDatasource{" + + "dsCode='" + dsCode + '\'' + + ", dsName='" + dsName + '\'' + + ", dsType='" + dsType + '\'' + + ", dsHost='" + dsHost + '\'' + + ", dsPort=" + dsPort + + ", dsUser='" + dsUser + '\'' + + ", dsPassword='" + dsPassword + '\'' + + ", dsDbName='" + dsDbName + '\'' + + ", equipmentCode='" + equipmentCode + '\'' + + '}'; + } } From b9844c255ba037ed738350587884b6e4ae2581cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 10 Dec 2019 11:53:19 +0800 Subject: [PATCH 028/138] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 62 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 66 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/MesPpTemplate.java | 58 +++++++++++++++++++ .../wms/repository/MesPpDetailsRepository.java | 17 ++++++ .../pojo/wms/repository/MesPpMasterRepository.java | 17 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 37 ++++++++++++ 7 files changed, 310 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java 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 385c27e..4e61405 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 @@ -4304,4 +4304,57 @@ public class WmsEnumUtil { } } + /** + * 生产计划主表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_MASTER_STATUS { + CREATE(10,"CREATE", "创建"), + PLANNED(20,"PLANNED", "已计划"), + CLOSE(30,"CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java new file mode 100644 index 0000000..b87c776 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_生产计划主明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PP_DETAILS") +@Api("MES_生产计划明细表") +public class MesPpDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592727L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="ITEM") + @ApiParam("行号") + private Integer item; + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "工单数量", example = "0") + public Double qty; + + public Integer getItem() { + return item == null ? 0 : this.item.intValue(); + } + + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java new file mode 100644 index 0000000..e9d4e61 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : MES_生产计划主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PP_MASTER") +@Api("MES_生产计划主表") +public class MesPpMaster extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592726L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; + + @Column(name="PLAN_PRODUCT_TIME") + @ApiParam("生产日期") + private String planProductTime; + + @Column(name="SHIFT_NO") + @ApiParam("班次代码") + private String shitNo; + + @Column(name="START_PRODUCT_TIME") + @ApiParam("开始生产时间") + private String startProductTime; + + @Column(name="END_PRODUCT_TIME") + @ApiParam("结束生产时间") + private String endProductTime; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java new file mode 100644 index 0000000..d091e87 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -0,0 +1,58 @@ +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; +import lombok.Data; + +/** +* @Description : 生产计划模板 +* @Reference : +* @author: jessica.chen +* @date: 2019/12/10 17:10 +* @Modify: +*/ + +@Data +@Api(value="生产计划模板",description = "生产计划模板") +public class MesPpTemplate extends BaseBean { + + private static final long serialVersionUID = 2167743108452607913L; + + @ApiParam(value = "工单号") + @AnnoOutputColumn + private String woekorderNo; + + @ApiParam(value = "产线代码") + @AnnoOutputColumn + private String pdlineNo; + + @ApiParam(value = "生产日期") + @AnnoOutputColumn + private String planProductTime; + + @ApiParam(value = "班次代码") + @AnnoOutputColumn + private String shitNo; + + @ApiParam(value = "开始生产时间") + @AnnoOutputColumn + private String startProductTime; + + @ApiParam(value = "结束生产时间") + @AnnoOutputColumn + private String endProductTime; + + @ApiParam(value = "零件号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "零件描述") + @AnnoOutputColumn + private String partNameRdd; + + @ApiParam(value = "工单数量") + @AnnoOutputColumn + private Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java new file mode 100644 index 0000000..a3b81da --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :MES_生产计划明细表 + * @Reference : + * @Author : jessica,chen + * @CreateDate : 2019-11-27 14:49 + * @Modify: + **/ +@Repository +public interface MesPpDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java new file mode 100644 index 0000000..eac4d74 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsFile; +import org.springframework.stereotype.Repository; + +/** + * @Description :MES_生产计划主表 + * @Reference : + * @Author : jessica,chen + * @CreateDate : 2019-11-27 14:49 + * @Modify: + **/ +@Repository +public interface MesPpMasterRepository extends BaseRepository { +} 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 a6f89a5..4dc76c2 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 @@ -2574,4 +2574,41 @@ public class WmsHqlPack { return result; } + /** + * 生产计划主表信息分页查询条件 + * + * @param mesPpMaster + * @return + */ + public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result); + DdlPreparedPack.getStringSmallerPack(mesPpMaster.getEndProductTime(), "endProductTime", result); + + getStringBuilderPack(mesPpMaster, result); + + return result; + } + + /** + * 生产计划明细表信息分页查询条件 + * + * @param mesPpDetails + * @return + */ + public static DdlPackBean packHqlMesPpDetails(MesPpDetails mesPpDetails) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result); + + getStringBuilderPack(mesPpDetails, result); + + return result; + } + } From da2cfd77b0bd64130795a19c6df8fae94f5ead12 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 10 Dec 2019 14:55:52 +0800 Subject: [PATCH 029/138] =?UTF-8?q?=E3=80=90=20=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=89=AB=E6=8F=8F=E9=9B=B6=E4=BB=B6=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E7=B4=AF=E8=AE=A1=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=BE=BE=E5=88=B0=E9=9B=B6=E4=BB=B6=E6=A0=87=E5=8C=85=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0=E6=9D=A1=E7=A0=81+?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=9A=84=E7=95=8C=E9=9D=A2=E3=80=91=E3=80=90?= =?UTF-8?q?bug6704=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a7f54ae..590f11c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "加密编码") private String encryptionNo; + @Column(name = "LAST_CS_TIME") + @ApiParam(value = "末次盘点时间") + private String lastCsTime; + + @Transient + @ApiParam(value = "末次盘点开始时间") + private String lastCsTimeStart ; + + @Transient + @ApiParam(value = "末次盘点结束时间") + private String lastCsTimeEnd; + public WmsLocate() { } + public WmsLocate(String locateNo,Integer destBoxQty) { this.locateNo = locateNo; this.destBoxQty = destBoxQty; From 8385038290be687efb3dc215510ecd797252738a Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 10 Dec 2019 15:47:40 +0800 Subject: [PATCH 030/138] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=97=A5=E5=8E=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 3fcd451..393ee0e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -10,15 +10,12 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long parent; + private Long resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date start_date; + private Date startDate; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end_date; - private String color; - private Long id; - private Long workId; - private String text; + private Date endDate; + private String cls; } From f57f1087d95ab7fd304b8453e58170071e2ff724 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 10 Dec 2019 19:09:58 +0800 Subject: [PATCH 031/138] =?UTF-8?q?task=20`1295`=20=201=09=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 30 +++++++++++----------- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 10 ++++---- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 7 ++--- .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 7 ++--- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 13 +++++----- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 12 +++++---- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 12 ++++++++- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 9 +++---- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 9 +++---- .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 5 +++- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 5 +++- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 5 +++- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 7 ++--- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 10 ++++---- .../estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 26 +++++++++++-------- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 6 ++++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 11 ++++---- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 9 +++---- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 9 +++---- .../pojo/mes/bean/MesEquTaskStandardRecord.java | 9 +++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 ++--- .../i3plus/pojo/mes/bean/MesPackageDetail.java | 3 ++- .../i3plus/pojo/mes/bean/MesPackageTravel.java | 3 ++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 6 ++++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 13 +++++----- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 14 +++++----- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 8 +++++- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 10 ++++---- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 9 +++---- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 9 +++---- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 3 ++- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 6 ++++- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 5 +++- .../i3plus/pojo/mes/bean/MesWcCheckRecord.java | 5 +++- .../pojo/mes/bean/MesWorkCellMonitorLog.java | 5 +++- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 10 ++++---- 45 files changed, 210 insertions(+), 177 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 30c641c..2b6489c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -26,30 +23,33 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 18b83aa..209c69a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.math.BigDecimal; /** @@ -26,7 +23,10 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index f21218e..39d5e93 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 883c12a..88c635c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 19bd5d9..ddcdc82 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index b6833de..ff1c82d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 111be8e..984e6d6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; 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 javax.persistence.*; /** * @Description :产品绑定记录表 @@ -26,7 +23,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 87fcaeb..6eb2592 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { @@ -128,7 +129,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("返回信息") private String resultMsg; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index c9bbc09..7a17c7d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5431d77..532ec2a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -48,6 +54,10 @@ public class MesProductData extends BaseBean { @ApiParam("产品条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 7d03fcd..20fa8b6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index fd39205..c098cd9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 455c6be..f058270 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index 4a2bae6..b9d4630 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index 92c37be..e6974e9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index 46b20b1..f7cad22 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index d52c590..a5e339d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index cdbbbe4..811c01c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index f6805e0..4a52798 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index 616096a..acaf12d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 3758b18..3f7588b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER") +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("客户信息") public class MesCustOrder extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 9008e5e..270686e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.util.Date; @@ -25,30 +26,33 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index d340256..d75e2d4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 8ad11ab..6b6fbc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK") +@Table(name = "MES_EQU_TASK", indexes = { + @Index(columnList = "TASK_NO") +}) @Api("设备作业任务") public class MesEquTask extends BaseBean { @@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean { private String pageType; @Transient - @ApiParam(value ="明细列表") + @ApiParam(value = "明细列表") private List mesEquTaskDetailList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index c62fb18..8f3b70f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_DETAIL") +@Table(name = "MES_EQU_TASK_DETAIL", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 1ffe9c2..2ecea3c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description :设备维修作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备维修作业记录") public class MesEquTaskRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 41d7209..b3c3b6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description :设备点检保养作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_STANDARD_RECORD") +@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备点检保养作业记录") public class MesEquTaskStandardRecord extends BaseBean { 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 93339b7..ec8810e 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 @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 95483c1..20a1b79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 76a808b..589f3f6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 0cbb477..b803060 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") 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 f689f22..32ad09c 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 @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") 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 824d9a8..66fc384 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 @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean { @@ -121,7 +122,7 @@ public class MesProduceSn extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; 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 3da8adb..a29b36b 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 @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") @@ -120,7 +122,7 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 3555f12..fed596c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") 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 a315dc6..1daf186 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 @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 7ea3abb..d98293c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,7 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") 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 416ae36..c57ba78 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 @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 77054d4..5c3ceb5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") 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 5e3e15f..6d526a0 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 22086da..8138447 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 5aef545..9beab8f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 9f3f20a..7806868 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { 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 a5523bd..557402d 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 @@ -9,10 +9,7 @@ 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 javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index f3c006d..c9d175e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") From 47fb0807426a702cd210a75a67be7a881c9ed173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 10 Dec 2019 20:04:54 +0800 Subject: [PATCH 032/138] =?UTF-8?q?lac=E7=BA=BF=E7=A8=8B=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=BC=98=E5=8C=96=20Session=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E5=8C=96=20lac?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0TaskCheck=20=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 3 + .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 117 ++++++++++++++++++++- .../estsh/i3plus/pojo/lac/bean/LacTaskCheck.java | 100 ++++++++++++++++++ .../lac/repository/LacTaskCheckRepository.java | 14 +++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 19 ++-- .../pojo/platform/platbean/SysLogException.java | 10 +- .../pojo/platform/platbean/SysLogOperate.java | 13 +-- .../pojo/platform/platbean/SysLogSystem.java | 13 +-- .../pojo/platform/platbean/SysLogTaskTime.java | 11 +- .../pojo/softswitch/bean/BsSuitDataDetail.java | 8 +- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 8 +- .../pojo/softswitch/bean/BsSuitRecordParam.java | 2 +- .../pojo/softswitch/bean/BsSuitRequestRecord.java | 2 +- 13 files changed, 265 insertions(+), 55 deletions(-) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index ef05abd..f2ef95b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.mongodb.core.index.IndexDirection; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; @@ -78,6 +80,7 @@ public abstract class BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) public String createUser; + @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") public String createDatetime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index 3cb1b28..dfb4079 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -221,8 +221,9 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUMBER(1,"数字"), - STRING(2,"字符串"); + INTEGER(1,"整数"), + STRING(2,"字符串"), + FLOAT(3,"浮点"); private int value; private String description; @@ -341,4 +342,116 @@ public class LacEnumUtil { } } + /** + * 逻辑运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGICAL_OPERATOR{ + OR(10,"或"), + AND(20,"与"); + + private int value; + private String description; + + LOGICAL_OPERATOR(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 关系运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RELATIONAL_OPERATOR{ + GT(10,">"), + LT(20,"<"), + EQ(20,"=="), + NE(20,"!="), + GE(20,">="), + LE(20,"<="); + + private int value; + private String description; + + RELATIONAL_OPERATOR(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 任务检查类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_CHECK_TYPE{ + MASTER(10,"主"), + SLAVE(20,"从"); + + private int value; + private String description; + + TASK_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java new file mode 100644 index 0000000..5c14b36 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-09 14:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_CHECK") +@Api(value="任务检查",description = "任务检查") +public class LacTaskCheck extends BaseBean { + + @Column(name="COMMAND_STACK_TEMPLATE_ID") + @ApiParam(value ="指令集模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTemplateId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_TASK_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepTaskId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CHECK_TYPE") + @ApiParam(value ="任务检查类型") + @AnnoOutputColumn(refClass = LacEnumUtil.TASK_CHECK_TYPE.class) + private Integer taskCheckType; + + @Column(name="TASK_CHECK_GROUP") + @ApiParam(value ="任务检查组") + private String taskCheckGroup; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数id") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME_RDD") + @ApiParam(value ="任务名称") + private String paramNameRdd; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class) + private Integer paramValueType; + + @Column(name="RELATIONAL_OPERATOR") + @ApiParam(value ="关系运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.RELATIONAL_OPERATOR.class) + private Integer relationalOperator; + + @Column(name="LOGICAL_OPERATOR") + @ApiParam(value ="逻辑运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.LOGICAL_OPERATOR.class) + private Integer logicalOperator; + + @Column(name="CHECK_VALUE") + @ApiParam(value ="检查值") + private String checkValue; + + @Column(name="TARGET_STEP_ID") + @ApiParam(value ="目标步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetStepId; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java new file mode 100644 index 0000000..82ab490 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskCheck; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-10 15:10 + * @Modify: + **/ +public interface LacTaskCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 8f317e9..10b2e48 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -4,17 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; -import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; +import cn.estsh.i3plus.pojo.lac.bean.*; + import java.util.List; /** @@ -187,4 +178,10 @@ public class LacHqlPack { DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck); + DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index f277ace..e4b46a1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -9,10 +9,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -27,16 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") - } -) +@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="EXC_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 5e20049..57bb047 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,16 +30,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"), - @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE") -}) +@Table(name="SYS_LOG_OPERATE") @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { - //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="OPERATE_MODULE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") @@ -53,7 +48,7 @@ public class SysLogOperate extends BaseBean { return operateModuleName; } - //ImppEnumUtil.OPERATE_TYPE（枚举） + @Indexed @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index f4fdc54..9db1e2f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,24 +30,19 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"), - @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID") - }) +@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { + @Indexed @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") - //ImppEnumUtil.LOG_LEVEL @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; + @Indexed @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") - //CommonEnumUtil.SOFT_TYPE @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index a6a8dbb..5268d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,9 +11,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -28,12 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"), - @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME") - }) +@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { @@ -79,6 +75,7 @@ public class SysLogTaskTime extends BaseBean { @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; + @Indexed @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index fc7941e..23db18b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -26,10 +26,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_DATA_DETAIL",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), - @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), - @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), - @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME") + @Index(name="bs_suit_data_detail_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), + @Index(name="bs_suit_data_detail_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_data_detail_suit_case_code_idx",columnList = "SUIT_CASE_CODE_RDD"), + @Index(name="bs_suit_data_detail_create_date_time_idx",columnList = "CREATE_DATE_TIME") }) @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index bf91b56..c451f54 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -26,10 +26,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_RECORD",indexes = { - @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), - @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), - @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME"), - @Index(name="index_process_time",columnList = "PROCESS_TIME"), + @Index(name="bs_suit_record_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_record_suit_case_code_idx",columnList = "SUIT_CASE_CODE"), + @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"), + @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"), }) @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index 979b61d..e85deb6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "SUIT_RECORD_PARAM",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="suit_record_param_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), }) @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index b2cebdb..b699e9b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -25,7 +25,7 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_REQUEST_RECORD",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), }) @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { From 7bf8534c1671be864f2f777a8fdf923bac76652c Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 11 Dec 2019 09:11:57 +0800 Subject: [PATCH 033/138] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 caa2b5d..5eb0d11 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 @@ -1336,8 +1336,14 @@ public class MesEnumUtil { MES_QC_CHECK_STANDARD(250, "质量检测标准"), MES_FAULT_CAUSE(260,"设备故障原因"), MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"); - + MES_FAULT_PHENOMENON(280,"设备故障现象"), + MES_DEFECT(290,"缺陷"), + MES_DEFECT_CAUSE(300,"缺陷原因"), + MES_SCRAP(310,"报废原因"), + MES_REPAIR(320,"质量数据处理措施"), + MES_EQU_TASK_PLAN(330,"设备作业周期计划"), + MES_PART_OJBECT(340,"物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); private int value; private String description; From 2e98e17a05da5d16fbf5a94ba2f1cc1f38447990 Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 11 Dec 2019 10:10:53 +0800 Subject: [PATCH 034/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++ .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 8 +++- .../java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java | 18 +++++++ .../cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 27 +++-------- .../estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 35 +++++--------- .../estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 35 ++++++++++++++ 7 files changed, 138 insertions(+), 45 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java 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 e0c11cc..3ac9b45 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 @@ -1015,6 +1015,62 @@ public class WmsEnumUtil { } } + + /** + * 业务表：库存条码状态 + * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CARRIAGE_STATUS { + CREATE(10, "创建"), + PUBLISH(20, "发布"), + RECEIVE(30, "承运商接收"), + ARRIVE(40, "车辆到达"), + INSTALL(50, "装车完成"), + CARRIAGE_IN(60, "运输中"), + CLOSE(70, "已关单"); + + private int value; + private String description; + + CARRIAGE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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); + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 单据是否生成任务状态 */ 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 fc098a8..83788f2 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 @@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean { @Transient public String title; + @Column(name = "TAG") + @ApiParam(value = "标签") + private String tag; + 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/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 9a65b4c..1d69271 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean { @Column(name="ORDER_STATUS") @ApiParam(value ="单据状态") - private String orderStatus; + private Integer orderStatus; @Column(name="CUST_NAME") @ApiParam(value ="客户名称RDD") @@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam(value =" 申请部门") private String depart; + + @Transient + @ApiParam("物料编码") + private String partNo; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java new file mode 100644 index 0000000..9bb9b62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :公共父类入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Data +public class BaseDto { + + +} + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 530bdee..49d975d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -8,44 +8,29 @@ import javax.persistence.Transient; import java.io.Serializable; @Data -public class WmsCarDto implements Serializable { +public class WmsCarDto extends BaseDto implements Serializable { @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") - private String carDesc; - - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") - private String maxCapacity; @Column(name="DRIVER_NO") @ApiParam(value ="默认驾驶员") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") - private String phone; @Column(name="VENDOR_NO") @ApiParam(value ="所属供应商") private String vendorNo; + @ApiParam("是否删除，默认否") - @Transient - @ApiParam("司机名称") - private String driverNameRdd; + protected Integer isDeleted = 2; - @Transient - @ApiParam(value = "供应商名称") - private String vendorNameRdd; + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; - @ApiParam(value = "是否删除，默认否") - private Integer isDeleted = 2; + protected String organizeCode; - @ApiParam("是否有效，默认是") - private Integer isValid = 1; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index b4bbd06..ad84be5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -6,8 +6,15 @@ import lombok.Data; import javax.persistence.Column; import java.io.Serializable; +/** + * @Description :驾驶员入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ @Data -public class WmsTmsDriverDto implements Serializable { +public class WmsTmsDriverDto extends BaseDto implements Serializable { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @@ -17,33 +24,15 @@ public class WmsTmsDriverDto implements Serializable { @ApiParam(value ="驾驶员姓名") private String driverName; - @Column(name="SEX") - @ApiParam(value ="驾驶员性别") - private Integer sex; - - @Column(name="AGE") - @ApiParam(value ="驾驶员年龄") - private String age; - - @Column(name="ID_NO") - @ApiParam(value ="驾驶员身份证号") - private String idNo; - - @Column(name="ADRESS") - @ApiParam(value ="驾驶员籍贯") - private String adress; - - @Column(name="PHONE") - @ApiParam(value ="车牌号") - private String phone; - @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") private String loginNo; @ApiParam("是否删除，默认否") - private Integer isDeleted = 2; + protected Integer isDeleted = 2; @ApiParam("是否有效，默认是") - private Integer isValid = 1; + protected Integer isValid = 1; + + protected String organizeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java new file mode 100644 index 0000000..add6b54 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单入参") +@Data +public class WmsTmsShipDto extends BaseDto implements Serializable { + + @ApiParam("物料号") + private String partNo; + @ApiParam("运输状态") + private String carriageStatus; + @ApiParam("单据号") + private String orderNo; + + @ApiParam("是否删除，默认否") + protected Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; + + @ApiParam("工厂代码") + protected String organizeCode; +} From 129e60a6dfba8066f32bd4fa27e66afc23654dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Dec 2019 13:23:27 +0800 Subject: [PATCH 035/138] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 157 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 66 +++++++++ .../repository/WmsPullTaskDetailsRepository.java | 17 +++ .../repository/WmsPullTaskMasterRepository.java | 17 +++ 4 files changed, 257 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java new file mode 100644 index 0000000..09f05c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -0,0 +1,157 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : WMS_拉动计划任务明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-10 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_DETAILS") +@Api("WMS_拉动计划任务明细表") +public class WmsPullTaskDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + private Integer item = 0; + + @Column(name="TERMINAL_NO") + @ApiParam("工位代码") + private String terminalNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位代码") + private String locateNo; + + @Column(name="LOCATE_CAPACITY") + @ApiParam("库位容量") + private String locateCapacity; + + @Column(name="PART_NO") + @ApiParam("零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name="PLAN_PACK_COUNT") + @ApiParam(value = "计划容器数", example = "0") + private Integer planPackCount = 0; + + @Column(name="FIRST_BATCH_QTY") + @ApiParam(value = "首批批量", example = "0") + private Integer firstBatchQty = 0; + + @Column(name="FIRST_PACK_COUNT") + @ApiParam(value = "首批容器数", example = "0") + private Integer firstPackCount = 0; + + @Column(name="REQUEST_QTY") + @ApiParam(value = "补货批量", example = "0") + private Integer requestQty = 0; + + @Column(name="REQUEST_PACK_COUNT") + @ApiParam(value = "补货容器数", example = "0") + private Integer requestPackCount = 0; + + @Column(name="REQUEST_LOT_NO") + @ApiParam(value = "补货批次", example = "0") + private Integer requestLotNo = 0; + + @Column(name="REQUEST_TOTAL_COUNT") + @ApiParam(value = "补货累加次数", example = "0") + private Integer requestTotalCount = 0; + + @Column(name="LAST_REQUEST_TIME") + @ApiParam("上一次补货时间") + private String lastRequestTtime; + + @Column(name="BOOT_QTY") + @ApiParam(value = "尾箱批量", example = "0") + private Integer bootQty = 0; + + @Column(name="BOOT_PACK_COUNT") + @ApiParam(value = "尾箱容器数", example = "0") + private Integer bootPackCount = 0; + + @Column(name="BOOT_LOT_NO") + @ApiParam(value = "尾箱批次", example = "0") + private Integer bootLotNo = 0; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + public Integer getBootLotNo() { + return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + } + + public Integer getBootPackCount() { + return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + } + + public Integer getBootQty() { + return bootQty == null ? 0 : this.bootQty.intValue(); + } + + public Integer getRequestTotalCount() { + return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + } + + public Integer getRequestLotNo() { + return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + } + + public Integer getRequestPackCount() { + return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + } + + public Integer getRequestQty() { + return requestQty == null ? 0 : this.requestQty.intValue(); + } + + public Integer getFirstPackCount() { + return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + } + + public Integer getFirstBatchQty() { + return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + } + + public Integer getPlanPackCount() { + return planPackCount == null ? 0 : this.planPackCount.intValue(); + } + + public Integer getItem() { + return item == null ? 0 : this.item.intValue(); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java new file mode 100644 index 0000000..03a57f9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : WMS_拉动计划任务主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_MASTER") +@Api("WMS_拉动计划任务主表") +public class WmsPullTaskMaster extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; + + @Column(name="PLAN_PRODUCT_TIME") + @ApiParam("生产日期") + private String planProductTime; + + @Column(name="SHIFT_NO") + @ApiParam("班次代码") + private String shitNo; + + @Column(name="START_PRODUCT_TIME") + @ApiParam("开始生产时间") + private String startProductTime; + + @Column(name="END_PRODUCT_TIME") + @ApiParam("结束生产时间") + private String endProductTime; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java new file mode 100644 index 0000000..9983761 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java new file mode 100644 index 0000000..563dbb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskMasterRepository extends BaseRepository { +} From 79377f2da60dcb8b88318ba7db5f649d77a552b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Dec 2019 13:39:26 +0800 Subject: [PATCH 036/138] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index cb0905e..49e34bf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.lac.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_TYPE") @ApiParam(value ="参数类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class) private Integer paramType; @Column(name="PARAM_VALUE_TYPE") From fc663ee2838cdb8770f2f64d9ad4f01a3ee7b9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 11 Dec 2019 14:58:32 +0800 Subject: [PATCH 037/138] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BABUG#6189?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 24 ++++++- .../i3plus/pojo/model/wms/WmsAgImportModel.java | 44 ++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 23 +++--- .../pojo/wms/bean/WmsActionGroupDetails.java | 84 ++++++++++++---------- .../i3plus/pojo/wms/bean/WmsActionModule.java | 24 ++++--- .../i3plus/pojo/wms/bean/WmsActionModuleParam.java | 20 ++++-- .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 17 +++-- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 20 ++++-- .../pojo/wms/bean/WmsActionStepCallParam.java | 15 ++-- .../i3plus/pojo/wms/bean/WmsActionStepType.java | 18 +++-- 10 files changed, 200 insertions(+), 89 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java 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 385c27e..d72a035 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 @@ -51,6 +51,26 @@ public class WmsEnumUtil { } return null; } + + public static String valueOfDescription(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 int descriptionOfValue(String desc) { + int tmp = DISABLE.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1883,7 +1903,7 @@ public class WmsEnumUtil { * 成功标志枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RC_OK_VALUE { + public enum AM_OK_VALUE { IS_TRUE(10, true, "成功"), IS_FALSE(20, false, "失败"); @@ -1892,7 +1912,7 @@ public class WmsEnumUtil { private boolean codeValue; private String description; - RC_OK_VALUE(int value, boolean codeValue, String description) { + AM_OK_VALUE(int value, boolean codeValue, String description) { this.value = value; this.codeValue = codeValue; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java new file mode 100644 index 0000000..4d3f2fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 作业流程导入Model + * @Reference + * @Author dragon + * @CreateDate 2019/12/10 11:26 + * @Modify + */ +@Data +@Api("作业流程导入Model") +public class WmsAgImportModel implements Serializable { + private static final long serialVersionUID = 5322363872992177667L; + @ApiParam("流程集合") + public List agList; + @ApiParam("流程明细集合") + List agdList; + @ApiParam("步骤调用参数集合") + List ascpList; + @ApiParam("作业步骤集合") + List asList; + @ApiParam("作业步骤调用集合") + List ascList; + @ApiParam("作业组件集合") + List amList; + @ApiParam("作业组件参数集合") + List ampList; + @ApiParam("作业步骤参数类型集合") + List astList; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("是否覆盖") + public Integer isConvert; + @ApiParam("用户名") + public String userName; +} 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 336e497..9d502de 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 @@ -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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -29,45 +30,49 @@ import javax.persistence.*; public class WmsActionGroup extends BaseBean { private static final long serialVersionUID = -4169996695337717755L; - @Column(name = "AG_NAME_E") + @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程名称") private String agNameE; - @Column(name = "AG_DESC_E") + @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程描述") private String agDescE; - @Column(name = "AG_NAME_C") + @Column(name = "AG_NAME_C", nullable = false) @ApiParam("中文流程名称") + @AnnoOutputColumn private String agNameC; - @Column(name = "AG_DESC_C") + @Column(name = "AG_DESC_C", nullable = false) @ApiParam("中文流程描述") + @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID") + @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // 1=true, 2 = false - @Column(name = "AUTO_INIT") + @Column(name = "AUTO_INIT", nullable = false) @ApiParam(value = "任务自动初始化", example = "0") + @AnnoOutputColumn private Integer autoInit; // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false) + @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) @ApiParam(value = "是否连带提交创建状态移动单", example = "2") + @AnnoOutputColumn private Integer isCommitRefMove; @Lob diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index fc0f62b..5878561 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,98 +33,107 @@ import javax.persistence.Transient; public class WmsActionGroupDetails extends BaseBean { private static final long serialVersionUID = 544189352378073377L; - @Column(name = "AG_ID") + @Column(name = "AG_ID", nullable = false) @ApiParam(value = "作业流程ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agId; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn private Integer seq; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转步骤", example = "0") + @AnnoOutputColumn private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ",nullable = false) @ApiParam(value = "失败跳转步骤", example = "0") + @AnnoOutputColumn private Integer ngSeq; - @Column(name = "VALUE_TYPE") + @Column(name = "VALUE_TYPE", nullable = false) @ApiParam(value = "动作类型", example = "10") + @AnnoOutputColumn private Integer valueType; - @Column(name = "TO_UPPER") + @Column(name = "TO_UPPER", nullable = false) @ApiParam(value = "是否转为大写", example = "2") + @AnnoOutputColumn private Integer toUpper; - @Column(name = "LEN_CHECK") + @Column(name = "LEN_CHECK", columnDefinition = "int default 0") @ApiParam(value = "长度检查", example = "0") private Integer lenCheck; - @Column(name = "REGULAR_CHECK") + @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验") private String regularCheck; - @Column(name = "REGULAR_CHECK_FAIL_MSG") + @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验失败提示") private String regularCheckFailMsg; - @Column(name = "AS_ID") - @ApiParam(value = "作业步骤", example = "0") + @Column(name = "AS_ID", nullable = false) + @ApiParam(value = "作业步骤") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long asId; - @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号", example = "0") + @Column(name = "AT_ID", nullable = false) + @ApiParam(value = "步骤类型编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; - @Transient - @ApiParam(value = "作业步骤名称") - private String asName; - - @Transient - @ApiParam(value = "步骤类型名称") - private String atName; - - @Transient - @ApiParam(value = "流程名称") - private String agName; - - @Column(name = "GOTO_BTN_CODE") + @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮代码") private String goToBtnCode; - @Column(name = "GOTO_BTN_NAME") + @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮名称") private String goToBtnName; - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") + @Column(name = "PRE_SHOW", columnDefinition = "int default 0") + @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; - @Column(name = "IS_COMMIT_ABLE") - @ApiParam(value = "是否可提交", example = "2") + @Column(name = "IS_COMMIT_ABLE", nullable = false) + @ApiParam(value = "是否可提交") + @AnnoOutputColumn private Integer isCommitAble; - @Column(name = "IS_AUTO_OPEN_WINDOW") - @ApiParam(value = "是否自动开窗", example = "2") + @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) + @ApiParam(value = "是否自动开窗") private Integer isAutoOpenWindow; - @Column(name = "SEARCH_KEY") + @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "搜索KEY") private String searchKey; - @Column(name = "GROUP_KEY") + @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "分组KEY") private String groupKey; + @Transient + @ApiParam(value = "作业步骤名称") + private String asName; + + @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient + @ApiParam(value = "流程名称") + private String agName; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index a41ef59..d43b2d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.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; @@ -29,31 +30,36 @@ import javax.persistence.Table; public class WmsActionModule extends BaseBean { private static final long serialVersionUID = 9117362998863937579L; - @Column(name = "AM_NAME") + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") + @AnnoOutputColumn public String amName; - @Column(name = "AM_DESC") + @Column(name = "AM_DESC", nullable = false) @ApiParam("组件描述") + @AnnoOutputColumn public String amDesc; - @Column(name = "CALL_CLASS") + @Column(name = "CALL_CLASS",nullable = false) @ApiParam("实现类") + @AnnoOutputColumn public String callClass; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE", nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型") public String opTypeCode; - @Column(name = "IS_SHOW_INFO") - @ApiParam(value = "是否实现回显", example = "0") + @Column(name = "IS_SHOW_INFO", nullable = false) + @ApiParam(value = "是否实现回显") + @AnnoOutputColumn public Integer isShowInfo; - @ApiParam(value = "作业类型名称", example = "0") + @ApiParam(value = "作业类型名称") public String opTypeName; public WmsActionModule() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index a87c559..1923bb0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,34 @@ import javax.persistence.Table; public class WmsActionModuleParam extends BaseBean { private static final long serialVersionUID = 8099621042858629818L; - @Column(name = "AM_ID") - @ApiParam(value = "组件ID", example = "0") + @Column(name = "AM_ID", nullable = false) + @ApiParam(value = "组件ID") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; - @Column(name = "METHOD_NAME") + @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''") @ApiParam("组件执行方法名称") + @AnnoOutputColumn public String methodName; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE", nullable = false) @ApiParam("参数编码") + @AnnoOutputColumn public String paramCode; - @Column(name = "PARAM_NAME") + @Column(name = "PARAM_NAME", nullable = false) @ApiParam("参数名称") + @AnnoOutputColumn public String paramName; - @Column(name = "PARAM_VALUE_LIST") + @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''") @ApiParam("参数可选值列表") public String paramValueList; - @Column(name = "PARAM_TYPE") + @Column(name = "PARAM_TYPE",nullable = false) @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") + @AnnoOutputColumn public Integer paramType; public int getParamTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 265272b..8144c65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,33 @@ import javax.persistence.Table; public class WmsActionStep extends BaseBean { private static final long serialVersionUID = 6460096995982059959L; - @Column(name = "AS_NAME_E") + @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String asNameE; - @Column(name = "AS_DESC_E") + @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String asDescE; - @Column(name = "AS_NAME_C") + @Column(name = "AS_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String asNameC; - @Column(name = "AS_DESC_C") + @Column(name = "AS_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String asDescC; - @Column(name = "AT_NAME_C_RDD") + @Column(name = "AT_NAME_C_RDD", nullable = false) @ApiParam(value = "步骤类型名称") + @AnnoOutputColumn private String atNameCRdd; - @Column(name = "AT_ID") + @Column(name = "AT_ID", nullable = false) @ApiParam(value = "步骤类型编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 4b8388f..c354a66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -33,18 +34,21 @@ import javax.persistence.*; public class WmsActionStepCall extends BaseBean { private static final long serialVersionUID = -6013283534745803464L; - @Column(name = "AS_ID") + @Column(name = "AS_ID",nullable = false) @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long asId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn public Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; @Transient @@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE",nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OK_VALUE") - @ApiParam(value = "成功标志", example = "10") + @Column(name = "OK_VALUE", nullable = false) + @ApiParam(value = "成功标志") + @AnnoOutputColumn public Integer okValue; public int getAmTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ee0b539..41ceb88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,25 +33,29 @@ import javax.persistence.Transient; public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; - @Column(name = "AGD_ID") + @Column(name = "AGD_ID", nullable = false) @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agdId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号") + @AnnoOutputColumn private Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long amId; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE",nullable = false) @ApiParam(value = "参数编码") + @AnnoOutputColumn private String paramCode; - @Column(name = "PARAM_VALUE") + @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "参数值") private String paramValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 926e108..4f8536b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.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; @@ -21,31 +22,34 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_ACTION_TYPE") +@Table(name = "WMS_ACTION_TYPE") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +@Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { private static final long serialVersionUID = -8019644718382990603L; - @Column(name = "AT_NAME_E") + @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String atNameE; - @Column(name = "AT_DESC_E") + @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String atDescE; - @Column(name = "AT_NAME_C") + @Column(name = "AT_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String atNameC; - @Column(name = "AT_DESC_C") + @Column(name = "AT_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String atDescC; - @Column(name = "FUN_CALL_NAME") + @Column(name = "FUN_CALL_NAME", nullable = false) @ApiParam(value = "方法调用名称") + @AnnoOutputColumn private String funCallName; } From 0acf17ddd7e1ff8a8e3b4fd080bc783b70e74e2c Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 11 Dec 2019 19:02:39 +0800 Subject: [PATCH 038/138] =?UTF-8?q?=E3=80=901211=EF=BC=9A=E6=8A=A5?= =?UTF-8?q?=E8=A1=A81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 51 +++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 79 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 +++ .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 5 ++ .../i3plus/pojo/mes/model/QcCheckDataModel.java | 6 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 16 +++-- 8 files changed, 159 insertions(+), 13 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 3a774f8..9c9e922 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 @@ -12,6 +12,53 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRUE_OR_FALSE { TRUE(1, "是"), @@ -341,7 +388,7 @@ public class MesEnumUtil { public enum IF_CONNECT_TYPE { DB("10", "DB"), - WEBSERVICE("20", "webservice "), + WEBSERVICE("20", "webservice"), RESTFUL("30", "restful"); private String value; @@ -779,7 +826,7 @@ public class MesEnumUtil { SCRATCH(10, "划痕"), FRACTURE(20, "破碎"), - SCRAP_TYPE3(30, "缺失"); + SCRAP_TYPE(30, "缺失"); private int value; private String description; 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 bef1e71..cf5ea6e 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 @@ -707,7 +707,8 @@ public class MesPcnEnumUtil { public enum MES_REPAIR_STATUS { REPAIRED(10, "已维修"), - NO_REPAIR(20, "待维修"); + NO_REPAIR(20, "待维修"), + NO_CONFIRM(30, "待确认"); private int value; private String description; 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 0d764b8..d1cc236 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 @@ -1,5 +1,10 @@ package cn.estsh.i3plus.pojo.base.util; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + public class StringUtil { public static boolean isEmpty(Object obj){ @@ -10,4 +15,78 @@ public class StringUtil { return false; } + + + + /** + * 获取对象所有属性名 + * @param clazz + * @return + */ + public static String[] getFields(Class clazz) { + Field[] fields = clazz.getDeclaredFields(); + String[] fieldNames = new String[fields.length]; + for(int i=0;i getFieldList(Class clazz) { + Field[] fields = clazz.getDeclaredFields(); + Field[] superFields = clazz.getSuperclass().getDeclaredFields(); + List fieldNames = new ArrayList<>(); + for(int i = 0;i < fields.length; i++){ + fieldNames.add(fields[i].getName()); + } + for(int i = 0;i < superFields.length; i++){ + fieldNames.add(superFields[i].getName()); + } +// fieldNames.add("id"); +// fieldNames.add("organizeCode"); +// fieldNames.add("isValid"); +// fieldNames.add("isDeleted"); +// fieldNames.add("createUser"); +// fieldNames.add("createDatetime"); +// fieldNames.add("modifyUser"); +// fieldNames.add("modifyDatetime"); + return fieldNames; + } + + /** + * 根据属性名和对象获取属性对应的值 + * @param fieldName + * @param o + * @return + */ + public static Object getFieldValueByName(String fieldName, Object o) { + try { + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String getter = "get" + firstLetter + fieldName.substring(1); + Method method = o.getClass().getMethod(getter, new Class[] {}); + Object value = method.invoke(o, new Object[] {}); + return value; + } catch (Exception e) { + return null; + } + } + + /** + * 拼接对象所有属性名 + * @return + */ + public static String getFieldNames(String[] fieldNames) { + StringBuffer stringBuffer = new StringBuffer(); + for (String fieldName : fieldNames) { + stringBuffer.append(fieldName).append(","); + } + int stringBufferLength = stringBuffer.length(); + stringBuffer.delete(stringBufferLength - 1, stringBufferLength); + return stringBuffer.toString(); + } } 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 824d9a8..c543454 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 @@ -131,11 +131,11 @@ public class MesProduceSn extends BaseBean { @Transient @ApiParam("下线开始时间") - private String outWorkCenterStartTime; + private String outWorkCenterTimeStart; @Transient @ApiParam("下线结束时间") - private String outWorkCenterEndTime; + private String outWorkCenterTimeEnd; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; 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 3da8adb..79037ef 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 @@ -128,6 +128,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线开始时间") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线结束时间") + private String outWorkCenterTimeEnd; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 3555f12..504c480 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :生产数据 @@ -100,4 +101,8 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Transient + @ApiParam("字段总数") + private Integer fieldNum; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index d958a07..885043f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -80,13 +80,13 @@ public class QcCheckDataModel { private String workCellName; @ApiParam("物料名称") - private String partNoName; + private String partName; public QcCheckDataModel() { } - public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) { + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) { this.id = id; this.organizeCode = organizeCode; this.createUser = createUser; @@ -111,6 +111,6 @@ public class QcCheckDataModel { this.shiftGroupName = shiftGroupName; this.squadLeader = squadLeader; this.workCellName = workCellName; - this.partNoName = partNoName; + this.partName = partName; } } 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 b3c14e1..c96c3ce 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 @@ -414,7 +414,7 @@ public class MesHqlPack { /** * MES 开线管控 * - * @param mesWcCheck + * @param wcCheck * @return */ public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) { @@ -1838,11 +1838,11 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) { - DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean); + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) { - DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean); + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); // DdlPreparedPack.timeBuilder( // mesProduceSn.getOutWorkCenterStartTime(), // mesProduceSn.getOutWorkCenterEndTime(), @@ -2021,6 +2021,12 @@ public class MesHqlPack { if (mesProduceSnTravel.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean); } + if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); + } + if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); + } DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), mesProduceSnTravel.getCreateDateTimeEnd(), From ccfba0fe56d2b025417ec08ab5917213948504bc Mon Sep 17 00:00:00 2001 From: zcg Date: Thu, 12 Dec 2019 08:59:58 +0800 Subject: [PATCH 039/138] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE=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/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 d389317..53d5477 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 @@ -1377,7 +1377,9 @@ public class MesEnumUtil { MES_REPAIR(320,"质量数据处理措施"), MES_EQU_TASK_PLAN(330,"设备作业周期计划"), MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); + MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), + MES_DATASOURCE(360,"DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); private int value; private String description; From b2daf9fd9c79d05ab9796400bc66d5fee81efef4 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 09:38:06 +0800 Subject: [PATCH 040/138] =?UTF-8?q?task=20`1300`=20=201=09BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 127 +++++++++++++++++++-- .../pojo/mes/bean/MesQualityStandardCfg.java | 52 +++++++++ .../i3plus/pojo/mes/model/ProductBiModel.java | 18 ++- .../pojo/mes/model/ProductBiSeriesModel.java | 1 - .../MesQualityStandardCfgRepository.java | 14 +++ 5 files changed, 196 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java 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 d389317..b36cc75 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 @@ -13,6 +13,40 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CALENDAR_TYPE { + DAY(10, "日"), + WEEK(20, "周"), + MONTH(30, "月"), + YEAR(40, "年"); + + private int value; + private String description; + + CALENDAR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRUE_OR_FALSE { TRUE(1, "是"), FALSE(2, "否"); @@ -1368,16 +1402,16 @@ public class MesEnumUtil { MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260,"设备故障原因"), - MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"), - MES_DEFECT(290,"缺陷"), - MES_DEFECT_CAUSE(300,"缺陷原因"), - MES_SCRAP(310,"报废原因"), - MES_REPAIR(320,"质量数据处理措施"), - MES_EQU_TASK_PLAN(330,"设备作业周期计划"), - MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); + MES_FAULT_CAUSE(260, "设备故障原因"), + MES_FAULT_METHOD(270, "设备故障处理措施"), + MES_FAULT_PHENOMENON(280, "设备故障现象"), + MES_DEFECT(290, "缺陷"), + MES_DEFECT_CAUSE(300, "缺陷原因"), + MES_SCRAP(310, "报废原因"), + MES_REPAIR(320, "质量数据处理措施"), + MES_EQU_TASK_PLAN(330, "设备作业周期计划"), + MES_PART_OJBECT(340, "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"); private int value; private String description; @@ -3079,6 +3113,79 @@ public class MesEnumUtil { } /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_STANDARD_TYPE { + + NG_RATE(10, "不良率"), + PPM(20, "PPM"); + + private int value; + private String description; + + QUALITY_STANDARD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_OBJECT_TYPE { + + ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), + PRODUCT(30, "产品"); + + private int value; + private String description; + + QUALITY_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java new file mode 100644 index 0000000..0180221 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.util.List; + +/** + * @Description :质量标准配置 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD_CFG") +@Api("质量标准配置") +public class MesQualityStandardCfg extends BaseBean { + + @Column(name = "STANDARD_TYPE") + @ApiParam("标准类型") + private Integer standardType; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_KEY_VALUE") + @ApiParam("对象键值") + private String objectKeyValue; + + @Column(name = "OBJECT_KEY") + @ApiParam("对象键") + private String objectKey; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index 0104edc..c5a3c6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : 用于产线运行情况数据 @@ -39,7 +40,7 @@ public class ProductBiModel { private double outputQty; @ApiParam(value = "完成率") - private double CompleteRate; + private double completeRate; @ApiParam(value = "合格数量") private double passQty; @@ -53,6 +54,9 @@ public class ProductBiModel { @ApiParam(value = "不良率") private double ngRate; + @ApiParam(value = "警戒值") + private double sentinelValue; + @ApiParam("客户代码") private String customerCode; @@ -65,12 +69,16 @@ public class ProductBiModel { @ApiParam("图表显示的数据") private List series; + @ApiParam("列名") + private Map colMap; + + @Deprecated public double getCompleteRate() { - if(this.planQty != 0) { - this.CompleteRate = outputQty / planQty; + if (this.planQty != 0) { + this.completeRate = outputQty / planQty; } else { - this.CompleteRate = 0; + this.completeRate = 0; } - return this.CompleteRate; + return this.completeRate; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index d7b15f8..17d1089 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java new file mode 100644 index 0000000..cfe91d2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandardCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesQualityStandardCfgRepository extends BaseRepository { +} From ef34a13313126e8156ef725873c8e083061014e3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 09:47:41 +0800 Subject: [PATCH 041/138] =?UTF-8?q?task=20`1300`=20=202=09BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 +++++++++++++++++++--- 1 file changed, 83 insertions(+), 12 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 375c0d3..96d78a8 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 @@ -1450,18 +1450,18 @@ public class MesEnumUtil { MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260,"设备故障原因"), - MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"), - MES_DEFECT(290,"缺陷"), - MES_DEFECT_CAUSE(300,"缺陷原因"), - MES_SCRAP(310,"报废原因"), - MES_REPAIR(320,"质量数据处理措施"), - MES_EQU_TASK_PLAN(330,"设备作业周期计划"), - MES_PART_OJBECT(340,"物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), - MES_DATASOURCE(360,"DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); + MES_FAULT_CAUSE(260, "设备故障原因"), + MES_FAULT_METHOD(270, "设备故障处理措施"), + MES_FAULT_PHENOMENON(280, "设备故障现象"), + MES_DEFECT(290, "缺陷"), + MES_DEFECT_CAUSE(300, "缺陷原因"), + MES_SCRAP(310, "报废原因"), + MES_REPAIR(320, "质量数据处理措施"), + MES_EQU_TASK_PLAN(330, "设备作业周期计划"), + MES_PART_OJBECT(340, "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), + MES_DATASOURCE(360, "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"); private int value; private String description; @@ -3161,8 +3161,79 @@ public class MesEnumUtil { return tmp; } } + /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_STANDARD_TYPE { + + NG_RATE(10, "不良率"), + PPM(20, "PPM"); + + private int value; + private String description; + + QUALITY_STANDARD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** + * 质量标准配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUALITY_OBJECT_TYPE { + + ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), + PRODUCT(30, "产品"); + + private int value; + private String description; + + QUALITY_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From ef9293867f6d10026b74eaecee1dafe942d6536b Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 12 Dec 2019 10:02:30 +0800 Subject: [PATCH 042/138] =?UTF-8?q?=E3=80=90bug6929=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E9=81=93=E5=8F=A3=E6=95=B0=E9=87=8F=E9=95=BF=E5=BA=A6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=99=90=E5=88=B6=E3=80=91=E3=80=90bug6928=20?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E9=81=93=E5=8F=A3=E4=B8=BA0=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E4=B8=BA1=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/WmsPOMaster.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/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 12dff4c..681ae56 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -159,7 +159,7 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; - @Column(name = "DOCK") + @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") @ApiParam("道口") public String dock; From 59bdec9c6fb49ec2d7d910b95a9ed691c139b7de Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 12 Dec 2019 10:42:58 +0800 Subject: [PATCH 043/138] =?UTF-8?q?=E3=80=906933=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=AE=B9=E5=99=A8=E6=9C=AA=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=9C=8B=E6=9D=BF=E6=94=B6=E8=B4=A7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=94=B6=E8=B4=A7=E5=AE=8C=E6=88=90=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 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 50a5461..4b4b298 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 @@ -4427,8 +4427,9 @@ public class WmsEnumUtil { WAIT_RECEIVING(10, "待收货"), RECEIVING(20, "收货中"), COMPLETE_RECEIVING(30, "收货完成"), - UN_RECEIVED(40, "延迟未收货"), - ELSE(50,"其他"); + CLOSE(40,"已关闭"), + CANCEL(50,"已取消"), + UN_RECEIVED(60, "延迟未收货"); private int value; private String description; From 67f7d66782331fa5ca91901a3f9af0c0d8890d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Dec 2019 11:42:49 +0800 Subject: [PATCH 044/138] =?UTF-8?q?=E5=AE=81=E5=BE=B7=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98#330?= 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 3c3d128..4b043a8 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 @@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1203,6 +1199,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result); + //单据状态 + DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsQCMaster, result); From b52d5b392d30f7e196d27c241e56f19116e56c40 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 14:17:50 +0800 Subject: [PATCH 045/138] =?UTF-8?q?task=20`1300`=204=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 5c3ceb5..57862f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -47,7 +47,7 @@ public class MesRawPartSn extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("数量") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("生产批次") @@ -65,7 +65,7 @@ public class MesRawPartSn extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index a55a07f..0e6b2b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -39,7 +39,7 @@ public class IfRawPartDataModel extends BaseBean { private String serialNumber; @ApiParam("数量") - private BigDecimal qty; + private Double qty; @ApiParam("单位") private String unit; From 46ec9e51b040383791e7108a2ab48856afc810d7 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 12 Dec 2019 16:04:31 +0800 Subject: [PATCH 046/138] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A121?= =?UTF-8?q?1=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 24 ---------------------- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 17 +++++++++++++++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 16 +++++++++++++++ .../i3plus/pojo/mes/model/ProdBindRecordModel.java | 6 ++++++ .../i3plus/pojo/mes/model/QcCheckDataModel.java | 10 ++++++++- 6 files changed, 49 insertions(+), 26 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 93443f9..1b112f0 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 @@ -1836,7 +1836,7 @@ public class MesEnumUtil { } /** - * pcn 动作类型 + * MesProdBindRecord 动作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_TYPE { 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 d1cc236..46af027 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 @@ -16,8 +16,6 @@ public class StringUtil { return false; } - - /** * 获取对象所有属性名 * @param clazz @@ -47,14 +45,6 @@ public class StringUtil { for(int i = 0;i < superFields.length; i++){ fieldNames.add(superFields[i].getName()); } -// fieldNames.add("id"); -// fieldNames.add("organizeCode"); -// fieldNames.add("isValid"); -// fieldNames.add("isDeleted"); -// fieldNames.add("createUser"); -// fieldNames.add("createDatetime"); -// fieldNames.add("modifyUser"); -// fieldNames.add("modifyDatetime"); return fieldNames; } @@ -75,18 +65,4 @@ public class StringUtil { return null; } } - - /** - * 拼接对象所有属性名 - * @return - */ - public static String getFieldNames(String[] fieldNames) { - StringBuffer stringBuffer = new StringBuffer(); - for (String fieldName : fieldNames) { - stringBuffer.append(fieldName).append(","); - } - int stringBufferLength = stringBuffer.length(); - stringBuffer.delete(stringBufferLength - 1, stringBufferLength); - return stringBuffer.toString(); - } } 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 4a0664a..91b8786 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 @@ -138,6 +138,23 @@ public class MesProduceSn extends BaseBean { @ApiParam("下线结束时间") private String outWorkCenterTimeEnd; + @Transient + @ApiParam("操作类型名称") + private String operateTypeName; + + @Transient + @ApiParam("条码状态名称") + private String snStatusName; + + @Transient + @ApiParam("质量状态名称") + private String qcStatusName; + + @Transient + @ApiParam("条码类型名称") + private String snTypeName; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 2ffdb60..ab88546 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 @@ -138,6 +138,22 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("下线结束时间") private String outWorkCenterTimeEnd; + @Transient + @ApiParam("操作类型名称") + private String operateTypeName; + + @Transient + @ApiParam("条码状态名称") + private String snStatusName; + + @Transient + @ApiParam("质量状态名称") + private String qcStatusName; + + @Transient + @ApiParam("条码类型名称") + private String snTypeName; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java index cc2e482..4c09523 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java @@ -74,6 +74,12 @@ public class ProdBindRecordModel implements Serializable { @ApiParam(value = "动作类型") private String actionType; + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + + @ApiParam(value = "动作类型名称") + private String actionTypeName; + public ProdBindRecordModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index 885043f..1d8e6e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -82,11 +82,17 @@ public class QcCheckDataModel { @ApiParam("物料名称") private String partName; + @ApiParam(value = "修改人") + private String modifyUser; + + @ApiParam(value = "修改日期") + private String modifyDatetime; + public QcCheckDataModel() { } - public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) { + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName, String modifyUser, String modifyDatetime) { this.id = id; this.organizeCode = organizeCode; this.createUser = createUser; @@ -112,5 +118,7 @@ public class QcCheckDataModel { this.squadLeader = squadLeader; this.workCellName = workCellName; this.partName = partName; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } } From a1a602e457e598689a3d7df8fb6192c7b7d936bd Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 16:25:52 +0800 Subject: [PATCH 047/138] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 +- .../cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 57 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/ProductBiModel.java | 3 ++ .../pojo/mes/repository/IfWmsPpmRepository.java | 14 ++++++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java 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 96d78a8..7849af1 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 @@ -3161,6 +3161,7 @@ public class MesEnumUtil { return tmp; } } + /** * 质量标准配置 */ @@ -3168,7 +3169,8 @@ public class MesEnumUtil { public enum QUALITY_STANDARD_TYPE { NG_RATE(10, "不良率"), - PPM(20, "PPM"); + INNER_PPM(20, "PPM"), + ONLINE_PPM(30, "线上PPM"); private int value; private String description; @@ -3233,6 +3235,7 @@ public class MesEnumUtil { return tmp; } } + /** * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java new file mode 100644 index 0000000..f66ba69 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -0,0 +1,57 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/12 4:00 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_WMS_PPM") +@Api("WMS PPM 接口表") +public class IfWmsPpm extends BaseBean { + + @Column(name = "YEAR") + @ApiParam("年") + private String year; + + @Column(name = "MONTH") + @ApiParam("月") + private String month; + + @Column(name = "PPM_VALUE") + @ApiParam("PPM值") + private String ppmValue; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index c5a3c6e..ed73333 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -66,6 +66,9 @@ public class ProductBiModel { @ApiParam("x坐标内容") private List xAxis; + @ApiParam("一些携带值 eg:异常类型，异常次数") + private Map carryMap; + @ApiParam("图表显示的数据") private List series; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java new file mode 100644 index 0000000..4c96fa6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfWmsPpmRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfWmsPpm; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfWmsPpmRepository extends BaseRepository { +} From 3ff9fbc14090cb6884a166102ddde7cfe2b65769 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Dec 2019 16:43:30 +0800 Subject: [PATCH 048/138] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 17 ++++++- .../pojo/andon/model/AndonMenuInterfaceModel.java | 55 +++++++++++++++++----- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 9 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 33 +++++++++---- 4 files changed, 91 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 819fdd7..6c8ff91 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -21,6 +21,12 @@ public class AndonBoardModel { @ApiParam("工作单元名称") private String workCellName; + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("生产线名称") + private String workCenterName; + @ApiParam("安灯任务编号") private String andonOrderNo; @@ -36,9 +42,12 @@ public class AndonBoardModel { @ApiParam("响应时长 单位：分钟") private Long responseTimeCount = 0L; - @ApiParam("解决时长 单位：分钟") + @ApiParam("响应时长 单位：分钟") private Long resetTimeCount = 0L; + @ApiParam("响应时长/响应时长(通用) 单位：分钟") + private Long commonTimeCount = 0L; + @ApiParam("安灯正常处理的次数") private Integer inTime = 0; @@ -60,6 +69,8 @@ public class AndonBoardModel { @ApiParam("工位运行状态") private String cellStatus; + @ApiParam("图表类型颜色") + private String color; public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; @@ -85,6 +96,8 @@ public class AndonBoardModel { return resetTimeCount == null ? 0 : resetTimeCount; } - + public double getCommonTimeCountVal() { + return commonTimeCount == null ? 0 : commonTimeCount; + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index cad9398..79813f6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.model; import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,27 +42,54 @@ public class AndonMenuInterfaceModel{ @ApiParam("当前安灯类型故障比例") private Double proportion = 0D; - @ApiParam("当前工厂的产线故障统计") - private List andonWorkcenterList; + @ApiParam("图表类型颜色") + private String color; - @ApiParam("当前产线的所有故障统计") - private List alarmBrokenInfoList; + @ApiParam("安灯状态") + private Integer actionCode; - @ApiParam("当前产线的未解决故障统计") - private List pendingSolveBrokenInfoList; + @ApiParam("安灯状态名称") + private String actionName; + + @ApiParam("mes微服调用-故障次数占比") + private List mesBrokenRatioList; - @ApiParam("当前产线的响应时长top10") - private List responseInfoList; + @ApiParam("故障时长类型占比 / 故障次数占比 / 工厂故障信息-产线故障时长-产线时长集合") + private List brokenRatioList; - @ApiParam("当前产线的解决时长top10") - private List solveInfoList; + @ApiParam("工厂故障信息-产线故障时长-安灯类型集合") + private List workcenterBrokenTimeList; - @ApiParam("当前产线的异常时长top10") - private List exceptionInfoList; + @ApiParam("工厂故障信息-产线故障时长-产线集合") + private List workCenterList; - @ApiParam("当前产线的站点状态统计") + @ApiParam("产线整体状态") + private List andonWorkcenterList; + + @ApiParam("产品运行状态示意图") private List andonCellGroupStatusList; + @ApiParam("事件设备时长TOP10") + private List equTimeList; + + @ApiParam("事件设备时长TOP10-次数") + private List equInTimeList; + + @ApiParam("事件质量时长TOP10") + private List qualityTimeList; + + @ApiParam("事件质量时长TOP10-次数") + private List qualityInTimeList; + + @ApiParam("事件物料时长TOP10") + private List partTimeList; + + @ApiParam("事件物料时长TOP10-次数") + private List partInTimeList; + + @ApiParam("当前产线的未解决故障统计") + private List pendingSolveBrokenInfoList; + public double getExceptionTimeVal() { return exceptionTime == null ? 0 : exceptionTime; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 1dfe741..74e3e2b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -867,4 +867,13 @@ public class AndonHqlPack { return result; } + + public static DdlPackBean packHqlAndonMenu(String organizeCode, String workCenterCode, String startDateTime, String endDateTime) { + DdlPackBean result = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(workCenterCode)) { + DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", result); + } + DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true); + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b8293b6..b05d85c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -947,24 +947,27 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM", 110060104, "物料"), - QUALITY("QUALITY_ALARM", 110060105, "质量"), - EQUIP("EQUMENT_ALARM", 110060106, "设备"), - PROCESS("ROUTING_ALARM", 110060107, "工艺"), - CHECK("OTHER_ALARM", 110060108, "自处理"), - FIX_ERROR("FIX_ERROR", 110060109, "自动报警"); + //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 + EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), + QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), + PART("PART_ALARM", 110060104, "物料", "#24BDBA"), + PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), + CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"), + FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); private String value; private Integer code; private String description; + private String colour; - ALARM_TYPE(String value, Integer code, String description) { + ALARM_TYPE(String value, Integer code, String description, String colour) { this.value = value; this.code = code; this.description = description; + this.colour = colour; } - public String getValue() { + public String getValue() { return value; } @@ -976,6 +979,10 @@ public class AndonEnumUtil { return description; } + public String getColour() { + return colour; + } + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -995,6 +1002,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String colourOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].colour; + } + } + return tmp; + } } /** From 91e3209ef98b9019b18d2baec248172deac3dc06 Mon Sep 17 00:00:00 2001 From: gcj Date: Thu, 12 Dec 2019 17:41:05 +0800 Subject: [PATCH 049/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 4 ++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 9 ++++++++ .../estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 6 +++-- .../estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index a848e46..d940955 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -85,6 +85,10 @@ public class BasVendor extends BaseBean{ @ApiParam("小数位符号") private String decimals; + //20-承运商 + @Column(name = "VENDOR_TYPE") + private Integer vendorType; + public BasVendor() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 1d69271..b04a9ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -13,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 车辆信息 @@ -103,4 +105,11 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("物料编码") private String partNo; + @Transient + @ApiParam("关联单号") + private String refOrderNo; + + @Transient + @ApiParam("打印模板列表") + private List shipModels; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index add6b54..cdcb0cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -19,10 +19,12 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("物料号") private String partNo; + @ApiParam("运输状态") - private String carriageStatus; + private String orderStatus; + @ApiParam("单据号") - private String orderNo; + private String moveNo; @ApiParam("是否删除，默认否") protected Integer isDeleted = 2; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java new file mode 100644 index 0000000..7f62f02 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 装车单打印 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-06 15:50 + * @Modify: + **/ +@Data +public class WmsTmsShipModel { + + @ApiParam("物料编码") + private String partNo; + @ApiParam("物料名称") + private String partName; + @ApiParam("需求数量") + private Double qty; + @ApiParam("实际数量") + private Double recQty; + @ApiParam("单位") + private String unit; +} 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 3c3d128..b64b218 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 @@ -420,6 +420,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); + DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result); getStringBuilderPack(basVendor, result); From 48338fec28468fe4548bf4fb369487eddc6c16bf Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 20:20:16 +0800 Subject: [PATCH 050/138] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 91b8786..a1585c7 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.math.BigDecimal; /** * @Description: @@ -154,6 +155,14 @@ public class MesProduceSn extends BaseBean { @ApiParam("条码类型名称") private String snTypeName; + public MesProduceSn() { + } + + public MesProduceSn(String partNo, Integer qcStatus, Double qty) { + this.partNo = partNo; + this.qcStatus = qcStatus; + this.qty = qty; + } public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 3bfb0995d51179174904d664534b6b998492b5ba Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Dec 2019 20:35:11 +0800 Subject: [PATCH 051/138] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E3=80=90=E8=B4=B5?= =?UTF-8?q?=E9=87=8D=E7=89=A9=E6=96=99=E3=80=91=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=B8=8A=E7=BA=BF=E6=B5=81=E7=A8=8B=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=AD=A4=E5=B1=9E=E6=80=A7=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=20=E3=80=91bug1299?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 37 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++ 2 files changed, 42 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 50a5461..a7ceeff 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 @@ -3023,6 +3023,8 @@ public class WmsEnumUtil { } } + + /** * 任务数据来源：检查子数据 */ @@ -4565,4 +4567,39 @@ public class WmsEnumUtil { } } + + /** + * 是否贵重物料 + * 默认为2 + */ + public enum IS_VALUABLE { + TRUE(1, "贵重物料"), FALSE(2, "非贵重物料"); + + private int value; + private String description; + + IS_VALUABLE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file 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 1d2e6b8..e4a35f8 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 @@ -170,6 +170,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "待质检比例", example = "1") private Double proportion; + @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") + @ApiParam(value = "贵重物料") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") + private Integer isValuable; + @Transient @ApiParam("总数量") private Double qty; From 8a2e4134ed70606d1b35925a67736d0e3509e6b8 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 13 Dec 2019 09:41:25 +0800 Subject: [PATCH 052/138] =?UTF-8?q?[mes=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 93443f9..2f47d7f 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 @@ -1426,7 +1426,10 @@ public class MesEnumUtil { MES_PART_OJBECT(340,"物料对象"), MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), MES_DATASOURCE(360,"DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); + MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"); + private int value; private String description; From ee14ce1d4b17a7bfdd9dfe59402998bfebac07e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Dec 2019 09:41:44 +0800 Subject: [PATCH 053/138] =?UTF-8?q?=E3=80=90KT-=E5=BF=AB=E9=80=9F=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 106 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 98 ++++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 35 +++++++ 3 files changed, 196 insertions(+), 43 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 99d9bdd..426f54b 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 @@ -4545,4 +4545,110 @@ public class WmsEnumUtil { } } + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_DETAILS_STATUS { + BE_HANDLE(10,"BE_HANDLE", "待处理"), + CANCELLATION(20,"CANCELLATION", "已处理"); + + private int value; + private String code; + private String description; + + PULL_TASK_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_MASTER_STATUS { + CREATE(10,"CREATE", "创建"), + ENABLED(20,"ENABLED", "已启动"), + COMPLETE(30,"COMPLETE", "已完成"), + CLOSE(40,"CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + PULL_TASK_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index 09f05c2..b2e4e34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String wrokorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -47,8 +47,8 @@ public class WmsPullTaskDetails extends BaseBean{ private String locateNo; @Column(name="LOCATE_CAPACITY") - @ApiParam("库位容量") - private String locateCapacity; + @ApiParam(value = "库位容量", example = "0") + private Integer locateCapacity = 0; @Column(name="PART_NO") @ApiParam("零件编号") @@ -58,49 +58,53 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("零件名称") private String partNameRdd; + @Column(name="PLAN_PACK_QTY") + @ApiParam(value = "计划数量", example = "0d") + private Double planPackQty = 0d; + @Column(name="PLAN_PACK_COUNT") - @ApiParam(value = "计划容器数", example = "0") - private Integer planPackCount = 0; + @ApiParam(value = "计划容器数", example = "0d") + private Double planPackCount = 0d; @Column(name="FIRST_BATCH_QTY") - @ApiParam(value = "首批批量", example = "0") - private Integer firstBatchQty = 0; + @ApiParam(value = "首批批量", example = "0d") + private Double firstBatchQty = 0d; @Column(name="FIRST_PACK_COUNT") - @ApiParam(value = "首批容器数", example = "0") - private Integer firstPackCount = 0; + @ApiParam(value = "首批容器数", example = "0d") + private Double firstPackCount = 0d; @Column(name="REQUEST_QTY") - @ApiParam(value = "补货批量", example = "0") - private Integer requestQty = 0; + @ApiParam(value = "补货批量", example = "0d") + private Double requestQty = 0d; @Column(name="REQUEST_PACK_COUNT") - @ApiParam(value = "补货容器数", example = "0") - private Integer requestPackCount = 0; + @ApiParam(value = "补货容器数", example = "0d") + private Double requestPackCount = 0d; @Column(name="REQUEST_LOT_NO") - @ApiParam(value = "补货批次", example = "0") - private Integer requestLotNo = 0; + @ApiParam(value = "补货批次", example = "0d") + private Double requestLotNo = 0d; @Column(name="REQUEST_TOTAL_COUNT") - @ApiParam(value = "补货累加次数", example = "0") - private Integer requestTotalCount = 0; + @ApiParam(value = "补货累加次数", example = "0d") + private Double requestTotalCount = 0d; @Column(name="LAST_REQUEST_TIME") @ApiParam("上一次补货时间") private String lastRequestTtime; @Column(name="BOOT_QTY") - @ApiParam(value = "尾箱批量", example = "0") - private Integer bootQty = 0; + @ApiParam(value = "尾箱批量", example = "0d") + private Double bootQty = 0d; @Column(name="BOOT_PACK_COUNT") - @ApiParam(value = "尾箱容器数", example = "0") - private Integer bootPackCount = 0; + @ApiParam(value = "尾箱容器数", example = "0d") + private Double bootPackCount = 0d; @Column(name="BOOT_LOT_NO") - @ApiParam(value = "尾箱批次", example = "0") - private Integer bootLotNo = 0; + @ApiParam(value = "尾箱批次", example = "0d") + private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") @@ -110,48 +114,56 @@ public class WmsPullTaskDetails extends BaseBean{ return orderStatus == null ? 0 : this.orderStatus.intValue(); } - public Integer getBootLotNo() { - return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + public Double getBootLotNo() { + return bootLotNo == null ? 0d : this.bootLotNo.doubleValue(); } - public Integer getBootPackCount() { - return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + public Double getBootPackCount() { + return bootPackCount == null ? 0d : this.bootPackCount.doubleValue(); } - public Integer getBootQty() { - return bootQty == null ? 0 : this.bootQty.intValue(); + public Double getBootQty() { + return bootQty == null ? 0d : this.bootQty.doubleValue(); } - public Integer getRequestTotalCount() { - return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + public Double getRequestTotalCount() { + return requestTotalCount == null ? 0d : this.requestTotalCount.doubleValue(); } - public Integer getRequestLotNo() { - return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + public Double getRequestLotNo() { + return requestLotNo == null ? 0d : this.requestLotNo.doubleValue(); } - public Integer getRequestPackCount() { - return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + public Double getRequestPackCount() { + return requestPackCount == null ? 0d : this.requestPackCount.doubleValue(); } - public Integer getRequestQty() { - return requestQty == null ? 0 : this.requestQty.intValue(); + public Double getRequestQty() { + return requestQty == null ? 0d : this.requestQty.doubleValue(); } - public Integer getFirstPackCount() { - return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + public Double getFirstPackCount() { + return firstPackCount == null ? 0d : this.firstPackCount.doubleValue(); } - public Integer getFirstBatchQty() { - return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + public Double getFirstBatchQty() { + return firstBatchQty == null ? 0d : this.firstBatchQty.doubleValue(); } - public Integer getPlanPackCount() { - return planPackCount == null ? 0 : this.planPackCount.intValue(); + public Double getPlanPackCount() { + return planPackCount == null ? 0d : this.planPackCount.doubleValue(); } public Integer getItem() { return item == null ? 0 : this.item.intValue(); } + public Double getLocateCapacity() { + return locateCapacity == null ? 0d : this.locateCapacity.doubleValue(); + } + + public Double getPlanPackQty() { + return planPackQty == null ? 0d : this.planPackQty.doubleValue(); + } + } \ No newline at end of file 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 3c3d128..a6cff4a 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 @@ -2611,4 +2611,39 @@ public class WmsHqlPack { return result; } + /** + * 拉动计划主表信息分页查询条件 + * + * @param wmsPullTaskMaster + * @return + */ + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getInPack(statusList, "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); + DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result); + + getStringBuilderPack(wmsPullTaskMaster, result); + + return result; + } + + /** + * 拉动计划明细表信息分页查询条件 + * + * @param wmsPullTaskDetails + * @return + */ + public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsPullTaskDetails, result); + + return result; + } + } From 586dfb416b79fff93d91c8b4ab169a4edd0dff92 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 13 Dec 2019 09:57:35 +0800 Subject: [PATCH 054/138] =?UTF-8?q?[mes=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=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/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 91d933f..4ba381d 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 @@ -1461,7 +1461,9 @@ public class MesEnumUtil { MES_PART_OJBECT(340, "物料对象"), MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"); + MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"); private int value; private String description; From bc61b43e8dcfd62f99e637428db9bcdede61d489 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Dec 2019 11:14:36 +0800 Subject: [PATCH 055/138] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=B7=A5=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index ea05280..5f6df39 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ this.organizeCode = organizeCode; this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; this.workCellNameRdd = workCellNameRdd; this.resetUser = resetUser; this.alarmCode = alarmCode; From 3902fb6309560d476d83fcaeef19760ed3092874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 13 Dec 2019 12:39:53 +0800 Subject: [PATCH 056/138] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index be1fccc..01fd23c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -49,6 +49,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") + @AnnoOutputColumn private String languageCode; @Column(name="language_name_rdd") @@ -57,6 +58,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") + @AnnoOutputColumn private String resourceKey; @Lob From b3a04911b6ce91cb8787621da97a371cadc5dbcc Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 13 Dec 2019 13:59:46 +0800 Subject: [PATCH 057/138] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 5 +++ 3 files changed, 47 insertions(+), 3 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 4ba381d..2d6168e 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 @@ -276,7 +276,8 @@ public class MesEnumUtil { DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), - QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); private String value; private String description; @@ -1462,8 +1463,8 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), - MES_PLC(390,"PLC地址清单"); + MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), + MES_PLC(390, "PLC地址清单"); private int value; private String description; 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 cf5ea6e..8f6f9c2 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 @@ -214,7 +214,45 @@ public class MesPcnEnumUtil { } } + /** + * MES_TYPE_CFG 类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG { + + DEFECT("DEFECT", "缺陷"), + DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); + + private String value; + private String description; + + MES_TYPE_CFG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * MesProdBindRecord 是否是关键件 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 6dc2133..43f7f49 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -36,6 +36,8 @@ public class WcCheckModel { private List materials; @ApiParam("物料 列") private Map materialsColumn; + @ApiParam("普通列") + private Map commonColumn; @ApiParam("法") private List routes; @@ -66,6 +68,9 @@ public class WcCheckModel { @ApiParam("需要展示的数据") private Map need2ShowMap; + @ApiParam("重构map") + private Map> showMap; + public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); From 7bc434ed15eb0a9168dff1565a53cd3f421faf6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Dec 2019 14:47:51 +0800 Subject: [PATCH 058/138] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 30d3683..0533141 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean { private String workCellType; public String getName(){ - return this.workCellName; + return this.workCellCode; } } From 59e7704f679fac135d6a1914893f48ea30125e90 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 13 Dec 2019 17:36:55 +0800 Subject: [PATCH 059/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E8=A3=85=E8=BD=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index cdcb0cb..8cdd6a1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -34,4 +34,8 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("工厂代码") protected String organizeCode; + + private String dockNo; + + private Long id; } From da4f32f0b4310274db47c6cc82157e1dbcf4b1a6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Dec 2019 17:42:52 +0800 Subject: [PATCH 060/138] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= 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 | 1 + 1 file changed, 1 insertion(+) 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 83788f2..99eb8af 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 @@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean { public Integer isTask; @Column(name = "PRIORITY") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description") @ApiParam(value = "优先级", example = "1") public Integer priority; From b9b30cf19c8353c7523dc68107469cf64343ae0f Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 13 Dec 2019 18:07:30 +0800 Subject: [PATCH 061/138] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A130?= =?UTF-8?q?6=E8=B4=A8=E9=87=8F=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 22 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPartObject.java | 8 +-- .../i3plus/pojo/mes/model/MesPartObjectModel.java | 67 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++++ 4 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java 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 46af027..95bfee7 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 @@ -3,7 +3,11 @@ package cn.estsh.i3plus.pojo.base.util; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class StringUtil { @@ -65,4 +69,22 @@ public class StringUtil { return null; } } + + private static Pattern linePattern = Pattern.compile("_(\\w)"); + + /** 驼峰转下划线 */ + public static Map humpToLine(Map map) { + Map resultMap = new HashMap<>(); + for (String str : map.keySet()) { + str = str.toLowerCase(); + Matcher matcher = linePattern.matcher(str); + StringBuffer sb = new StringBuffer(); + while (matcher.find()) { + matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); + } + matcher.appendTail(sb); + resultMap.put(sb.toString(), map.get(str)); + } + return resultMap; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 0dc5011..0bac54e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") - @ApiParam("物料名称") - private String objectName; - @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean { @Transient @ApiParam("数据组号") private String groupNo; + + @Transient + @ApiParam("对象名称") + private String objectName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java new file mode 100644 index 0000000..0e1a398 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\13 14:33 + * @Modify: + **/ +@Data +public class MesPartObjectModel { + + private Long id; + + @ApiParam(value ="组织代码") + private String organizeCode; + + @ApiParam(value = "创建用户") + private String createUser; + + @ApiParam(value = "创建日期") + private String createDatetime; + + @ApiParam(value = "修改人") + private String modifyUser; + + @ApiParam(value = "修改日期") + private String modifyDatetime; + + @ApiParam(value = "有效性",example = "1") + private Integer isValid; + + @ApiParam(value = "是否已删除",example = "2") + private Integer isDeleted; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("对象名称") + private String objectName; + + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.partNo = partNo; + this.objectCode = objectCode; + this.workCenterCode = workCenterCode; + this.objectName = objectName; + } +} 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 c96c3ce..6b938ee 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 @@ -2057,4 +2057,28 @@ public class MesHqlPack { } return packBean; } + + /** + * 质量标准配置 + * + * @param qualityStandardCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qualityStandardCfg, organizeCode); + if (!StringUtils.isEmpty(qualityStandardCfg.getStandardType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getStandardType(), "standardType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKey())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKey(), "objectKey", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKeyValue())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKeyValue(), "objectKeyValue", packBean); + } + return packBean; + } } From 2c63820f984c519f11d45436d61bfc2f31e68d74 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 13 Dec 2019 19:57:47 +0800 Subject: [PATCH 062/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index 8cdd6a1..b20a52b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -20,9 +20,6 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("物料号") private String partNo; - @ApiParam("运输状态") - private String orderStatus; - @ApiParam("单据号") private String moveNo; @@ -35,7 +32,30 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("工厂代码") protected String organizeCode; + @ApiParam("ID") + private Long id; + + @ApiParam(value ="道口") private String dockNo; - private Long id; + @ApiParam(value ="承运商编号") + private String vendorNo; + + @ApiParam(value ="承运商名称RDD") + private String vendorName; + + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @ApiParam(value ="驾驶员名称RDD") + private String driverName; + + @ApiParam(value ="驾驶员联系方式RDD") + private String phone; + + @ApiParam(value ="单据状态") + private Integer orderStatus; + + @ApiParam(value ="车牌号RDD") + private String carNo; } From e0f81a73d7bdd2b38588aa28af4d70b8c0625733 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 14 Dec 2019 09:46:32 +0800 Subject: [PATCH 063/138] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=97=A5=E5=8E=86=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/aps/model/GanttCalendarModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 393ee0e..c86230f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -18,4 +18,8 @@ public class GanttCalendarModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String cls; + //private String timeRangeColor; + private String eventColor; + private String name; + private Long workId; } From 99fd4221e21d2cd5ad1a223a4e94dd66f61c8d72 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 14 Dec 2019 17:19:32 +0800 Subject: [PATCH 064/138] =?UTF-8?q?=20task=20`1304`=201=20=E6=B4=BB?= =?UTF-8?q?=E5=8C=96=E5=BC=80=E7=BA=BF=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 +-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 +--- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 68 +++++----------------- 3 files changed, 20 insertions(+), 67 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 2d6168e..a847aa6 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 @@ -3726,13 +3726,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - - PERSON(10, "person", "人员"), - EQUIPMENT(20, "equipment", "设备"), - MATERIAL(30, "material", "物料"), - ROUTE(40, "route", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), - MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); + MATERIAL(10, "MATERIAL", "物料"), + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); private int 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 8f6f9c2..653955c 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 @@ -1213,14 +1213,8 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - - PERSON(10, "people", "人员"), - EQUIPMENT(20, "equipments", "设备"), - MATERIAL(30, "materials", "物料"), - ROUTE(40, "routes", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), - ENVIRONMENT(60, "environment", "环境"); - + MATERIAL(10, "MATERIAL", "物料"), + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 43f7f49..e1e1c93 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -22,30 +22,17 @@ import java.util.*; @Api("开线管控model") public class WcCheckModel { - @ApiParam("人") - private List people; - @ApiParam("人 列") - private Map peopleColumn; - - @ApiParam("机") - private List equipments; - @ApiParam("机 列") - private Map equipmentsColumn; + @ApiParam("工作中心") + private String workCenterCode; - @ApiParam("物料") - private List materials; - @ApiParam("物料 列") - private Map materialsColumn; - @ApiParam("普通列") - private Map commonColumn; + @ApiParam("工单") + private String workOrder; - @ApiParam("法") - private List routes; - @ApiParam("法 列") - private Map routesColumn; + @ApiParam("产品号") + private String partNo; - @ApiParam("对象list和列关系") - private Map dataColumnRelation; + @ApiParam("是否通过") + private Integer isPass; @ApiParam("开线信号") private Integer onlineSignal; @@ -53,46 +40,23 @@ public class WcCheckModel { @ApiParam("开线对象") MesWcCheckRecord onlineSignalEqu; - @ApiParam("是否通过") - private Integer isPass; - - @ApiParam("工作中心") - private String workCenterCode; - - @ApiParam("工单") - private String workOrder; - - @ApiParam("产品号") - private String partNo; - @ApiParam("需要展示的数据") - private Map need2ShowMap; + private Map titleMap; - @ApiParam("重构map") - private Map> showMap; + @ApiParam("对象list和列关系") + private Map> dataColumnRelation; + @ApiParam("重构map") + private Map> dataMap; public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); - wcCheckModel.setPeople(new ArrayList<>()); - wcCheckModel.setEquipments(new ArrayList<>()); - wcCheckModel.setMaterials(new ArrayList<>()); - wcCheckModel.setRoutes(new ArrayList<>()); - wcCheckModel.setPeopleColumn(new HashMap<>()); - wcCheckModel.setEquipmentsColumn(new HashMap<>()); - wcCheckModel.setMaterialsColumn(new HashMap<>()); - wcCheckModel.setRoutesColumn(new HashMap<>()); wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); onlineSignalEqu = new MesWcCheckRecord(); - wcCheckModel.setNeed2ShowMap(new HashMap<>()); - - Map dataColumnRelationMap = new HashMap<>(); - dataColumnRelationMap.put("people", "peopleColumn"); - dataColumnRelationMap.put("equipments", "equipmentsColumn"); - dataColumnRelationMap.put("materials", "materialsColumn"); - dataColumnRelationMap.put("routes", "routesColumn"); - wcCheckModel.setDataColumnRelation(dataColumnRelationMap); + wcCheckModel.setTitleMap(new LinkedHashMap<>()); + wcCheckModel.setDataMap(new LinkedHashMap<>()); + wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); return wcCheckModel; } From f23b0f7bfed0e43f0866f9499fad2a97d7a7c032 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Dec 2019 09:49:21 +0800 Subject: [PATCH 065/138] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 a847aa6..efd4ce1 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 @@ -1463,8 +1463,10 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), - MES_PLC(390, "PLC地址清单"); + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"), + MES_PROCESS(400,"工序信息"), + MES_KPSN_RULE(410,"关键件条码校验规则"); private int value; private String description; From 6d357abe9fad40419ca85da966f9dce1d35f3251 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 16 Dec 2019 13:31:38 +0800 Subject: [PATCH 066/138] =?UTF-8?q?=20task=20`1304`=202=20=E6=B4=BB?= =?UTF-8?q?=E5=8C=96=E5=BC=80=E7=BA=BF=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 2c1d0f7..46134cc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -40,6 +40,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("工作单元名称") + private String workCellName; + @ApiParam("流程代码") private String routeCode; From 258c1ccbe8dfc2390bb17edc223e20f1755132f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Dec 2019 14:24:15 +0800 Subject: [PATCH 067/138] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?CELL=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C+=E6=9C=89=E4=BA=9BSHEET=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6=E6=97=A0=E9=9C=80=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C+=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=EF=BC=9A?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=A7=BB=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=EF=BC=9B=E4=B8=8D=E5=8F=AF=E5=A4=9A?= =?UTF-8?q?=E4=BA=BA=E6=93=8D=E4=BD=9C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=95=B4=E5=BA=93=E7=A7=BB=E5=BA=93?= 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 | 2 -- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + 2 files 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 d6d917c..68528f9 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 @@ -981,7 +981,6 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 - * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { @@ -991,7 +990,6 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - //SCRAP(70, "报废"), COMMING(80, "在途"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 5878561..2926428 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) @ApiParam(value = "是否自动开窗") + @AnnoOutputColumn private Integer isAutoOpenWindow; @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") From c5ae91b41e46559300db58f509a5c5767575db81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 16 Dec 2019 17:25:57 +0800 Subject: [PATCH 068/138] =?UTF-8?q?=E3=80=90KT-1286=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E8=AE=A1=E5=88=92=E6=8B=89=E5=8A=A8JOB?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 5 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 d6d917c..de1b164 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 @@ -4656,7 +4656,7 @@ public class WmsEnumUtil { } /** - * 计划拉动明细表状态创建 + * 计划拉动主表状态创建 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index b2e4e34..0a41d3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String wrokorderNo; + private String woekorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{ private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") - @ApiParam(value = "单据状态", example = "0") + @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; public Integer getOrderStatus() { 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 17c8805..1f4fc92 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 @@ -2618,7 +2618,18 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPack(statusList, "orderStatus", result); + List stringList = null; + List integerList = null; + //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + if(StringUtils.isNotBlank(statusList)){ + stringList = Arrays.asList(statusList.split(",")); + integerList = new ArrayList<>(); + for(String sl : stringList){ + integerList.add(Integer.valueOf(sl)); + } + } + + DdlPreparedPack.getInPackList(integerList, "orderStatus", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); @@ -2637,7 +2648,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result); From bc21d0b46116c7be10baaf4bc95c861d27cb0102 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 16 Dec 2019 18:55:32 +0800 Subject: [PATCH 069/138] =?UTF-8?q?task=20`1308`=201=20PCN=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?= 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 | 3 ++- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 6 +++++- 2 files changed, 7 insertions(+), 2 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 efd4ce1..9846537 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 @@ -3568,7 +3568,8 @@ public class MesEnumUtil { PCN_LOGIN(160, "PCN_LOGIN", ""), PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), - PCN_LOGOUT(190, "PCN_LOGOUT", ""); + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(190, "LOCALE_RES_URL", ""); private int 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 653955c..3147319 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 @@ -214,6 +214,7 @@ public class MesPcnEnumUtil { } } + /** * MES_TYPE_CFG 类型信息 */ @@ -253,6 +254,7 @@ public class MesPcnEnumUtil { return tmp; } } + /** * MesProdBindRecord 是否是关键件 */ @@ -2097,6 +2099,9 @@ public class MesPcnEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), ONE_MIN(60, "一分钟"); private int value; @@ -2433,7 +2438,6 @@ public class MesPcnEnumUtil { } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE { From 3dd247491a2d3af823c71aa114fcc72054635fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 16 Dec 2019 19:18:51 +0800 Subject: [PATCH 070/138] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/softswitch/SuitClientModel.java | 2 ++ .../estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 2 +- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 ++- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 13 +++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 7e64efb..a798d8b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -48,7 +48,9 @@ public class SuitClientModel { /** * 适配结果信息 */ + @XStreamCDATA private String suitMessage; + /** * 请求来源 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index abee745..3b2e47c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -44,6 +43,7 @@ public class SuitServerModel { * 适配结果信息 */ // @XStreamImplicit + @XStreamCDATA private String suitMessage; /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ef26b09..4b67424 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -81,9 +81,10 @@ public class CoreHqlPack { if(resource != null){ DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index c451f54..7757888 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配结果") private Integer suitResult; + @Column(name = "SUIT_START_DATE_TIME") + @ApiParam(value = "适配开始时间") + private String suitStartTime; + + @Column(name = "SUIT_END_DATE_TIME") + @ApiParam(value = "适配结束时间") + private String suitEndTime; + + @Column(name = "EXECUTE_TIME") + @ApiParam(value = "执行耗时") + @JsonSerialize(using = ToStringSerializer.class) + private Long executeTime; + @Lob @Column(name = "SUIT_MESSAGE") @ApiParam(value = "适配信息") From d4d30bf63445a874c5770e023acbc09288dda716 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 16 Dec 2019 23:27:14 +0800 Subject: [PATCH 071/138] =?UTF-8?q?=E3=80=90=20=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=EF=BC=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=9B=B6=E4=BB=B6=EF=BC=8C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=8C=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=88=E6=A0=87=E5=8C=85?= =?UTF-8?q?=E5=87=8F=E5=8E=BB=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=89?= =?UTF-8?q?=E3=80=82=E3=80=91=E3=80=90bug7020=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/WmsCSFactTrans.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 85d93c7..878db14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; + /** + * 条码状态:1=创建,10=已收货,20=已质检, + * 30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Transient + @ApiParam(value = "条码状态", example = "1") + public Integer snStatus; + + @Transient + @ApiParam(value = "条码状态(冻结时)", example = "1") + public Integer destSnStatus; + @Transient @ApiParam("存储区编号组") public String[] zoneNos; 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 bcbb261..3b6b4bc 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 @@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "条码状态(冻结时)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer destSnStatus; + /** * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ From d0ddf208c354f971791bd9d325857648d4a0f610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 17 Dec 2019 13:36:20 +0800 Subject: [PATCH 072/138] =?UTF-8?q?=E3=80=90KT-1297=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E7=9A=84=E3=80=90=E9=80=82=E7=94=A8=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E3=80=91=E4=BC=98=E5=8C=96=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/WmsRouting.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index af87b92..1ac54c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") - - private Integer forProduct; @Transient From 773f56b577cb9a091985b29ccd3ecb59c7431dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 17 Dec 2019 13:42:41 +0800 Subject: [PATCH 073/138] =?UTF-8?q?TASK=5FINO=5FSTATUS=2020=E5=92=8C30?= =?UTF-8?q?=E7=9A=84=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=90=8D=E4=B8=A5=E9=87=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AE=B9=E6=98=93=E8=AF=AF=E5=AF=BC?= =?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/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 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 afd662b..a76b0fc 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 @@ -925,8 +925,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"), - FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); + CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"), + FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); private int value; private int code; From 0c01ffb230e45e4c58b0f8060601e831bf0276e0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Dec 2019 14:57:50 +0800 Subject: [PATCH 074/138] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 5703187..6711728 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -205,6 +205,10 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printStatus; + @Transient + @ApiParam("优先级") + private String priority; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 14f1ced3019da64be5d73004136d769159cf405c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 17 Dec 2019 16:44:16 +0800 Subject: [PATCH 075/138] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=B0=E5=9D=80=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 4be5710..a7fd844 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -54,6 +54,9 @@ public class SessionUser implements Serializable { @ApiParam("列表默认分页数量") private Integer pageDefaultSize; + @ApiParam("文件展示地址") + private String fileViewUrl; + public SessionUser() { } From a38dc051accb3b964b3df1452569e6a55b2f45a3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 17 Dec 2019 19:12:48 +0800 Subject: [PATCH 076/138] =?UTF-8?q?task=20`1308`=201=20PCN=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../{MesDefectRecordRepositoty.java => MesDefectRecordRepository.java} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesDefectRecordRepositoty.java => MesDefectRecordRepository.java} (84%) 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 9846537..ba4164f 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 @@ -3569,7 +3569,7 @@ public class MesEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(190, "LOCALE_RES_URL", ""); + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"); private int 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 3147319..0c69efc 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 @@ -131,7 +131,8 @@ public class MesPcnEnumUtil { PCN_LOGIN(160, "PCN_LOGIN", ""), PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), - PCN_LOGOUT(190, "PCN_LOGOUT", ""); + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", ""); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java similarity index 84% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java index 12041c1..648fd46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesDefectRecordRepositoty extends BaseRepository { +public interface MesDefectRecordRepository extends BaseRepository { } From d92850c1a48541aaf11e19c345f3493a7507290a Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 17 Dec 2019 19:50:03 +0800 Subject: [PATCH 077/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java | 6 ++++ 2 files changed, 42 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 d6d917c..fbac38e 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 @@ -4709,4 +4709,40 @@ public class WmsEnumUtil { } } + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VENDOR_TYPE { + VENDOR(10, "供应商"), CARRIERS(20, "承运商"); + + private int value; + private String description; + + VENDOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java index 7f62f02..388e6a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java @@ -23,4 +23,10 @@ public class WmsTmsShipModel { private Double recQty; @ApiParam("单位") private String unit; + + @ApiParam("序号") + private Integer item; + + @ApiParam("装车时间") + private String modifyDatetime; } From f800d3dd7b18a7250f5d16c3e38175a3babda066 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 17 Dec 2019 21:16:02 +0800 Subject: [PATCH 078/138] =?UTF-8?q?=E3=80=90=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=9C=A8=E9=80=94=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsStockFifoModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java new file mode 100644 index 0000000..48e8954 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 条码FIFO推荐 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-12-17 20:41 + * @Modify: + **/ +@Data +public class WmsStockFifoModel { + + @ApiParam(value = "工厂代码") + String organizeCode; + + @ApiParam(value = "物料集合") + List partNos; + + @ApiParam(value = "存储区集合") + List zoneNos; + + @ApiParam(value = "物料对应的存储区") + Map partToZoneMap; + + @ApiParam(value = "单据号") + String orderNo; + + @ApiParam(value = "物料对应的存储区集合") + Map> partToZonesMap; +} From 4f1455012f467b29ee13e22fa7c45257d4c4bf2a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Dec 2019 21:21:17 +0800 Subject: [PATCH 079/138] =?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?= =?UTF-8?q?=E3=80=91bug7024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 6711728..312209b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.Objects; /** * @Description :移库单明细实体(用于转储类业务) @@ -258,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "条码生成状态", example = "20") public Integer isSn; + + + public WmsDocMovementDetails () { + + } + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + } + } From 15d3d3b5e168fe9f9850e83e2a72f8c2120ba36f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 17 Dec 2019 22:29:54 +0800 Subject: [PATCH 080/138] =?UTF-8?q?=E3=80=90=20=09=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=EF=BC=88=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E4=BB=A5=E5=90=8E=E7=AB=8B?= =?UTF-8?q?=E5=88=BB=E6=8F=90=E4=BA=A4=E3=80=82=E3=80=91=E3=80=90bug7040?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsCSOrderMasterModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java new file mode 100644 index 0000000..dc572b6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 盘点批量操作 + * @author qianhs + */ +@Data +public class WmsCSOrderMasterModel implements Serializable { + + private static final long serialVersionUID = -5490167040159056107L; + + @ApiParam("盘点订单主表") + public List wmsCSOrderMasterList; + + @ApiParam("工厂代码") + public String organizeCode; +} From b5006a88f1a9c24991645109df860277b30a4117 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Wed, 18 Dec 2019 09:42:48 +0800 Subject: [PATCH 081/138] =?UTF-8?q?=E3=80=90#1302=20=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A3=80=E6=9F=A5=E7=BB=84=E4=BB=B6=E3=80=91?= =?UTF-8?q?=E3=80=90#1303=20=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=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/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 a76b0fc..114c08f 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 @@ -990,6 +990,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), + SCRAP(70,"报废"), COMMING(80, "在途"); private int value; From ba355aab55ecd7f039ee8d058785b10c299aca64 Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 18 Dec 2019 09:47:48 +0800 Subject: [PATCH 082/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index b04a9ad..c0cbe93 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("关联单号") private String refOrderNo; + @Column(name="PATH_URL") + @ApiParam("回执单地址") + private String pathUrl; + @Transient @ApiParam("打印模板列表") private List shipModels; From b29d84bbadabecc73e3901ec332a328d11904bae Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 18 Dec 2019 09:58:15 +0800 Subject: [PATCH 083/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=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/dto/WmsTmsShipDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index b20a52b..5357a32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam(value ="车牌号RDD") private String carNo; + + @ApiParam("回执单地址") + private String pathUrl; } From 0103c64247f65165c4226603d96f6a9d4ce642d8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 18 Dec 2019 11:10:52 +0800 Subject: [PATCH 084/138] =?UTF-8?q?task=20`1316`=201=20=E6=8B=86=E5=88=86j?= =?UTF-8?q?ob=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0c69efc..988baf8 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 @@ -132,7 +132,7 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", ""); + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"); private int value; From 81b84d86e5e32f6fbc955f8bb4f5865802ca9c47 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 18 Dec 2019 12:20:39 +0800 Subject: [PATCH 085/138] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttLineModel.java | 5 ++-- .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 25 +++++++++++++++++ .../i3plus/pojo/aps/model/ResourceLodaRequest.java | 23 ++++++++++++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 31 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java index f085c30..0c5ab45 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java @@ -4,8 +4,7 @@ import lombok.Data; @Data public class GanttLineModel { - private long id; - private long source; - private long target; + private long from; + private long to; private int type; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java new file mode 100644 index 0000000..b5007f0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * KPI接口数据 + */ +@Data +public class KPIModel { + private Integer salesOrderCount; + + private Integer productOrderCount; + + private Integer schedWorkCount; + + private Integer noSchedWorkCount; + + private Integer confirmOrderCount; + + private String produceTimes; + + private String settingTimes; + + private Integer overdueSalesCount; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java new file mode 100644 index 0000000..c35f89e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; + +@Data +public class ResourceLodaRequest { + private ApsEnumUtil.RESOURCE_LOAD_SPAN span; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; // 统计开始时间 + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; // 统计结束时间 + + private Long[] resourceIds; +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 0d23467..fb63168 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1079,4 +1079,35 @@ public class ApsEnumUtil { return description; } } + + /** + * 资源符合时间间隔类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_LOAD_SPAN { + ONE_HOUR("ONE_HOUR", "1小时"), + TWO_HOUR("TWO_HOUR", "2小时"), + SIX_HOUR("SIX_HOUR", "6小时"), + EIGHT_HOUR("EIGHT_HOUR", "8小时"), + TWELVE_HOUR("TWELVE_HOUR", "12小时"), + ONE_DAY("ONE_DAY", "1天"), + ONE_WEEK("ONE_WEEK", "1周"), + ONE_MONTH("ONE_MONTH", "1月"); + + private String value; + private String description; + + RESOURCE_LOAD_SPAN(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From b06ecdd3f375cb22d85ada0c904bca2a34356774 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 18 Dec 2019 14:27:16 +0800 Subject: [PATCH 086/138] =?UTF-8?q?[bug=EF=BC=9A7043=EF=BC=8CPCN=E8=8A=82?= =?UTF-8?q?=E7=82=B9-=E6=A8=A1=E5=9D=97=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/pcn/bean/MesPcn.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java | 3 +++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 818cbcb..247c8d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 33f1de2..c98a0dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java index 0e1a398..b8ede8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -50,6 +50,9 @@ public class MesPartObjectModel { @ApiParam("对象名称") private String objectName; + public MesPartObjectModel() { + } + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { this.id = id; this.organizeCode = organizeCode; From 54fe0ce760e552b274e4f441dbb41baf119f5848 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 18 Dec 2019 16:28:09 +0800 Subject: [PATCH 087/138] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6360=20=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 efd4ce1..05e1da8 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 @@ -487,15 +487,19 @@ public class MesEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { - for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { - if (mesInsertExcel.getValue().equals(value)) { - return mesInsertExcel; + for (ORGANIZATION_INIT_DATA organizationInitData : values()) { + if (organizationInitData.getValue().equals(value)) { + return organizationInitData; } } return null; From fdfc5884c5217556108c82158fd531c46ebc2042 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 18 Dec 2019 17:08:56 +0800 Subject: [PATCH 088/138] =?UTF-8?q?=E3=80=90=20=09=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=EF=BC=88=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E4=BB=A5=E5=90=8E=E7=AB=8B?= =?UTF-8?q?=E5=88=BB=E6=8F=90=E4=BA=A4=E3=80=82=E3=80=91=E3=80=90bug7040?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index dc572b6..9330c69 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -21,4 +21,7 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("工厂代码") public String organizeCode; + + @ApiParam("确认框") + public Boolean confirm; } From 423b81609a6146607bc8f00232d5df6980510bdd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 18 Dec 2019 18:05:24 +0800 Subject: [PATCH 089/138] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A119?= =?UTF-8?q?8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 59 +++++++++------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 80 +++++++++++++--------- 2 files changed, 82 insertions(+), 57 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index d7a6052..6eea3a5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -155,18 +155,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; @@ -290,32 +296,35 @@ public class MesHqlPack { */ public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) { + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) { + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } return packBean; } 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 6b938ee..b9eb3ec 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 @@ -84,18 +84,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPlanOrder.getStartTimeStart(), - mesPlanOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesPlanOrder.getEndTimeStart(), - mesPlanOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesPlanOrder.getCreateDateTimeStart(), - mesPlanOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getStartTimeStart(), + mesPlanOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getEndTimeStart(), + mesPlanOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getCreateDateTimeStart(), + mesPlanOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } // 排序 DdlPreparedPack.getOrderDefault(mesPlanOrder); @@ -180,18 +186,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; @@ -1713,14 +1725,18 @@ public class MesHqlPack { if (mesCustOrder.getStatus() != null) { DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean); } - DdlPreparedPack.timeBuilder( - mesCustOrder.getOrderTimeStart(), - mesCustOrder.getOrderTimeEnd(), - "orderDate", packBean, true); - DdlPreparedPack.timeBuilder( - mesCustOrder.getCreateDateTimeStart(), - mesCustOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesCustOrder.getOrderTimeStart(), + mesCustOrder.getOrderTimeEnd(), + "orderDate", packBean, true); + } + if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesCustOrder.getCreateDateTimeStart(), + mesCustOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } From 04533633363ff41135698b3f8f3e341d3fe6ade5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Dec 2019 21:59:55 +0800 Subject: [PATCH 090/138] =?UTF-8?q?=E3=80=90=E5=8F=91=E8=BF=90=E9=85=8D?= =?UTF-8?q?=E6=96=99=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B0=86=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E9=85=8D=E6=96=99=E6=95=B0=E9=87=8F=E3=80=82=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E3=80=91bug7063?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) 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 87050ca..390532b 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 @@ -110,6 +110,7 @@ public class WmsEnumUtil { /** * 移库单主表：优先级 */ + @Deprecated @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRIORITY { NORMAL(1, "正常"), URGENT(2, "紧急"); @@ -142,6 +143,38 @@ public class WmsEnumUtil { /** + * 移库单主表：优先级 (PRIORITY_NEW) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY_NEW { + URGENT(1, "紧急"), NORMAL(2, "正常"); + private int value; + private String description; + + PRIORITY_NEW(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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; + } + } + /** * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -205,7 +238,8 @@ public class WmsEnumUtil { RECEIPT(20, "RECEIPT", "处理中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), - CANCELLED(50, "CANCELLED", "已取消"); + CANCELLED(50, "CANCELLED", "已取消"), + FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); private int value; private String code; From 339f1a86c275ef7725ddff3ede03f6c2147303f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Dec 2019 09:16:15 +0800 Subject: [PATCH 091/138] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=97=B4=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 8 -------- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 ----- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b05d85c..a18d99a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -730,6 +730,10 @@ public class AndonEnumUtil { /** * 按灯标识 * 1-呼叫，2-签到，3-解决 + * + * 20190917将“提交”更改为“解决待审” + * 20190917将“审批”更改为“审批完成” + * 20190917增加"撤销已确认"枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { @@ -737,10 +741,10 @@ public class AndonEnumUtil { SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” - PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” + COMMIT(5,"50","解决待审"), + PASS(6,"60","审批完成"), REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 + CONFIRMED_CANCEL(8,"80","撤销已确认"); private int value; private String code; @@ -944,10 +948,11 @@ public class AndonEnumUtil { /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + * + * 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), 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 0d04f5e..a22ef11 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 @@ -495,7 +495,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) { if (organizationInitData.getValue().equals(value)) { @@ -1488,7 +1487,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_INSERT_EXCEL getByValue(int value) { for (MES_INSERT_EXCEL mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1647,7 +1645,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1846,7 +1843,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_WORK_CELL_TYPE getByValue(int value) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1904,7 +1900,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1952,7 +1947,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2000,7 +1994,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_REPAIR_STATUS getByValue(int value) { for (MES_REPAIR_STATUS mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2051,7 +2044,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == 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 988baf8..ecda007 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 @@ -75,7 +75,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -193,7 +192,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -281,7 +279,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -405,7 +402,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -466,7 +462,6 @@ public class MesPcnEnumUtil { return tmp; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { From b674087ffc69b0d8e3eb375e3198fcecae8b204e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 19 Dec 2019 13:53:13 +0800 Subject: [PATCH 092/138] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 46172c2..f55c898 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -146,11 +146,12 @@ public class CommonEnumUtil { } return null; } - public static int descriptionOfValue(String desc) { + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { - if (values()[i].name().equals(desc)) { + if (values()[i].description.equals(desc)) { tmp = values()[i].value; + break; } } return tmp; From 5c28c8344c733644dda55886376ac1a3bcc15960 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 15:09:19 +0800 Subject: [PATCH 093/138] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 3 insertions(+), 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 390532b..617148e 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 @@ -1349,7 +1349,8 @@ public class WmsEnumUtil { INVENTORY(20, "已盘"), FROZEN(30, "已冻结"), THAWING(40, "已解冻"), - RETURN_GOODS(50, "取消冻结"); + RETURN_GOODS(50, "取消冻结"), + Unsettled_(60, "取消冻结"); private int value; private String description; 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 3b6b4bc..21af5a3 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 @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 0d7e64b160627a79be6d96e57818a6a9459f3966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Dec 2019 16:22:21 +0800 Subject: [PATCH 094/138] =?UTF-8?q?=E5=9C=A8=E8=B0=83=E7=94=A8=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=8A=8A=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=B8=80=E5=B9=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=88=B0MOVEMASTER=E5=AF=B9=E8=B1=A1=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E5=8E=BB=E6=AF=8F=E4=B8=AA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=86=8D=E5=8E=BB=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 45 +++++++++------------- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 6 ++- 3 files changed, 24 insertions(+), 29 deletions(-) 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 e4a35f8..be7ffe3 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 @@ -204,7 +204,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "循环补货数量", example = "0") private Double cycleRquestQty = 0d; - public int getIqcValue(){ + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 7ae45fb..811158c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "可用数量", example = "0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "不合格数量", example = "0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "隔离数量", example = "0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "质检中数量", example = "0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "待入库数量", example = "0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "冻结数量", example = "0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "寄售数量", example = "0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "锁定数量", example = "0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "报废数量", example = "0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "报废数量") private Double scrapQty; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index aef6850..c6caa7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean { private String transTypeDesc; @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件", example = "-1") + @ApiParam(value = "交易处理组件") @JsonSerialize(using = ToStringSerializer.class) private Long tmId; @@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean { public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } + + public long getTmIdVal() { + return this.tmId == null ? 0 : this.tmId; + } } From 7ef04dd8243b706e6533d14d822c018af740ed30 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:35:24 +0800 Subject: [PATCH 095/138] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 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 617148e..db31037 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 @@ -501,7 +501,8 @@ public class WmsEnumUtil { LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), - TRANSIT_LOCATE(80, "T", "在途库"); + TRANSIT_LOCATE(80, "T", "在途库"), + UTENSIL_LOCATE(90, "U", "器具库"); private int value; private String code; @@ -2987,7 +2988,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), + UTENSIL(50, "器具"); private int value; private String description; From 69e20029e857bf80b9c2e64804f0d05a7498e64d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:37:45 +0800 Subject: [PATCH 096/138] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?90=3D=E5=99=A8=E5=85=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.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/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 590f11c..d5344c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库 */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") From a2ac02aa47e916fc9a18dbfc5623c5c382a00ba6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 19:27:24 +0800 Subject: [PATCH 097/138] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 3 files changed, 6 insertions(+), 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 db31037..5097556 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 @@ -1351,7 +1351,7 @@ public class WmsEnumUtil { FROZEN(30, "已冻结"), THAWING(40, "已解冻"), RETURN_GOODS(50, "取消冻结"), - Unsettled_(60, "取消冻结"); + UNSETTLED_NCUNFREEZE(60, "未盘解冻"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 878db14..8590f92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -136,6 +136,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("存储区编号组") public String[] zoneNos; + @Transient + @ApiParam("行号") + private String item; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { 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 21af5a3..947cb55 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 @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60=未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 4c8a94bdfaf1919ec3ab30e226ef1dc7d6742770 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 23:17:30 +0800 Subject: [PATCH 098/138] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/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 1f4fc92..6c68ff3 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 @@ -1359,6 +1359,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); From 1d7cf4165335a4f0a3c715df3b695bf9284829d3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 20 Dec 2019 02:54:50 +0800 Subject: [PATCH 099/138] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=E3=80=91=E5=90=8E=E6=9C=9F=E5=BE=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 2 ++ 3 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8590f92..14c0486 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean { public String remark; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源库位编号") public String srcLocateNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源存储区编号") public String srcZoneNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源仓库编号") public String srcWhNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("是否范围内") public Integer isScope; @@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean { public String vendorNo; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; @@ -125,18 +132,22 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") public Integer snStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("存储区编号组") public String[] zoneNos; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("行号") private String item; 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 947cb55..c4550f6 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 @@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") + @AnnoOutputColumn(hidden = true) public String item; @Column(name = "QTY", columnDefinition = "decimal(18,8)") @@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean { @Transient @ApiParam(value = "实盘数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double factQty; @Transient @ApiParam(value = "剩余数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double surplusQty; @Transient @ApiParam("目标库位编号") + @AnnoOutputColumn(hidden = true) public String destLocateNo; @Transient @ApiParam("前端表格编辑使用") + @AnnoOutputColumn(hidden = true) public Boolean isSet = false; @Transient @ApiParam("源单位") + @AnnoOutputColumn(hidden = true) public String srcUnit; @Transient @ApiParam("存储区编号") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index 1873977..a85ae4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.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; @@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean { public String partNameRdd; @Column(name="IS_ADJUST") + @AnnoOutputColumn(hidden = true) @ApiParam(value = "调整标识", example = "1") public Integer isAdjust; } From c87b00756f406decf4ffd4635dfdb9bb72fad4d8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 10:29:25 +0800 Subject: [PATCH 100/138] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?pom?= 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/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b0a3f82..c052a9d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 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-TEST-SNAPSHOT + 1.0-DEV-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 09f2c4a..e388a1d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5345a36..9caeb95 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From 335ab2ce510a062d127026228652b7c7ad95bf37 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Dec 2019 11:03:37 +0800 Subject: [PATCH 101/138] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index e9471e8..7eb002d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定工艺路线") private String specifyRouting; - @Column(name="RESYNCHRONIZE") - @ApiParam(value ="是否同步") - @FieldAnnotation(defaultValue = "true") - private Boolean resynchronize; - @Column(name="RECALC_COUNT") @ApiParam(value ="是否重新计算数量") @FieldAnnotation(defaultValue = "true") From 03eeacd2730511a25cc72f11163f39f4ee3a1fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 20 Dec 2019 11:38:44 +0800 Subject: [PATCH 102/138] =?UTF-8?q?=E3=80=90KT-1298=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E3=80=90=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=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/WmsRoutingRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 15f6d49..bb300a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的库位") private String destLocateNo; + @Column(name = "DEST_MOVE_TYPE") + @ApiParam(value = "目的库位") + private String destMoveType; + public WmsRoutingRule(){} } From b0709aca9737cf42500350adfa3723397776fb10 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 15:05:41 +0800 Subject: [PATCH 103/138] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 a22ef11..75b5626 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 @@ -3565,8 +3565,8 @@ public class MesEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int 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 ecda007..38a41e0 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 @@ -131,8 +131,8 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int value; private String code; From 996526ac7cd17e41fe71e20e0d5856f58aece9e6 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 20 Dec 2019 15:11:40 +0800 Subject: [PATCH 104/138] =?UTF-8?q?=E3=80=90bug7088=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 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 5097556..2e16847 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 @@ -3030,8 +3030,8 @@ public class WmsEnumUtil { public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"); - + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"), + UTENSIL("50", "器具"); private String value; private String description; @@ -3057,6 +3057,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } } From 393d3f12b84845f2cc4ca7d9a77bd66ba9adc446 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Dec 2019 16:44:43 +0800 Subject: [PATCH 105/138] =?UTF-8?q?=E3=80=907055=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7=E6=B5=81=E7=A8=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..1f3d722 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam(value = "波次配料物料清单") + boolean collectPicking = false; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 312209b..3ac14cc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } + public WmsDocMovementDetails (String partNo) { + this.partNo = partNo; + } + + public WmsDocMovementDetails (String partNo,String orderNo) { + this.partNo = partNo; + this.orderNo = orderNo; + } + } From fc9b8629ab54471f551f60056411576e234050ca Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 20 Dec 2019 18:07:05 +0800 Subject: [PATCH 106/138] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/base/enumutil/WmsEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 617148e..9d8a428 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 @@ -1076,7 +1076,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CARRIAGE_STATUS { CREATE(10, "创建"), - PUBLISH(20, "发布"), + PUBLISH(20, "已发布"), RECEIVE(30, "承运商接收"), ARRIVE(40, "车辆到达"), INSTALL(50, "装车完成"), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..0f5c29e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam("默认规则") + private String defaultRule; } From dccd104fdd887898046699215da24380fe937e26 Mon Sep 17 00:00:00 2001 From: zcg Date: Sat, 21 Dec 2019 12:55:29 +0800 Subject: [PATCH 107/138] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324?= =?UTF-8?q?=EF=BC=8Cexcel=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 5 +++++ .../i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 4 ++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 5 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 17 +++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 4 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 9 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 5 +++++ .../estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 16 ++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 5 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java | 9 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 5 +++++ .../estsh/i3plus/pojo/mes/model/MesDatasourceModel.java | 3 +++ .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 4 ++-- 21 files changed, 156 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 75b5626..325ed75 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 @@ -802,7 +802,7 @@ public class MesEnumUtil { public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 3f7588b..7483771 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean { @Transient @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59") public String orderTimeEnd; + + @Transient + @ApiParam("订单类型名称") + private String orderTypeName; + + @Transient + @ApiParam("状态名称") + private String statusName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c41888b..6670060 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean { @Column(name = "SELF_ADDITION_VALUE") @ApiParam("自增列值") private Long selfAdditionValue; + + @Transient + @ApiParam("操作类型名称") + private String operateTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 88fb6d1..713dc90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象类型") private Integer notifyObjectType; + @Transient + @ApiParam("对象类型名称") + private String notifyObjectTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index b47ef5d..4d4d1b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :设备作业通知配置 @@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean { @ApiParam("通知方式") private Integer notifyPattern; + @Transient + @ApiParam("作业类型名称") + private String taskTypeName; + + @Transient + @ApiParam("通知类型名称") + private String notifyTypeName; + + @Transient + @ApiParam("通知方式名称") + private String notifyPatternName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 8f9fb0c..25545e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean { @ApiParam("供应商代码") private String supplierCode; + @Transient + @ApiParam("绑定规则名称") + private String bandRuleName; + public int getLengthVal() { return this.length == null ? 0 : this.length; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index a5ccc00..d9ead26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("是否存储") private Integer isSave; + @Transient + @ApiParam("是否存储") + private String isSaveName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 7feb2a8..6db75b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :包装规格 @@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean { @ApiParam("是否混包4") private Integer isMixed4; + @Transient + @ApiParam("是否混包名称") + private String isMixedName; + + @Transient + @ApiParam("是否混包2名称") + private String isMixedName2; + + @Transient + @ApiParam("是否混包3名称") + private String isMixedName3; + + @Transient + @ApiParam("是否混包4名称") + private String isMixedName4; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; 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 216e157..65ba2cc 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 @@ -88,4 +88,16 @@ public class MesPart extends BaseBean { @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") private Integer productMatchType; + + @Transient + @ApiParam("过程编码匹配类型名称") + private String processMatchTypeName; + + @Transient + @ApiParam("包装编码匹配类型") + private String packageMatchTypeName; + + @Transient + @ApiParam("产品编码匹配类型") + private String productMatchTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index c98a0dc..9dac636 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -40,7 +40,7 @@ public class MesPcn extends BaseBean { private String areaCode; @Column(name = "AREA_NAME") - @ApiParam("区域") + @ApiParam("区域名称") private String areaName; @Column(name = "WORK_CENTER_CODE") @@ -48,7 +48,7 @@ public class MesPcn extends BaseBean { private String workCenterCode; @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心") + @ApiParam("工作中心名称") private String workCenterName; @Column(name = "PCN_VERSION") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 7543670..2cf0ddf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value = "同步的时候是否区分工厂") private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Transient + @ApiParam("同步方式") + private String syncPatternName; + + @Transient + @ApiParam("同步类型名称") + private String syncTypeName; + + @Transient + @ApiParam(value = "同步的时候是否区分工厂") + private String isIgnoreOrgName; + public int getIsIgnoreOrgVal() { return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index b803060..08c7787 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean { public String areaCode; @Transient + @ApiParam("状态名称") + private String statusName; + + @Transient + @ApiParam("计划类型") + private String planTypeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index cd7e9ee..f3a2b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean { @Column(name = "RULE_CODE") @ApiParam("编码规则代码") private String ruleCode; + + @Transient + @ApiParam("编码类型名称") + private String codeTypeName; + + @Transient + @ApiParam("匹配类型名称") + private String matchTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 60bea0a..338075d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient + @ApiParam("检测类型名称") + private String checkTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index a2b7c6d..ce83ab3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工序工作单元 @@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean { @ApiParam("工作中心") private String workCenterCode; + @Transient + @ApiParam("流程代码名称") + private String routeCodeName; + + @Transient + @ApiParam("工序代码名称") + private String processCodeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 2813d8a..89abdff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean { @ApiParam(value = "绑定数量") private Double boundQty; + @Transient + @ApiParam(value = "是否可重复名称") + private String isRepeatName; + + @Transient + @ApiParam(value = "是否检查名称") + private String isCheckName; + + @Transient + @ApiParam(value = "是否投料配置名称") + private String isFeedName; + + @Transient + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 5bd428a..7fd8998 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean { @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + @Transient + @ApiParam("工位类型名称") + private String workCellTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index db71d8e..0baae07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工作单元参数 @@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean { @Column(name = "PARAM_MODEL") @ApiParam("参数模式") private Integer paramModel; + + @Transient + @ApiParam("参数类型名称") + private String paramTypeName; + + @Transient + @ApiParam("参数模式名称") + private String paramModelName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index dd0909a..68d7afa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工作单元参数配置 @@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean { @Column(name = "IS_CHECK") @ApiParam("是否必须校验") private Integer isCheck; + + @Transient + @ApiParam("是否必须校验名称") + private String isCheckName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java index ddfb036..2900b7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java @@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable { @ApiParam("数据库名称") private String dsDbName; + @ApiParam("数据源类型名称") + private String dsTypeName; + public MesDatasourceModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index d3ece07..b8e6909 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; - @ApiParam("作业类型") + @ApiParam("作业类型名称") private String taskTypeName; - @ApiParam("设备类别") + @ApiParam("设备类别名称") private String equipmentCategoryName; From 9c2dcba09d12c5fa5efb86729e19afe6297f58b5 Mon Sep 17 00:00:00 2001 From: gcj Date: Sat, 21 Dec 2019 14:38:42 +0800 Subject: [PATCH 108/138] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index 5357a32..ca012e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("回执单地址") private String pathUrl; + + @ApiParam("关联单号") + private String refOrderNo; } From 4bd0aa8d57eeac4afe802a71ec78c12b5b22dbd2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 23 Dec 2019 10:42:31 +0800 Subject: [PATCH 109/138] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20=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/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 6c68ff3..bb2b334 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 @@ -1858,6 +1858,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result); From c7d494c31e69d1d2268c61178923251849c43994 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 23 Dec 2019 14:32:00 +0800 Subject: [PATCH 110/138] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BAexcel]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index 4a3ace4..dc37069 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean { @ApiParam("检查标准") private String standard; + @Transient + @ApiParam("检查类型名称") + private String checkTypeName; + } From d5c1f7a7a3f99c63a011dcfdeaab35767a3b8a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 24 Dec 2019 11:20:02 +0800 Subject: [PATCH 111/138] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=A8=A1=E6=9D=BF=E8=BD=AF=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20=E8=BD=AF=E9=80=82=E9=85=8Dlist=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../i3plus/pojo/platform/bean/SysLocaleResource.java | 6 ++++++ .../i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 19 ++++++++++++++++++- .../pojo/softswitch/bean/BsSuitRecordParam.java | 7 +++---- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index b4f4a10..e1d4eae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATABASE_OPERATE_TYPE{ READ(1,"读取"), - WRITE(2,"写入"); + WRITE(2,"写入"), + BATCH_WRITE(3,"批量写入"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 01fd23c..5555d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -70,6 +70,12 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false) private Integer softType; + public int getSoftTypeVal(){ + if(softType==null){ + return CommonEnumUtil.SOFT_TYPE.IMPP.getValue(); + } + return softType.intValue(); + } //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 6257a7b..03ab889 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode; import org.apache.commons.lang3.math.NumberUtils; 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.util.List; /** * @Description : 适配器出入参 @@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数名称)") private String paramName; + @Column(name = "PARENT_PARAM_Id") + @ApiParam(value = "上级参数id") + private String parentParamId; + @Column(name = "PARENT_PARAM_NAME") @ApiParam(value = "上级参数名称)") private String parentParamName; @@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean { @Transient @ApiParam(value = "参数值") - private String paramValue; + private Object paramValue; + + public String getParamValueStr() { + if (paramValue == null) { + return null; + } + return paramValue.toString(); + } + + @Transient + @ApiParam(value = "子级参数") + private List bsSuitCaseParamList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index e85deb6..c1d94dc 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -7,10 +7,8 @@ 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.Index; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : 适配记录参数 @@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean { @ApiParam(value = "参数名称") private String paramName; + @Lob @Column(name = "PARAM_VAL") @ApiParam(value = "参数值") private String paramVal; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e5063c6..b1a9344 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -338,6 +338,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); From 894dbed46c08d67c0422b072ae47fef30cc9047a Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 24 Dec 2019 11:26:14 +0800 Subject: [PATCH 112/138] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=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/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 79c7f34..65e800d 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="COMMIT_DATE") @ApiParam("提交日期") public String commitDate; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; } From 34e4d837afa629fb220415fd71f0e05acf19d731 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 24 Dec 2019 18:15:36 +0800 Subject: [PATCH 113/138] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?= =?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/wms/bean/WmsCSOrderDetails.java | 7 ++++++- 1 file changed, 6 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 c4550f6..086e420 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -28,7 +29,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_CS_DETAILS") +@Table(name = "WMS_DOC_CS_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "SN") +}) @Api("盘点单冻结信息") public class WmsCSOrderDetails extends BaseBean { private static final long serialVersionUID = 1054153436116196360L; From 20f6961dafbf8f42893e9c10c90d442fccc1b283 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 24 Dec 2019 19:56:11 +0800 Subject: [PATCH 114/138] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A132?= =?UTF-8?q?7JIT=E7=94=9F=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 5 ++++ .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 8 +++++ .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 5 ++++ 4 files changed, 53 insertions(+) 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 a22ef11..fb1bf3e 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 @@ -13,6 +13,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CALENDAR_TYPE { DAY(10, "日"), diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index dd2c7da..5a4c0f1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -27,6 +27,11 @@ import javax.persistence.Table; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index 19694f1..b7f831b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; public QueueOrderModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 7343feb..0abb9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -31,6 +31,11 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; From 04b02c084b893fd960fa4edf87c6c97c30bd9749 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Dec 2019 09:35:14 +0800 Subject: [PATCH 115/138] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E5=8F=AF=E6=8B=96=E6=8B=BD=E8=B5=84=E6=BA=90=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java} (95%) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java similarity index 95% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index c35f89e..b7bcac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; @Data -public class ResourceLodaRequest { +public class ResourceLoadRequest { private ApsEnumUtil.RESOURCE_LOAD_SPAN span; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) From 734b54d1b25e232ffb80a469109ab68439c8ecfc Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Dec 2019 11:33:15 +0800 Subject: [PATCH 116/138] =?UTF-8?q?=E3=80=90=20=E9=A2=86=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?= =?UTF-8?q?=E3=80=91bug7024?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a5bf1b0..285778b 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 @@ -239,7 +239,7 @@ public class WmsEnumUtil { RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), CANCELLED(50, "CANCELLED", "已取消"), - FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); + BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成"); private int value; private String code; From e5452056b619c3f23f16f89321d1bc3cd013923c Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Wed, 25 Dec 2019 15:41:41 +0800 Subject: [PATCH 117/138] =?UTF-8?q?=E3=80=90bug7083=20KT=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 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 285778b..1e07422 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 @@ -701,7 +701,8 @@ public class WmsEnumUtil { KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), - PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"); + PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); private int value; private String code; @@ -885,7 +886,8 @@ public class WmsEnumUtil { VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), - KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); + KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), + UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); private String value; private String description; From f857a4065d78a7ce6df02d63add60f5091f026af Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 25 Dec 2019 17:01:15 +0800 Subject: [PATCH 118/138] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A132?= =?UTF-8?q?7JIT=E7=94=9F=E4=BA=A7=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/base/enumutil/MesEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 11cf7e3..2a2e426 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 @@ -2895,7 +2895,8 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单");; + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; 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 38a41e0..d6154b5 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 @@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; From cfa465817f3c3e8a2e4b77bdfa6c7f56709233ba Mon Sep 17 00:00:00 2001 From: gcj Date: Thu, 26 Dec 2019 09:43:31 +0800 Subject: [PATCH 119/138] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb2b334..6aa16d4 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 @@ -2427,7 +2427,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); From 019cb91a4c285704eeb197f4ae1197202429107d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 09:51:41 +0800 Subject: [PATCH 120/138] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A132?= =?UTF-8?q?9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 111 +++++++-------------- .../i3plus/pojo/mes/bean/MesButtonStatus.java | 18 +--- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++ 3 files changed, 61 insertions(+), 91 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 2a2e426..9c4d8f6 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 @@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE(10, "一套发运"), + TRUE(20, "多套发运"), + FALSE(30, "单产品多套发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * 是否解析 @@ -2386,82 +2421,6 @@ public class MesEnumUtil { } /** - * mes按钮状态配置 判断符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_JUDGE_FLAG { - - EQUAL("=", "等于"), - NOT_EQUAL("!=", "不等于"), - GREATER_THAN(">", "大于"), - NOT_LESS_THAN(">=", "大于大于"), - LESS_THAN("<", "小于"), - NOT_GREATER_THAN("<=", "小于等于"); - - private String value; - private String description; - - MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * mes按钮状态配置 逻辑符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_LOGIC_FLAG { - - AND("&&", "逻辑与"), - OR("||", "逻辑或"); - - private String value; - private String description; - - MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 5c7d7ae..1b7c85c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean { @ApiParam("实体类名称") private String ClassName; - @Column(name = "STATUS_FIELD") - @ApiParam("状态字段") - private String statusField; - - @Column(name = "JUDGE_FLAG") - @ApiParam("判断符合") - private String judgeFlag; - - @Column(name = "STATUS_VALUE") - @ApiParam("状态值") - private String statusValue; - - @Column(name = "LOGIC_FLAG") - @ApiParam("逻辑符合") - private String logicFlag; + @Column(name = "APPEND_HQL") + @ApiParam("拼接HQL") + private String appendHql; @Column(name = "STATUS_DESC") @ApiParam("描述") 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 b9eb3ec..8d904cf 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 @@ -2097,4 +2097,27 @@ public class MesHqlPack { } return packBean; } + + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + return packBean; + } } From fb8b07b2274ec745f1a67abb11cabb03ca582ad2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 10:01:03 +0800 Subject: [PATCH 121/138] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A132?= =?UTF-8?q?9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 8d904cf..22f0c48 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 @@ -2098,26 +2098,5 @@ public class MesHqlPack { return packBean; } - /** - * JIS发运模式 - * @param jisPattern - * @param organizeCode - * @return - */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); - } - return packBean; - } + } From 5ea55135dc7d211e12e3893a0784e59b39d54a4f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 10:12:29 +0800 Subject: [PATCH 122/138] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=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/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 892693a..422cf79 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 @@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam(value = "是否最早批次") + public String isFifo; + public WmsStockSn() { } From 629e2f82706ac469c96ea9e676336767b3b72c01 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Dec 2019 11:11:24 +0800 Subject: [PATCH 123/138] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java new file mode 100644 index 0000000..3da5e29 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttPager extends Pager { + public static class SortData { + // 排序对象 + private String field; + // 排序类型，1为升序，0为降序 + private Boolean ascending; + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public Boolean getAscending() { + return ascending; + } + + public void setAscending(Boolean ascending) { + this.ascending = ascending; + } + } + private String filter; + private List sorts; +} From b5d50af25077c49dd93dfed78c142530c71975a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Dec 2019 11:34:49 +0800 Subject: [PATCH 124/138] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=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/WmsFile.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index c37935e..4a71d08 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -8,10 +8,7 @@ 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.UniqueConstraint; +import javax.persistence.*; /** * @Description : 附件表 @@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") private String refType; + + @Transient + @ApiParam("预览前缀") + public String previewPrefix; } \ No newline at end of file From 32c9bbbe85628523153788ef42aaba537dfa012e Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 26 Dec 2019 11:39:33 +0800 Subject: [PATCH 125/138] =?UTF-8?q?task=20`1308`=204=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 ++ .../mes/repositorymongo/MesProductDataRepository.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java new file mode 100644 index 0000000..e4d90a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface UseMongoDb { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 2b2d84a..602bb21 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,6 +34,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) +//@UseMongoDb @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java new file mode 100644 index 0000000..2f615de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java @@ -0,0 +1,15 @@ +//package cn.estsh.i3plus.pojo.mes.repositorymongo; +// +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +//import cn.estsh.i3plus.pojo.mes.bean.MesProductData; +//import org.springframework.stereotype.Repository; +// +///** +// * @Author: Wynne.Lu +// * @CreateDate: 2019/12/25 1:30 下午 +// * @Description: +// **/ +//@Repository +//public interface MesProductDataRepository extends BaseMongoRepository { +//} From 1f8885779f840c204858b35892b3a6aa958e3f45 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 12:50:53 +0800 Subject: [PATCH 126/138] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 3ac14cc..813538d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -208,7 +208,11 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("优先级") - private String priority; + private Integer priority; + + @Transient + @ApiParam("优先级描述") + private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -272,8 +276,10 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } - public WmsDocMovementDetails (String partNo) { + public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) { this.partNo = partNo; + this.priority = priority; + this.orderNo = orderNo; } public WmsDocMovementDetails (String partNo,String orderNo) { From 7f69df95df33854d25d829f0eec8f2921359bced Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 26 Dec 2019 13:53:17 +0800 Subject: [PATCH 127/138] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 14c0486..c08e1eb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + this.vendorNo= vendorNo; + } public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { this.partNo=partNo; this.partNameRdd = partNameRdd; From d34ba5e11428438779b334af054004844d80b117 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Dec 2019 16:20:56 +0800 Subject: [PATCH 128/138] =?UTF-8?q?=E3=80=90=20=E7=BB=8F=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=85=AD=E5=90=88=E4=B8=80=E5=85=81=E8=AE=B8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=88=96=E7=9B=AE=E6=A0=87=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=9D=A5=E6=BA=90=E6=8B=86=E5=88=86=E6=88=90?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E5=8D=95=E6=8D=AE=20=E3=80=91bug706?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 813538d..6d25a62 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("优先级") private Integer priority; - @Transient - @ApiParam("优先级描述") - private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; From 032bd61b878d974e643a5cc653792b8f99a4c23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Dec 2019 16:32:59 +0800 Subject: [PATCH 129/138] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=89=E4=BB=BD=E6=8B=86=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD+=20=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=E5=86=99?= =?UTF-8?q?=E5=85=A5=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E7=9A=84?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7=E5=86=99=E5=85=A5=E8=A7=84=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD+=20?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=E4=BA=A4=E6=98=93=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=9A=E6=9C=89=E6=9D=A1=E7=A0=81=E5=B0=B1=E6=89=A3=E5=87=8F?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=A4=84=E7=90=86=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95=E6=89=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=A4=84=E7=90=86=E5=B9=B6=E4=BC=A0=E7=BB=99?= =?UTF-8?q?MOVE=5FTO=5FERP=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F+=20?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=88=97=E2=80=9C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=88=E5=BE=85=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 ++++++++++++---------- 3 files changed, 24 insertions(+), 13 deletions(-) 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 8e6d27e..f1bf9a0 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 @@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "已处理数量", example = "0") + public Double handledQty; + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 811158c..837cbf2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean { private String prodCfgTypeName; @Transient - @ApiParam(value = "箱数", example = "-1") + @ApiParam(value = "箱数") private Integer boxQty; @Transient - @ApiParam(value = "零件数", example = "-1") + @ApiParam(value = "零件数") private Double partQty; @Transient + @ApiParam(value = "处理中数量") + private Double transQty; + + @Transient @ApiParam(value = "ERP库存地") private String areaNo; @@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean { public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean { this.consignQty = consignQty; this.lockQty = lockQty; this.scrapQty = scrapQty; + this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; } } 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 bb2b334..73bfda6 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 @@ -229,13 +229,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); - if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ + if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); numList.add(wmsPOMaster.getPriorRC()); numList.add(null); DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result); - }else{ + } else { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } @@ -923,8 +923,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), @@ -1613,7 +1613,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, + new String[]{"sn", "createDatetime"}, result); return result; } @@ -2007,8 +2009,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); @@ -2618,15 +2620,15 @@ public class WmsHqlPack { * @param wmsPullTaskMaster * @return */ - public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) { DdlPackBean result = new DdlPackBean(); List stringList = null; List integerList = null; //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); - if(StringUtils.isNotBlank(statusList)){ + if (StringUtils.isNotBlank(statusList)) { stringList = Arrays.asList(statusList.split(",")); integerList = new ArrayList<>(); - for(String sl : stringList){ + for (String sl : stringList) { integerList.add(Integer.valueOf(sl)); } } From 1d9ab80ae812e8188ec6bc65cbb5c27c4056b99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 26 Dec 2019 16:48:43 +0800 Subject: [PATCH 130/138] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=20-=20=E6=89=B9=E9=87=8F=E5=86=99=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 5 ++--- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e19e6e5..df7fad0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; -import java.util.Date; /** * @Description : 模块表单枚举类 @@ -1973,7 +1972,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true"; } private String getJDBCUrlOracle(String database,String host,Integer port){ @@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true"; } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 03ab889..7a8856c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -68,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean { @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValTypeId; + @JsonIgnore public int getParamValTypeIdVal() { return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue(); } @@ -88,6 +90,7 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值") private Object paramValue; + @JsonIgnore public String getParamValueStr() { if (paramValue == null) { return null; From 20ccf65c5c391dec97f3d556a4882eae6902b9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 26 Dec 2019 17:13:48 +0800 Subject: [PATCH 131/138] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 47 +++++++++++++++++----- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 4 ++ .../pojo/lac/bean/LacCommandStackStepTask.java | 10 ++--- .../i3plus/pojo/lac/bean/LacSuitTaskParam.java | 1 + .../estsh/i3plus/pojo/lac/bean/LacTaskCheck.java | 8 ++++ .../pojo/model/lac/LacCommandStackModel.java | 9 ++++- pom.xml | 3 +- 7 files changed, 63 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index dfb4079..a1db447 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -223,7 +223,8 @@ public class LacEnumUtil { public enum PARAM_VALUE_TYPE{ INTEGER(1,"整数"), STRING(2,"字符串"), - FLOAT(3,"浮点"); + FLOAT(3,"浮点"), + ORGIN(99,"原始数据"); private int value; private String description; @@ -347,15 +348,17 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOGICAL_OPERATOR{ - OR(10,"或"), - AND(20,"与"); + OR(10,"或","||"), + AND(20,"与","&&"); private int value; private String description; + private String operator; - LOGICAL_OPERATOR(int value, String description) { + LOGICAL_OPERATOR(int value, String description, String operator) { this.value = value; this.description = description; + this.operator = operator; } public int getValue() { @@ -376,6 +379,16 @@ public class LacEnumUtil { return tmp; } + public static String valueOfOperator(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].operator; + } + } + return tmp; + } + } /** @@ -383,19 +396,21 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RELATIONAL_OPERATOR{ - GT(10,">"), - LT(20,"<"), - EQ(20,"=="), - NE(20,"!="), - GE(20,">="), - LE(20,"<="); + GT(10,"大于",">"), + LT(20,"小于","<"), + EQ(30,"等于","=="), + NE(40,"不等于","!="), + GE(50,"大于等于",">="), + LE(60,"小于等于","<="); private int value; private String description; + private String operator; - RELATIONAL_OPERATOR(int value, String description) { + RELATIONAL_OPERATOR(int value, String description,String operator) { this.value = value; this.description = description; + this.operator = operator; } public int getValue() { @@ -416,6 +431,16 @@ public class LacEnumUtil { return tmp; } + public static RELATIONAL_OPERATOR valueOf(int val) { + RELATIONAL_OPERATOR tmp = EQ; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } /** diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index e9cacb4..1caf947 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -9,6 +9,7 @@ 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; @@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean { @ApiParam(value ="步骤任务列表") private List stepTaskList; + @Transient + @ApiParam(value ="步骤任务检查") + private List taskCheckList; public LacCommandStackStep() { } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 50433f4..63154b6 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean { // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") // private String stepNameRdd; -// -// @Column(name="STEP_CODE_RDD") -// @ApiParam(value ="步骤代码") -// private String stepCodeRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="步骤代码") + private String stepCodeRdd; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="步骤名称") private String taskNameRdd; - @Column(name="STEP_CODE_RDD") + @Column(name="TASK_CODE_RDD") @ApiParam(value ="任务代码") private String taskCodeRdd; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 49e34bf..697b68e 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_VALUE_TYPE") @ApiParam(value ="参数值类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValueType; @Column(name="PARAM_DEFAULT_VALUE") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java index 5c14b36..dd50d24 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean { @ApiParam(value ="目标步骤ID") @JsonSerialize(using = ToStringSerializer.class) private Long targetStepId; + + @Column(name="TARGET_STEP_NAME_RDD") + @ApiParam(value ="目标步骤名称") + private String targetStepNameRdd; + + @Transient + private String value; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index 0574386..ddcfd44 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; import lombok.Data; import org.slf4j.LoggerFactory; @@ -55,9 +56,13 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public Object getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(LacCommandStackStepTask stepTask){ for (Task task : this.getRequest().getTaskList()) { - if(task.getCode().equals(taskCode)){ + // 步骤代码为空时匹配所有任务参数 + if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) { + return task.getParamList(); + } else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd()) + && task.getCode().equals(stepTask.getTaskCodeRdd())) { return task.getParamList(); } } diff --git a/pom.xml b/pom.xml index 9caeb95..5918acc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT + modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From 9e47c4ac5af0f221545032199c2e4512dd3bc3fb Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 10:00:30 +0800 Subject: [PATCH 132/138] =?UTF-8?q?=E3=80=90#1332=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=B9=E5=99=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E6=9C=9F=E9=99=90?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index def0261..3c51124 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean { @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; } From 8b1ae09885cad64eaffee168a6744fccb1b82289 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Dec 2019 14:01:53 +0800 Subject: [PATCH 133/138] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttEventModel.java | 31 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ---------------------- 2 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java new file mode 100644 index 0000000..05bf634 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import cn.estsh.i3plus.pojo.base.common.Pager; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttEventModel { + private Long[] resourceIds; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java deleted file mode 100644 index 3da5e29..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.model; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.List; - -/** - * @Description : 甘特图分页查询参数 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-11-22 - * @Modify: - **/ -@Data -@Api("甘特图分页查询参数") -public class GanttPager extends Pager { - public static class SortData { - // 排序对象 - private String field; - // 排序类型，1为升序，0为降序 - private Boolean ascending; - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - - public Boolean getAscending() { - return ascending; - } - - public void setAscending(Boolean ascending) { - this.ascending = ascending; - } - } - private String filter; - private List sorts; -} From d94ccd5ac57e2da962a5251f1b70dbd6e5e8bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Dec 2019 14:48:07 +0800 Subject: [PATCH 134/138] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6BUG?= =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8F=8C=E7=B2=BE=E5=BA=A6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=95=B0=E5=80=BC=E6=97=B6=E5=BA=94=E8=AF=A5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BAgetHandledQtyVal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) 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 f1bf9a0..3311b77 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 @@ -66,10 +66,6 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "已处理数量", example = "0") public Double handledQty; - public Double getTransQty() { - return this.transQty == null ? 0 : this.transQty.doubleValue(); - } - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -202,17 +198,6 @@ public class WmsMoveDetails extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - - /* @JSONField(name="fPartNo") - public String getfPartNo() { - return fPartNo; - } - - @JSONField(name="fPartName") - public String getfPartName() { - return fPartName; - }*/ - public WmsMoveDetails() { } @@ -293,4 +278,12 @@ public class WmsMoveDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public Double getTransQty() { + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + public Double getHandledQtyVal() { + return this.handledQty == null ? 0 : this.handledQty.doubleValue(); + } + } From e962a1d22ae75da43ab2a4bdb1e8e2f26e9f5777 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:24:57 +0800 Subject: [PATCH 135/138] =?UTF-8?q?=E3=80=90#1331=20KT-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=85=E8=A3=85=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=A0=87=E5=8C=85=E2=80=9D?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 be7ffe3..370667a 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 @@ -90,7 +90,7 @@ public class WmsPart extends BaseBean { private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标准包装", example = "1") + @ApiParam(value = "标包", example = "1") private Double snp; @ColumnDefault("2") From b175de463566ffa50b11d489a3a967801fb656a7 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:26:23 +0800 Subject: [PATCH 136/138] =?UTF-8?q?=E3=80=90#1335=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91"=E9=BB=98=E8=AE=A4=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"=E6=94=B9=E4=B8=BA"=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.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/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 4b4a129..71eb010 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "POCKET_TYPE") - @ApiParam(value = "默认容器类型") + @ApiParam(value = "容器类型") private String pocketType; @ApiParam(value = "上级规格名称") From 62c50e04cc8f0c5ae1d5c1b5ef0f1dc9f992650c Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 27 Dec 2019 15:48:37 +0800 Subject: [PATCH 137/138] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=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/WmsBom.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 27a400a..2be688f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -123,4 +123,13 @@ public class WmsBom extends BaseBean { this.bomNum = bomNum; this.itemQty = itemQty; } + + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } } From 6b02d9969a61302dd5454c38d4ac087b4048a2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Dec 2019 19:06:37 +0800 Subject: [PATCH 138/138] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=86=99=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index df7fad0..b1a8fc7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1972,7 +1972,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true"; + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; } private String getJDBCUrlOracle(String database,String host,Integer port){ @@ -1984,7 +1984,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true"; + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } }