From 005d0f7f8683c9b160f20d8f76b0b5015162d08d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 20:36:43 +0800 Subject: [PATCH 01/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 | 4 ++-- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 0cf8b6d..3d6cbc0 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8debbf6..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..3937425 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..e12eaee 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index e0d305b..5bfdd66 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 91f8894..8b15a31 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..7637865 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 4f24980..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..23f68bd 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 977c14a..28cf55f 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..26a7311 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 788be96..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..910d630 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 284329f..e5b4e5c 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 8bc1aa2..0ecf190 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..fbbe86f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 1983602b3a4c4a3935f56b08d3f76c0f151d482c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 6 May 2020 09:36:35 +0800 Subject: [PATCH 02/44] =?UTF-8?q?8060=20AP-MGN-BJ-19081=20--=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=9F=A5=E8=AF=A2=E8=BE=93=E5=85=A5=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 8d9a807..17c421d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -10,7 +10,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; @@ -71,7 +75,7 @@ public class WmsTransportRule extends BaseBean { public String partNo; @Column(name = "CUST_NO") - @ApiParam("客户代码") + @ApiParam("客户编号") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String custNo; From 25b2fb8e21c3384664a66cbe8efac0b61e6fc6a3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 17:35:04 +0800 Subject: [PATCH 03/44] =?UTF-8?q?jis=20pojo=20=E5=8E=BB=E9=99=A4rule=20?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ef7ae49..627f7c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "MATCH_RULE") + @ApiParam("匹配规则") + private String matchRule; } From f41cd22258734e15b0485da98221d83f14f5b617 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 6 May 2020 19:25:35 +0800 Subject: [PATCH 04/44] =?UTF-8?q?[bug:=208353=20=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=E9=87=87=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 98d4fc0..39063b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; @@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 0549d1f..49363f3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 040228e..ddc37ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 91972fb..f7a2098 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index acc8c22..bb50de6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -75,6 +76,7 @@ public class IfRawPartData extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 index df240bc..221abea 100644 --- 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") From f6e2a509f0df7224b6352942ec8bf8e9c63a1842 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 7 May 2020 16:18:32 +0800 Subject: [PATCH 05/44] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1751=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=B0=8F=E6=97=B6OEE]?= 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 +- 1 file changed, 1 insertion(+), 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 cdb17df..6ccc9fa 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 @@ -5499,7 +5499,7 @@ public class MesEnumUtil { ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), - EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); private String value; private String description; From ba81a267004e7cc93fb060e4441f73f16b66359b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 7 May 2020 17:06:32 +0800 Subject: [PATCH 06/44] =?UTF-8?q?1778=20=E4=BA=A7=E5=93=81=E5=B7=A5?= =?UTF-8?q?=E8=A3=85=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 +++ .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 7 +++ 3 files changed, 72 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 06d2317..fb73d5e 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 @@ -6610,4 +6610,61 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_TYPE { + INIT(10, "PART", "物料"), + BE_HANDLE(20, "OUT", "委外"), + FINISH(30, "UTENSIL", "器具"); + + private int value; + private String code; + private String description; + + BOM_TYPE(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; + } + + 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/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..14d7a05 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 @@ -112,6 +112,14 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 6475e26..3456584 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; From df2e8601c486d16f23dbf7725bd8f43956ec3846 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 May 2020 18:50:12 +0800 Subject: [PATCH 07/44] task:1719 --- .../cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java | 8 +------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 +++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java index 4e90509..f49407c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java @@ -15,13 +15,7 @@ import lombok.Data; @Api("插件日志") public class ScriptLoggerModel { @ApiParam("工厂") - private String organizeCode; - - @ApiParam("用户编号") - private String userCode; - - @ApiParam("脚本编号") - private String scriptNo; + private Boolean error; @ApiParam("日志内容") private String context; 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 792a479..4c77049 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 @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; 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 cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; @@ -2279,6 +2280,14 @@ public class WmsHqlPack { return packBean; } + public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + + return packBean; + } + /** * 供应商窗口时间 条件封装 * From f87eeeb49129f7a06b2aff4c174381f41ac84bed Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 May 2020 13:58:05 +0800 Subject: [PATCH 08/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= 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 | 4 ++-- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 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 3d6cbc0..9302dfc 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 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..712a842 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 e12eaee..a44418c 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..375d0fd 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 8b15a31..d1ea30d 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 7637865..50ab2c2 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 f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..0080b0c 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-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..24de8cf 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 26a7311..0fbfb69 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 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..590b56c 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 e5b4e5c..ac9e7dd 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 0ecf190..f153994 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 fbbe86f..1bef72c 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 diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 0b3d2d6815db509d0c40737c0ffee30138e869e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 8 May 2020 14:34:29 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8DREST=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java | 1 + .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 3 +++ 3 files changed, 13 insertions(+) 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 3b2e47c..cb371c4 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 @@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import java.util.List; import java.util.Map; @@ -20,9 +24,12 @@ import java.util.Map; **/ @Data @XStreamAlias("server") +@XmlRootElement(name ="server") +@XmlAccessorType(XmlAccessType.NONE) public class SuitServerModel { // 执行方法命令 + @XmlElement @ApiParam(value = "适配器code") private String suitCaseCode; /* 认证使用 以后使用 */ @@ -31,6 +38,7 @@ public class SuitServerModel { // 请求ID private String requestId; // 传输单对象 + @XmlElement(name = "data") private Object obj; // 传输集合 private List list; @@ -44,6 +52,7 @@ public class SuitServerModel { */ // @XStreamImplicit @XStreamCDATA + @XmlElement private String suitMessage; /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index da487e2..4f87d41 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value = "长数据", description = "长数据") public class BsLongData extends BaseBean { + private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") private Long refId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index fad903c..051d0c9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -1,6 +1,8 @@ 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.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean { //CommonEnumUtil.HTTP_METHOD_TYPE @Column(name = "REQUEST_METHOD_ID") @ApiParam(value = "请求方式id") + @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; @Transient From eadf0d67f8ffa6eddac8b4118b83f5f018a3cd08 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 8 May 2020 14:49:26 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 19 ++++++++ .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 54 ++++++++-------------- .../estsh/i3plus/pojo/mes/model/FilterGroup.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- .../{FilterRuleAndOr.java => FilterRules.java} | 2 +- 5 files changed, 41 insertions(+), 38 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{FilterRuleAndOr.java => FilterRules.java} (83%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index ded0d8d..c397de1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import java.util.HashMap; +import java.util.Map; /** * @Description : hql脚本封装类 @@ -141,6 +142,24 @@ public class DdlPackBean { } /** + * 添加查询条件-处理多个属性 + * @param hql + * @param hqlMap + */ + public void addColumnQuery(String hql,HashMap hqlMap){ + if(hqlPreparedMap == null){ + hqlPreparedMap = new HashMap<>(); + } + if(hqlMap != null && !hqlMap.isEmpty()) { + hqlPreparedMap.putAll(hqlMap); + } + + whereAppend.append(hql); + } + + + + /** * 需要查询属性的数量 * @return */ 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 cdb17df..6967548 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 @@ -14,26 +14,26 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { - GT(10,">","大于"), - LT(20,"<","小于"), - EQ(30,"=","等于"), - NEQ(40,"!=","不等于"), - GTE(50,">=","大于等于"), - LTE(60,"<=","小于等于"), - LIKE(70,"like","LIKE"), - IN(80,"in","包含"); + GT(">",">","大于"), + LT("<","<","小于"), + EQ("=","=","等于"), + NEQ("!=","!=","不等于"), + GTE(">=",">=","大于等于"), + LTE("<=","<=","小于等于"), + LIKE("like","like","LIKE"), + IN("in","in","包含"); - private int value; + private String value; private String code; private String description; - HQL_EXPRESSION(int value, String code, String description) { + HQL_EXPRESSION(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -45,38 +45,22 @@ public class MesEnumUtil { 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 String codeOf(int val) { - String tmp = null; + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; + if (values()[i].value.equals(val)) { + return values()[i].description; } } - return tmp; + return null; } - public static int descOf(String desc) { - int tmp = 1; + public static HQL_EXPRESSION codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value.equals(value)) { + return values()[i]; } } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); + return null; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java index a262480..2834455 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java @@ -7,5 +7,5 @@ import java.util.List; @Data public class FilterGroup { private String andOr; - private List groups; + private List groups; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java index 0d91df9..d38f6c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class FilterRule { - private String filed; + private String field; private String op; private String value; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java index 1991cfd..1a74bdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; @Data -public class FilterRuleAndOr { +public class FilterRules { private String andOr; private List rules; } From ef6330675c7957fb4bf91524611a99ad61aa5045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 8 May 2020 17:42:53 +0800 Subject: [PATCH 11/44] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1744=EF=BC=9A=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 14 +- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 76 +++++----- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 108 +++++++++++++++ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 144 ++++--------------- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 10 ++ .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 14 ++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 11 +- .../pojo/wms/bean/SwebProcurementPlanOrder.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 16 +-- .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 27 ++++ .../pojo/wms/bean/WmsBhChildDetectionItem.java | 10 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 30 ++-- .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 32 ++--- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 52 ++++--- .../i3plus/pojo/wms/bean/WmsContainerType.java | 9 +- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 44 +++--- .../i3plus/pojo/wms/bean/WmsCustomerPart.java | 20 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 10 +- .../i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 18 +-- .../i3plus/pojo/wms/bean/WmsDockWindowTime.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 13 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 47 ++++--- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 17 +++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 44 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 22 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 153 +++++++++++---------- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 12 +- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 50 +++---- .../estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 4 + .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 20 +-- .../estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 11 +- .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 29 +++- .../cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 8 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 6 + .../i3plus/pojo/wms/bean/WmsShippingFlag.java | 17 +++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 7 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 79 ++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 10 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 10 ++ .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 39 ++++++ .../i3plus/pojo/wms/bean/WmsTransportRule.java | 23 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 25 +++- .../estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 15 ++ .../i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 17 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 40 +++--- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 30 ++-- .../pojo/wms/bean/dynamictable/WmsListElement.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 58 files changed, 1001 insertions(+), 516 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 9dfac91..2811481 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import java.lang.annotation.*; @@ -12,7 +12,7 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface DynamicField { // Web前端字段数据类型 - WmsEnumUtil.FIELD_TYPE webFieldType(); + CommonEnumUtil.FIELD_TYPE webFieldType(); // 条件表达式:>,<,>=等 String conditionExpre() default "="; // 条件连接符:and/or @@ -35,14 +35,16 @@ public @interface DynamicField { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; - // 下拉枚举名称 - String entityName() default ""; // 下拉列表显示列名称,多个列名需要根据逗号分隔 String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; // 回显列名 String explicitColumnName() default ""; - // 下拉框规则 - WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM; + // 是否多选:1-多选，默认2-单选 + int isMultiple() default 2; + // 数据来源 + String dataSrc() default ""; + // 取值方式 + CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM; } 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 6506c66..69c6cd1 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 @@ -37,99 +37,97 @@ public abstract class BaseBean implements Serializable { @Id @GeneratedValue(generator = "IDGenerator") @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="ID") - @ApiParam(value = "主键",example = "0") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 public Long getId() { - if(id != null) { + if (id != null) { return id.longValue(); - }else{ + } else { return id; } } /** * MonogoDB _id映射 + * * @param id */ - @JSONField(name="_id") + @JSONField(name = "_id") public void setId(Long id) { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) - @ApiParam(value ="组织代码") + @Column(name = "ORGANIZE_CODE", nullable = false) + @ApiParam(value = "组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; - @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) - @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @Column(name = "IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) - @ApiParam(value = "是否已删除",example = "2") + @Column(name = "IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除", example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA - @Column(name="CREATE_USER",updatable = false) + @Column(name = "CREATE_USER", updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) - @Column(name="CREATE_DATE_TIME",updatable = false) + @Column(name = "CREATE_DATE_TIME", updatable = false) @ApiParam(value = "创建日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; - @Column(name="MODIFY_USER") + @Column(name = "MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String modifyUser; - @Column(name="MODIFY_DATE_TIME") + @Column(name = "MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @@ -138,19 +136,19 @@ public abstract class BaseBean implements Serializable { public String orderByParam = ""; @Transient - @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") @AnnoOutputColumn(hidden = true) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; //排序方式 - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } 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 00f6f1b..e6bb72a 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 @@ -2175,4 +2175,112 @@ public class CommonEnumUtil { return tmp; } } + + /** + * PC自定义搜索-字段类型 + * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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; + } + + public static FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + } + + /** + * PC自定义搜索-取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_FIELD_GET_WAY { + ENUM(10, "SINGLE_OBJ", "枚举"), + OBJ(20, "MULTIPLE_OBJ", "对象"), + URL(30, "SINGLE_OBJ", "接口"); + + private int value; + private String code; + private String description; + + DYNAMIC_FIELD_GET_WAY(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 DYNAMIC_FIELD_GET_WAY 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; + } + + 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-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 57e81fc..d57e601 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 @@ -139,6 +139,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2989,6 +2990,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -3176,6 +3178,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -3189,7 +3192,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } @@ -4199,7 +4205,8 @@ public class WmsEnumUtil { } } - /**分类 + /** + * 分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4363,7 +4370,7 @@ public class WmsEnumUtil { /** - * 日志推送至MQ的处理类型 + * 规格层级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SPEC_LEVEL { @@ -4935,51 +4942,6 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { - TEXT(10, "text"), NUMBER(20, "number"), - SELECT(30, "select"), DATETIME(40, "datetime"), - LIST(50, "list"); - - private int value; - private String description; - - FIELD_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; - } - public static FIELD_TYPE codeOf(Integer value) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value==value) { - return values()[i]; - } - } - return null; - } - } - - /** * 推送类型单位 * 默认为 10 */ @@ -5053,6 +5015,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -5066,7 +5029,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } /** @@ -5239,7 +5205,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5301,70 +5267,7 @@ public class WmsEnumUtil { } /** - * 动态查询-下拉框规则 - * 默认为 10 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_FIELD_SELECT_RULE { - SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"), - MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"), - SINGLE_URL(30, "SINGLE_URL", "单选接口"), - MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口"); - - private int value; - private String code; - private String description; - - DYNAMIC_FIELD_SELECT_RULE(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 DYNAMIC_FIELD_SELECT_RULE 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; - } - - 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; - } - } - - /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { @@ -5448,7 +5351,7 @@ public class WmsEnumUtil { } /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { @@ -5563,7 +5466,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-合并规则，20-合并范围 + * 插件类型 10-合并规则，20-合并范围 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_TYPE { @@ -5806,7 +5709,7 @@ public class WmsEnumUtil { return null; } - public static String valueOfDescription ( int val){ + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5822,7 +5725,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DOC_TYPE { - TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d"); private int value; private String code; @@ -5832,7 +5735,7 @@ public class WmsEnumUtil { return code; } - QAD_DOC_TYPE(int value,String code, String description) { + QAD_DOC_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5898,6 +5801,7 @@ public class WmsEnumUtil { } return null; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6383,7 +6287,7 @@ public class WmsEnumUtil { private String code; private String description; - PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) { + PURCHASE_PLAN_HISTORY_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 60cabe4..2ea88ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custNo; @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custName; @Column(name = "CUST_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custDesc; @Column(name = "CUST_ADDR") @ApiParam(value = "客户地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custAddr; @Column(name = "CUST_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custOwner; @Column(name = "CUST_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custEmail; @Column(name = "CUST_TEL") @ApiParam(value = "电话号码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custTel; @Column(name = "CUST_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; } 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 ebf9603..a0a1765 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name="VENDOR_NAME") @ApiParam("供应商简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorName; @Column(name="VENDOR_DESC") @ApiParam("供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorDesc; @Column(name="VENDOR_ADDR") @@ -47,50 +52,64 @@ public class BasVendor extends BaseBean{ @Column(name="VENDOR_OWNER") @ApiParam("联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorOwner; @Column(name="VENDOR_EMAIL") @ApiParam("邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorEmail; @Column(name = "IS_ASN") @ApiParam(value = "是否发ASN", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isAsn; @Column(name = "USER_NAME") @ApiParam(value = "用户名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String userName; @Column(name = "PASSWORD") @ApiParam(value = "密码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String password; @Column(name = "VENDOR_CALL") @ApiParam("供应商电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorCall; @Column(name = "VENDOR_FAX") @ApiParam("传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorFax; @Column(name = "VENDOR_PHONE") @ApiParam("手机") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorPhone; @Column(name = "KILOBIT") @ApiParam("千位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String kilobit; @Column(name = "DECIMALS") @ApiParam("小数位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String decimals; - //20-承运商 @Column(name = "VENDOR_TYPE") + @ApiParam("供应商类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE") private Integer vendorType; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; public BasVendor() { 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 index 8ec1cae..2eb3864 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String woekorderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; public Integer getOrderStatus() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 59f3f84..1e942f7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -41,7 +41,7 @@ public class QadBop implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java index dfe4dab..b1433df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java index e33e3c1..4de7f0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -13,12 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -45,7 +40,7 @@ public class SodDet implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 338d1d1..6069c18 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean { private static final long serialVersionUID = -4332932784803175933L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; @Column(name = "PART_NO") @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 2bbb7c8..55e2498 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,37 +35,37 @@ public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; @Column(name = "CODE") @ApiParam("仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String code; @Column(name = "NAME") @ApiParam("仓库名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String name; @Column(name = "ADDRESS") @ApiParam("仓库地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; @Column(name = "WH_LENGTH") @ApiParam(value = "长(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whLength; @Column(name = "WH_WIDTH") @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whWidth; @Column(name = "WH_HEIGHT") @ApiParam(value = "高(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whHeight; @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") @ApiParam(value = "基本单元（米）") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; @Column(name = "MAP_LOCATION") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index a852b02..015f5ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,38 +34,63 @@ public class WmsAreaOwner extends BaseBean { private static final long serialVersionUID = -5772266802563087135L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "OWNER_USER_NO") @ApiParam(value = "负责人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String ownerUserNo; @Column(name = "IS_PRE_ASSIGN") @ApiParam(value = "是否预分配人员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPreAssign; @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shiftNo; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index e157150..6be1fbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,21 +32,21 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "ITEM_CHECK_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckCode; @Column(name = "ITEM_CHECK_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckName; @Column(name = "VALUE_TYPE") @ApiParam("值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; } 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 c87d03b..fcbabcf 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 @@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,61 +37,61 @@ public class WmsBom extends BaseBean { private static final long serialVersionUID = 5555657644784074446L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -99,17 +99,17 @@ public class WmsBom extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @ApiParam(value = "目标存储区") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 6475e26..1616169 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,61 +35,61 @@ import javax.persistence.Transient; public class WmsBomHistory extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -97,22 +97,22 @@ public class WmsBomHistory extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @Column(name = "NEW_BOM_VERSION") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; @ApiParam(value = "目标存储区") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index 6c8b97a..f32d795 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -26,43 +27,60 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_CAR") +@Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { - @Column(name="CAR_NO") - @ApiParam(value ="车牌号") + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") + @Column(name = "CAR_DESC") + @ApiParam(value = "车辆描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carDesc; - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") + @Column(name = "MAX_CAPACITY") + @ApiParam(value = "载重量(KG)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String maxCapacity; - @Column(name="DRIVER_NO") - @ApiParam(value ="默认驾驶员") + @Column(name = "DRIVER_NO") + @ApiParam(value = "默认驾驶员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") + @Column(name = "PHONE") + @ApiParam(value = "车主电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; - @Column(name="VENDOR_NO") - @ApiParam(value ="所属供应商") + @Column(name = "VENDOR_NO") + @ApiParam(value = "所属供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; - @Transient - @ApiParam("司机名称") + @Column(name = "DRIVER_NAME_RDD") + @ApiParam("驾驶员名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName") private String driverNameRdd; - @Transient + @Column(name = "VENDOR_NAME_RDD") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorNameRdd; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; } 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 3c51124..5529e33 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 @@ -1,20 +1,20 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; -import javax.persistence.Transient; /** * @Description :容器类型 @@ -33,22 +33,27 @@ import javax.persistence.Transient; public class WmsContainerType extends BaseBean { private static final long serialVersionUID = 4849044986767609347L; @ApiParam(value = "容器类型代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctCode; @Column(name = "CT_NAME") @ApiParam(value = "容器类型名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctName; @Column(name = "USE_LIMIT") @ApiParam(value = "使用期限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private Integer useLimit; @Column(name = "IS_RECYCLE") @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isRecycle; @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String limitUom; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index a6845a4..4ceaa41 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,77 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "STRATEGY_NAME") @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String strategyName; @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) private Integer strategyType; @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNos; @Column(name = "LOCATES") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "盘点库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locates; @Column(name = "last_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) @ApiParam(value = "备注") private String remake; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘物料") - @Column(name="INVENTORY_MATERIAL") + @Column(name = "INVENTORY_MATERIAL") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String inventoryMaterial; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘库位") - @Column(name="INVENTORY_LOCATION") - private String inventoryLocation; + @Column(name = "INVENTORY_LOCATION") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inventoryLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index 6e25a2b..3e7e870 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 客户零件关系表 @@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean { private static final long serialVersionUID = 3903166651913139058L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String customerCode; @Column(name = "PART_NO") @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "CUSTOMER_PART_NO") @ApiParam(value = "客户零件号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String customerPartNo; - @Transient + @Column(name = "CUSTOMER_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc") private String custDesc; - @Transient + @Column(name = "PART_NAME") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index 2f2f3f9..4686917 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,21 +31,21 @@ import javax.persistence.Table; public class WmsDock extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="DOCK_ADDRESS") @ApiParam("道口发运地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockAddress; @Column(name="DOCK_DESC") @ApiParam("道口发运地址描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockDesc; @Column(name="DOCK_TYPE") @ApiParam("道口类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE") private Integer dockType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index b7e6d03..3c8d44e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,42 +33,42 @@ public class WmsDockOrderInfo extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="ORDER_DATE") @ApiParam("预约日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String orderDate; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; @Column(name="ORDER_STATUS") @ApiParam("预约状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS") private Integer orderStatus; @Column(name="SUPPLIER_CODE") @ApiParam("供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String supplierCode; @Column(name="CAR_NO") @ApiParam("车辆编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String carNo; @Column(name="DRIVER_NAME") @ApiParam("驾驶员") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String driverName; @Column(name="ORDER_NO") @ApiParam("单据号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java index 0084679..acdd899 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,11 +32,11 @@ public class WmsDockWindowTime extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String dockCode; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index 9b7661f..3e63579 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{ private static final long serialVersionUID = 3557978060450659460L; @Column(name="PART_NO") @ApiParam(value ="物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="START_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startDate; @Column(name="END_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endDate; @Column(name="LOT_QTY") @ApiParam(value ="样本数量", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer lotQty; @Column(name="COUNTER") @ApiParam(value ="已收货件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer counter; @Column(name="CHECK_COUNTER") @ApiParam(value ="已抽点件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer checkCounter; @Transient 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 a69e24b..dc5f9e6 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean { private static final long serialVersionUID = -8425904594036746967L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateNo; @Column(name = "LOCATE_NAME") @ApiParam(value = "库位名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateName; /** @@ -49,104 +50,106 @@ public class WmsLocate extends BaseBean { @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "FURNITURE_NO") @ApiParam(value = "家具代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String furnitureNo; @Column(name = "X") @ApiParam(value = "X", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer x; @Column(name = "Y") @ApiParam(value = "Y", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer y; @Column(name = "Z") @ApiParam(value = "Z", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; @Column(name = "LC_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcLength; @Column(name = "LC_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcWidth; @Column(name = "LC_HEIGHT") @ApiParam(value = "高") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq; @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") @ApiParam(value = "最大包装数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer maxPackageQty; @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxPartQty; @Column(name = "STOCK_UNIT") @ApiParam(value = "存放单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "LINE_CODE") @ApiParam(value = "生产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lineCode; @Column(name = "BOX_QTY") @ApiParam(value = "箱数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer boxQty; @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double partQty; @Column(name = "ENCRYPTION_NO") @ApiParam(value = "加密编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String encryptionNo; @Column(name = "LAST_CS_TIME") @ApiParam(value = "末次盘点时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; @Column(name = "POSITION") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index c4b5956..47d5248 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePicklist; @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") @ApiParam(value = "安全库存", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double safetyStock; @Column(name = "MOQ", columnDefinition = "decimal(18,8)") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double moq; @Transient 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 d221a61..87ab093 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,41 +39,58 @@ public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer item; @Column(name = "PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double transQty; @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "已处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double handledQty; @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double rejectQty; public Double getRejectQty() { @@ -80,30 +99,49 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "UNIT") @ApiParam("单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String unit; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String srcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String srcZoneNo; @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String srcLocateNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String destWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String destZoneNo; @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String destLocateNo; /** @@ -112,10 +150,12 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS") public Integer itemStatus; @Column(name = "REF_ITEM") @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refItem; /** @@ -123,14 +163,17 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam("关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; @Column(name = "GROUP_NO") @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String groupNo; @ApiParam(value = "待出库数量", example = "0") @@ -200,6 +243,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer consignation = 2; public Integer getIsSnapshot() { 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 71eb010..702df84 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :包装规格 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity @@ -30,34 +31,45 @@ import javax.persistence.Transient; public class WmsPackageSpec extends BaseBean { private static final long serialVersionUID = 4849044986767609445L; @ApiParam(value = "包装规格代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specCode; @Column(name = "SPEC_NAME") @ApiParam(value = "包装规格名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specName; @Column(name = "QTY") @ApiParam(value = "包装数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Column(name = "PARENT_SPEC") @ApiParam(value = "上级规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") private String parentSpec; @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL") private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isMixed; @Column(name = "POCKET_TYPE") @ApiParam(value = "容器类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") private String pocketType; @ApiParam(value = "上级规格名称") - @Transient + @Column(name = "PARENT_NAME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; } 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 58f5123..77039cd 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,237 +33,239 @@ import javax.persistence.*; @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; + @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; - @Column(name = "PART_SPEC") - @ApiParam(value = "物料规格") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String partSpec; + @Column(name = "PART_TYPE_DESC") + @ApiParam(value = "物料类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partTypeDesc; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; - @Column(name = "PART_TYPE_DESC") - @ApiParam(value = "物料类型描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String partTypeDesc; + @Column(name = "STOCK_UNIT") + @ApiParam(value = "库存单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + private String stockUnit; + + @Column(name = "IN_LOCATE_NO") + @ApiParam(value = "默认入库库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inLocateNo; + + @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标包", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double snp; + + @ColumnDefault("2") + @Column(name = "IQC") + @ApiParam(value = "是否免检", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + private Integer iqc; + + @Column(name = "PART_SPEC") + @ApiParam(value = "物料规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partSpec; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; - @Column(name = "STOCK_UNIT") - @ApiParam(value = "库存单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") - private String stockUnit; - @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标包", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double snp; - - @ColumnDefault("2") - @Column(name = "IQC") - @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") - private Integer iqc; - @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; - @Column(name = "IN_LOCATE_NO") - @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") - private String inLocateNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name = "verb_num") @ApiParam(value = "单次拆包数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM, - isRequire = 2, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式") private String pullWay; @Column(name = "TAIL_QTY_MODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "1") private Integer tailQtyMode; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; @Column(name = "CURING_TIME") @ApiParam(value = "固化时间", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; public int getIqcVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 5af3d21..d96f8c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,26 +32,26 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "PART_NAME") @ApiParam("物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partName; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sampleSize; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index e01c45c..75d3389 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -39,121 +39,121 @@ public class WmsPartExtend extends BaseBean { @Column(name = "IS_SETTLE") @ApiParam(value = "是否内部交易") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSettle; @Column(name = "SETTLE_FACTORY_CODE") @ApiParam(value = "结算工厂") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleFactoryCode; @Column(name = "SETTLE_REC_ERP_WH") @ApiParam(value = "结算物料收货库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleRecErpWh; @Column(name = "VALUATION_CLASS") @ApiParam(value = "评估类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClass; @Column(name = "VALUATION_CLASS_NAME") @ApiParam(value = "评估类描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClassName; @Column(name = "MC_CODE") @ApiParam(value = "MRP控制者") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcCode; @Column(name = "MC_NAME") @ApiParam(value = "MRP控制者名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcName; @Column(name = "IS_STEEL") @ApiParam(value = "是否为钢卷料") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE") private Integer isSteel; @Column(name = "IS_PACKAGE_MATERIAL") @ApiParam(value = "是否为包材") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isPackageMaterial; @Column(name = "RECEIVING_TYPE") @ApiParam(value = "收货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String receivingType; @Column(name = "LOT_CONTROL") @ApiParam(value = "批次控制") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeLot; @Column(name = "QUALITY_RATE") @ApiParam(value = "质检率") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qualityRate; @Column(name = "ROUTING") @ApiParam(value = "工艺") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routing; @Column(name = "PO_PART_MULTIPLE") @ApiParam(value = "乘倍包装") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String poPartMultiple; @Column(name = "RANGE_QTY_RATE") @ApiParam(value = "数量容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeQtyRate; @Column(name = "RANGE_INVENTORY") @ApiParam(value = "盘点容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeInventory; @Column(name = "PROD_LINE") @ApiParam(value = "产品类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String prodLine; @Column(name = "SUPPLY_TYPE") @ApiParam(value = "供货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE") private Integer supplyType; @Column(name = "RECEIVING_MODE") @ApiParam(value = "收货方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD") private Integer receivingMethod; @Column(name = "PRE_RECEIVING_DAY") @ApiParam(value = "预收货天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer preReceivingDay; @Column(name = "IS_WAY_CALCULATION") @ApiParam(value = "是否计算在途库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isWayCalculation; @Column(name = "IS_AUTO_PURCHASE") @ApiParam(value = "是否自动采购") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isAutoPurchase; @Column(name = "AUTO_PURCHASE_QTY") @ApiParam(value = "自动采购数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java index 9641130..5265509 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{ private static final long serialVersionUID = 9214639813072864436L; @Column(name="PART_GROUP_NO") @ApiParam("物料组编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupNo; @Column(name="PART_GROUP_NAME") @ApiParam("物料组名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupName; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 8498c36..78f8058 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,46 +32,46 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemCode; @Column(name = "CHECK_ITEM_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemName; @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double standard; @Column(name = "MAX") @ApiParam("最大值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "MIN") @ApiParam("最小值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java index e7dc3ca..2896d6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -1,8 +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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,11 +14,11 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :物料包装关系 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java index 4539336..a90107b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean { private static final long serialVersionUID = -131043081244530896L; @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeCode; @Column(name="PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index 90b3a58..52d22b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -31,21 +30,21 @@ import javax.persistence.Table; public class WmsPullRule extends BaseBean { @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") private Integer pullWay; @Column(name = "CONTAIN_UNFINISH_ORDER") @ApiParam(value = "考虑未完成的移库单", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containUnfinishOrder; @Column(name = "CONTAIN_EXIST_PERIOD") @ApiParam(value = "考虑现有库存", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containExistStock; @Column(name = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; } 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 index aa9559c..00fa875 100644 --- 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String woekorderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="IS_SUSPEND") @ApiParam(value = "是否暂停", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSuspend = 2; @Column(name="PULL_TASK_TYPE") @ApiParam(value = "拉动任务类型", example = "10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE") private Integer pullTaskType; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer seq; public Integer getOrderStatus() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 33ed3df..bfe28bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean { private static final long serialVersionUID = 2701710669030092148L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; /** @@ -43,6 +46,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE") public Integer orderType; /** @@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus; @Column(name = "REMARK") @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String remark; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer version; @Column(name = "REF_TYPE") @ApiParam("关联单号类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; - @Transient + @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custName; - @Transient - @ApiParam(value = "供应商简称") + @Column(name = "VENDOR_DESC") + @ApiParam(value = "供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") private String VendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isPart; @Transient 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 1ac54c6..67c0edd 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingCode; @Column(name = "ROUTING_NAME") @ApiParam(value = "线路名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingName; @Column(name = "ROUTING_DESC") @ApiParam(value = "线路描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String routingDesc; @Column(name = "FOR_PROUCT_CLASS") @ApiParam(value = "适用产品分类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProductClass; @Column(name = "FOR_WAREHOUSE") @ApiParam(value = "适用仓库", example ="1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forWareHouse; @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProduct; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index b894c55..40f637d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{ @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftNo; @Column(name="SHIFT_NAME") @ApiParam("班次名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftName; @Column(name="START_TIME") @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startTime; @Column(name="END_TIME") @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index a64dc8f..2ce24ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,45 +34,60 @@ public class WmsShippingFlag extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custNo; @Column(name = "FLAG_NO") @ApiParam(value = "客户发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagNo; @Column(name = "FLAG_NAME") @ApiParam(value = "客户发往地名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagName; @Column(name = "SHIPP_QTY") @ApiParam(value = "发运数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer shippQty; @Column(name = "FLAG_DESC") @ApiParam(value = "全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagDesc; @Column(name = "FLAG_ADDR") @ApiParam(value = "客户发往地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagAddr; @Column(name = "FLAG_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagOwner; @Column(name = "FLAG_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagEmail; @Column(name = "FLAG_TEL") @ApiParam(value = "联系人电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagTel; @Column(name = "FLAG_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagFax; @Column(name="TEMPLATE_NO") @ApiParam("模板编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/label/sys-label-template/cloud-query", + searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode") private String templateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 127238a..63e33e3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -34,7 +35,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "SN") @ApiParam(value = "条码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String sn; @Column(name = "LINE_CODE") @@ -77,12 +78,12 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSN; } 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 314f299..70f8c54 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -12,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -52,75 +50,107 @@ public class WmsStockSn extends BaseBean { private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "LOT_NO", nullable = false) @ApiParam("收货批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String lotNo = ""; @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "供应商批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode = ""; @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String fixLotNo = ""; @Column(name = "QUALITY_DATE") @ApiParam("保质期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String qualityDate; @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "SHIPPING_FLAG") @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @Column(name = "SN") @ApiParam(value = "条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn; @Column(name = "SN_2D") @ApiParam(value = "二维码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn2d; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty = 0d; /** @@ -128,49 +158,58 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS") private Integer snStatus; /** * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Date pdate; /** * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "CUST_SN") @ApiParam(value = "客户条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custSn; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; @ApiParam(value = "仓库名称") @@ -395,8 +434,8 @@ public class WmsStockSn extends BaseBean { } - public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){ - this.snStatus=snStatus; + public WmsStockSn(Integer snStatus, String whNo, String locateNo, String partNo, String partNameRdd, String lotNo, Double qty) { + this.snStatus = snStatus; this.whNo = whNo; this.locateNo = locateNo; this.partNo = partNo; @@ -405,7 +444,7 @@ public class WmsStockSn extends BaseBean { this.qty = qty; } - public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + public WmsStockSn(Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, String qualityDate, String custNo, String lotCheckRule, String sn2d, @@ -439,17 +478,17 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + public WmsStockSn(String partNo, String packageNo, String locateNo, String createDatetime, String modifyDatetime) { this.partNo = partNo; - this.packageNo =packageNo; + this.packageNo = packageNo; this.locateNo = locateNo; - this.createDatetime=createDatetime; + this.createDatetime = createDatetime; this.modifyDatetime = modifyDatetime; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, String partSpec, Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; @@ -477,9 +516,9 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,Integer qcStatus, Double qty, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java index 9120e8d..1bab8d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,21 +35,21 @@ public class WmsSubPart extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "SUB_PART_NO") @ApiParam(value = "替代物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "SUB_PART_NAME") @ApiParam(value = "替代物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java index 3531e8f..6d7bec2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; /** * @Description : 工位表 @@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{ private static final long serialVersionUID = 9214639813072592713L; @Column(name="TERMINAL_NO") @ApiParam("工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalNo; @Column(name="TERMINAL_NAME") @ApiParam("工位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalName; @Column(name="PDLINE_NO") @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java index 0ecea20..9e6d386 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,33 +33,41 @@ public class WmsTmsDriver extends BaseBean { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverNo; @Column(name="DRIVER_NAME") @ApiParam(value ="驾驶员姓名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverName; @Column(name="SEX") @ApiParam(value ="驾驶员性别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sex; @Column(name="AGE") @ApiParam(value ="驾驶员年龄") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String age; @Column(name="ID_NO") @ApiParam(value ="驾驶员身份证号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String idNo; @Column(name="ADRESS") @ApiParam(value ="驾驶员籍贯") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String adress; @Column(name="PHONE") @ApiParam(value ="车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String loginNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index b163bbb..14fbf1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,30 +38,47 @@ public class WmsTransQuan extends BaseBean { private static final long serialVersionUID = -7379945456037422449L; @Column(name = "TRANS_NO") @ApiParam(value = "事务编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transNo; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_NO") @ApiParam(value = "库位编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "TRANS_STATUS") @@ -76,75 +95,95 @@ public class WmsTransQuan extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "TRANS_CODE") @ApiParam(value = "交易代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transCode; @Column(name = "MOVE_NO") @ApiParam(value = "库存移动单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String moveNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "CUST_NO") @ApiParam(value = "客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String errorMessage; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double qty; @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double failQty; @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double holdQty; @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qcQty; @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double rinQty; @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double freezeQty; @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double consignQty; @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double lockQty; @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double scrapQty; @Column(name="TRANS_TYPE_NAME") @ApiParam(value ="交易名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transTypeName; /*@Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 8d9a807..744f71c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -10,7 +11,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; @@ -39,46 +44,46 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE") public Integer busiType; @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") public Integer busiSceneType; @Column(name = "SRC_AREA_NO") @ApiParam("发货库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String srcAreaNo; @Column(name = "DEST_AREA_NO") @ApiParam("目标库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String destAreaNo; @Column(name = "OUT_VENDOR_NO") @ApiParam("委外供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String outVendorNo; @Column(name = "PART_NO") @ApiParam("物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String partNo; @Column(name = "CUST_NO") @ApiParam("客户代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String custNo; @Column(name = "IS_TRANSPORT") @ApiParam("是否安排运输") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isTransport; @Column(name = "REMARK",length = 255) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 290f7c0..84ce516 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class WmsUnit extends BaseBean { private static final long serialVersionUID = 7332606009041273554L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitName; @Column(name = "UNIT_PRECISION") @ApiParam(value = "单位精度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer unitPrecision; public Integer getUnitPrecisionValue(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 03e877d..5fbc76e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,14 +33,17 @@ public class WmsUnitConvert extends BaseBean { private static final long serialVersionUID = -466720560879335877L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "DEST_UNIT_CODE") @ApiParam(value = "目标单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destUnitCode; @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double unitCoefficient; public Double getUnitCoefficientVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 042c111..bcd0499 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 供应商零件关系 @@ -22,20 +23,26 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_VENDOR_PART") +@Table(name = "WMS_VENDOR_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="供应商零件关系",description = "供应商零件关系") +@Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { private static final long serialVersionUID = 7339520734918140529L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "PART_NO") @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "VENDOR_PART_NO") @@ -44,14 +51,20 @@ public class WmsVendorPart extends BaseBean { @Column(name = "MAX_AMOUNT") @ApiParam(value = "供应商月提供最大数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxAmount; - @Transient + @Column(name = "PART_NO_NAME") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; - - @Transient + @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 6da587b..241599c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,30 +33,43 @@ public class WmsWorkCenter extends BaseBean { private static final long serialVersionUID = 415180808859365167L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "WORK_CENTER_NAME") @ApiParam(value = "工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterName; @Column(name = "ERP_WORK_CENTER") @ApiParam(value = "ERP_工作中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String erpWorkCenter; @Column(name = "WORK_VER") @ApiParam(value = "生产版本") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workVer; @Column(name = "SRC_ZONE_NO") @ApiParam(value = "原料扣减库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String srcZoneNo; @Column(name = "DESC_ZONE_NO") @ApiParam(value = "成品库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String descZoneNo; @Column(name = "DESC_LOCATION_CODE") @ApiParam(value = "成品库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index 9175316..1a792c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 工作中心线边库区关系 @@ -28,21 +29,33 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { - private static final long serialVersionUID = 950689993212839817L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String workCenterCode; @Column(name = "ZONE_NO") @ApiParam(value = "线边库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; - @Transient + @Column(name = "WORK_CENTER_NAME") @ApiParam("工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName") private String workCenterName; - @Transient + @Column(name = "ZONE_NAME") @ApiParam("线边库区名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneName") private String zoneName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 11d9020..78913f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,42 +34,57 @@ public class WmsZonePart extends BaseBean{ private static final long serialVersionUID = 9214639813072592546L; @Column(name="ZONE_NO") @ApiParam("存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name="MAX", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name="MIN", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePickList; @Column(name="MOQ", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double moq; @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "安全量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index f916604..5d1e4b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,82 +35,82 @@ public class WmsZones extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String whNo; @Column(name = "AREA_NO") @ApiParam(value = "库存地代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneNo; @Column(name = "ZONE_NAME") @ApiParam(value = "存储区名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneName; @Column(name = "PARENT_ZONE_NO") @ApiParam(value = "父级存储区", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String parentZoneNo; @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @ApiParam(value = "堆放策略") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String strategy; @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneLength; @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneWidth; @Column(name = "POSITION") @@ -119,17 +119,17 @@ public class WmsZones extends BaseBean { @Column(name = "ZONE_PULL_WAY") @ApiParam(value = "补货方式", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "ZONE_PULL_WAY") private Integer zonePullWay; @Column(name = "PULL_CYCLE") @ApiParam(value = "固定拉动周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullCycle; @Column(name = "LAST_PULL_TIME") @ApiParam(value = "上次拉动时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastPullTime; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 01b511f..d7c87ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.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 : WMS字段信息表 @@ -21,14 +19,18 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO", indexes = { +@Table(name = "WMS_FIELDINFO", + indexes = { @Index(columnList = "FIELD_NAME"), - @Index(columnList = "ENTITY_NAME") -}) + @Index(columnList = "ENTITY_NAME")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = { + "FIELD_NAME", "ENTITY_NAME"})} +) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="WMS字段信息表",description = "WMS字段信息表") +@Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; @@ -109,7 +111,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "回显列名") private String explicitColumnName; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选") + private Integer isMultiple; + + @Column(name = "DATA_SRC") + @ApiParam(value = "数据来源") + private String dataSrc; + + @Column(name = "GET_VAL_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 63c7ee5..5ebf953 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -89,9 +89,9 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "字段类型") private Integer fieldType; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "DYNAMIC_FIELD_GET_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") 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 9b21eb1..e18d545 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 @@ -2921,7 +2921,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); getStringBuilderPack(wmsFieldInfo, result); return result; } From 5fb7eecee078f3602c237e39f82393e1b29e2ddf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 8 May 2020 20:36:34 +0800 Subject: [PATCH 12/44] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752=20oee?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF]?= 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 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 4 ++++ 2 files changed, 6 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 ddb7f2e..156b353 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 @@ -5077,7 +5077,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_TYPE { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), - BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"); private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index d1dd2da..a115e99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import cn.estsh.i3plus.pojo.mes.bean.MesOee; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -48,4 +49,7 @@ public class BoardModel { @ApiParam("看板设备明细") private List boardEquDetailList; + + @ApiParam("oee") + private List oeeList; } From bbbdfae633f9c8b9446221c9b423655aa867431b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 11:15:46 +0800 Subject: [PATCH 13/44] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName; From 7ef769268d3200c06c38a8961c073c09b0df64f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:38:35 +0800 Subject: [PATCH 14/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8C=E6=A3=80=E9=AA=8C=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AE=9E=E4=BD=93=E4=B8=8E=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 85 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 77 ++++++++++++++++++ 3 files changed, 257 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.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 e126301..4437fc2 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 @@ -2506,6 +2506,7 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { + IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), END_CHECK(30, "尾检"); @@ -5174,4 +5175,98 @@ public class MesEnumUtil { } } + /** + * MES_检验单 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_STATUS { + + CREATE(10, "创建"), + IN_EXEC(20, "执行中"), + COMPLETE(30, "完成"); + + private int value; + private String description; + + MES_QC_STATUS(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_检验单 检测整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_RESULT { + + PASS(10, "通过"), + NO_PASS(20, "不通过"), + COMPROMISE_PASS(30, "让步通过"); + + private int value; + private String description; + + MES_QC_CHECK_RESULT(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java new file mode 100644 index 0000000..2f29e00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -0,0 +1,85 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182786427690154L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private BigDecimal qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuId; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java new file mode 100644 index 0000000..9471a66 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182786786500154L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String partName; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String supplierCode; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String fixLotNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; +} From 6d7d8de7b3e0a37cf3ddd0e9b4646cd28d22e8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:50:00 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8CMES=5F=E6=A3=80=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E5=AE=9E=E4=BD=93=E5=92=8C=E6=9E=9A?= =?UTF-8?q?=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/mes/bean/MesQcOrderDetail.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 9471a66..2b88d9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -13,7 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.math.BigDecimal; /** * @Description :mes系统业务动作 From a1579a2484d2aa438e1b508e56815d0345094214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 13:39:14 +0800 Subject: [PATCH 16/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E8=A1=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 36 ++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 2b88d9a..33fb5c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -44,7 +44,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_ITEM") @ApiParam("检测项") - private String partName; + private String checkItem; @Column(name = "CHECK_STANDARD") @ApiParam("检测标准") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java new file mode 100644 index 0000000..d29da2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QcDetailReportModel implements Serializable { + @ApiParam(value = "顾客名称") + private String customerName; + + @ApiParam(value = "供应商名称") + private String supplierName; + + @ApiParam(value = "供应商代码") + private String supplierCode; + + @ApiParam(value = "送货时间") + private String deliveryDate; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料描述") + private String partName; + + @ApiParam(value = "生产日期") + private String productDate; + + @ApiParam(value = "送货批次") + private String deliveryLotNo; + + @ApiParam(value = "本批次生产总数") + private String lotNoProdQry; + + @ApiParam(value = "供货数量") + private String supplyQty; + + @ApiParam(value = "检测类型") + private Integer checkType; + + @ApiParam(value = "检验项") + private String checkItem; + + @ApiParam(value = "检验要求") + private String checkStandard; + + @ApiParam(value = "检测值") + private String checkValue; + + @ApiParam(value = "检测结果") + private Integer checkResult; + + @ApiParam(value = "备注") + private String memo; +} 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 e3808fb..4591186 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 @@ -928,6 +928,42 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrder + * @return + */ + public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); + if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartName())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); + } + // 时间段查询 + if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getCreateDateTimeStart(), + qcOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(qcOrder.getModifyDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getModifyDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getModifyDateTimeStart(), + qcOrder.getModifyDateTimeEnd(), + "modifyDatetime", packBean, true); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part From da8b4db89020f68848126905ca10e6ec81e24f35 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 9 May 2020 13:46:00 +0800 Subject: [PATCH 17/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 | 4 ++-- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 9302dfc..3d6cbc0 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 712a842..3937425 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 375d0fd..5bfdd66 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index d1ea30d..8b15a31 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 0080b0c..23f68bd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 24de8cf..28cf55f 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 590b56c..910d630 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index ac9e7dd..e5b4e5c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index f153994..0ecf190 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 1bef72c..fbbe86f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 23d1762b5b9555bf5069e3a7d5376a001107d958 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 9 May 2020 14:12:36 +0800 Subject: [PATCH 18/44] =?UTF-8?q?[bug:=208422=20=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0bug]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ddc37ba..fb6c793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -69,7 +69,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ITEM_QTY") @ApiParam("原材料用量") - private String itemQty; + private Double itemQty; @Column(name = "ITEM_UNIT") @ApiParam("原材料单位") From 1dad60b1290c3efcb9be5609faf6e99e124950d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 14:20:38 +0800 Subject: [PATCH 19/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9pojo=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2--=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84=E8=AF=A6=E7=BB=86=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E3=80=90=E7=B3=BB=E7=BB=9F=E3=80=91=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6Bug=EF=BC=9A8420?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName; From 23b06a53afbade43dde78cbb1828abc9b8a1df9d Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 9 May 2020 15:10:30 +0800 Subject: [PATCH 20/44] bug:8404 --- .../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 366bf4d..c483463 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 @@ -6468,8 +6468,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BH_VALUE_TYPE { - NUMBER(10, "NUMBER", "功能检测"), - TEXT(20, "TEXT", "尺寸检测"); + NUMBER(10, "NUMBER", "数字"), + TEXT(20, "TEXT", "文本"); private int value; private String code; From abbab6bda4501370a224463fc1c2705888eb416f Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sat, 9 May 2020 17:37:20 +0800 Subject: [PATCH 21/44] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=A8=A1=E5=9D=97=E6=A3=80=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java index d38f6c9..21da796 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -6,5 +6,5 @@ import lombok.Data; public class FilterRule { private String field; private String op; - private String value; + private Object value; } From 4f5f9777a2003c0c8a76a86a8f1b7e6013a2e7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 17:56:42 +0800 Subject: [PATCH 22/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=B8=8Emodel=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 5 ++ .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++- 3 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 2f29e00..dcc8eed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.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; import java.io.Serializable; import java.math.BigDecimal; @@ -82,4 +83,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") private Integer checkResult; + + @Transient + @ApiParam("供应商名称") + private String supplierName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java deleted file mode 100644 index d29da2c..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QcDetailReportModel implements Serializable { - @ApiParam(value = "顾客名称") - private String customerName; - - @ApiParam(value = "供应商名称") - private String supplierName; - - @ApiParam(value = "供应商代码") - private String supplierCode; - - @ApiParam(value = "送货时间") - private String deliveryDate; - - @ApiParam(value = "物料号") - private String partNo; - - @ApiParam(value = "物料描述") - private String partName; - - @ApiParam(value = "生产日期") - private String productDate; - - @ApiParam(value = "送货批次") - private String deliveryLotNo; - - @ApiParam(value = "本批次生产总数") - private String lotNoProdQry; - - @ApiParam(value = "供货数量") - private String supplyQty; - - @ApiParam(value = "检测类型") - private Integer checkType; - - @ApiParam(value = "检验项") - private String checkItem; - - @ApiParam(value = "检验要求") - private String checkStandard; - - @ApiParam(value = "检测值") - private String checkValue; - - @ApiParam(value = "检测结果") - private Integer checkResult; - - @ApiParam(value = "备注") - private String memo; -} 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 4591186..de193d7 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 @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; 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.mes.bean.*; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; @@ -964,6 +963,20 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrderDetail + * @return + */ + public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); + if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part From f302b4d5f1289d89ba9097ec8f38d188ec1515ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 18:14:07 +0800 Subject: [PATCH 23/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 33fb5c9..7af9162 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.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; import java.io.Serializable; /** @@ -52,7 +53,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_GUIDE") @ApiParam("检测指导") - private String supplierCode; + private String checkGuide; @Column(name = "CHECK_FREQUENCY") @ApiParam("频率") @@ -60,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String fixLotNo; + private String isConCession; @Column(name = "STATUS") @ApiParam("状态") @@ -73,4 +74,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; + + @Transient + @ApiParam("本批次生产总数") + private Integer currentLotNoSum; + + @Transient + @ApiParam("收货批次") + private String srcLotNo; } From 7ac98ffbc698c392044eb8536b10aba29fb8d00a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 9 May 2020 19:34:22 +0800 Subject: [PATCH 24/44] =?UTF-8?q?=E3=80=901797=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E5=AE=9A=E5=88=B6=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1-VDA=E6=A0=87=E7=AD=BE=E9=98=B2=E9=94=99=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=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/WmsSnOperateRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 127238a..d80d80b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -85,4 +85,8 @@ public class WmsSnOperateRecord extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String refSN; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + } From 70aeae21d3f256a0f2e94a906777131326d069b5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 May 2020 09:33:50 +0800 Subject: [PATCH 25/44] =?UTF-8?q?8426=20=E4=B8=AD=E8=88=AA-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 118 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 ++- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 43 +++++++- 3 files changed, 169 insertions(+), 6 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 b9bdfe9..4b04dd4 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 @@ -2175,4 +2175,122 @@ public class CommonEnumUtil { return tmp; } } + + + /** + * 业务表：库存条码质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_SN_QC_STATUS { + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); + + private int value; + private String code; + private String description; + + STOCK_SN_QC_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 Integer valueOfDescription(String desc) { + Integer tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static CommonEnumUtil.STOCK_SN_QC_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_SN_STATUS { + CREATE(10, "创建"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"), + INSTOCKED(40, "入库"), + PICKED(50, "配料"), + OUT_STOCK(60, "出库"), + SCRAP(70, "报废"), + COMMING(80, "在途"); + + private int value; + private String description; + + STOCK_SN_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 Integer valueOfDescription(String desc) { + Integer tmp = null; + 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/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 58f5123..bf1994b 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 @@ -12,7 +12,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :物料实体 @@ -265,6 +269,14 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; + + @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否回收", example = "2") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isRecycle; + + 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/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index 32fddf1..515de40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,7 +34,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String whNo; @Column(name = "ZONE_NO") @@ -53,23 +54,23 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "可用数量", example = "0") @ColumnDefault("0") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private Double qty = 0d; @Column(name = "SNP", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "标准包装", example = "1") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private Double snp; @Column(name = "STATUS") @@ -80,4 +81,36 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String currentOrganizeCode; + @Column(name = "SN") + @ApiParam(value = "工装条码") + @AnnoOutputColumn(required = false) + private String sn; + + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer qcStatus; + + /** + * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + */ + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + @ColumnDefault("30") + @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer snStatus; + + @Column(name = "USE_COUNT", nullable = true) + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer useCount; + + @Column(name = "SEQ_NO", nullable = true) + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer seqNo; + } From a748fbd2f73cbf5b68b8a7f41691fab849ff9929 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 May 2020 10:17:29 +0800 Subject: [PATCH 26/44] =?UTF-8?q?8426=20=E4=B8=AD=E8=88=AA-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88?= 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 8d4f97f..bf21ffc 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 @@ -275,7 +275,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否回收", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isRecycle; From 98091426f2e1b2f23da7abccb8c4cfc20eabd783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 11:30:35 +0800 Subject: [PATCH 27/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 7af9162..7cf7251 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -27,8 +27,8 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_ORDER") -@Api("MES_检验单") +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -8961182786786500154L; @Column(name = "ORDER_NO") From 79e90298ef4b161d1d993734eb0468eb16745712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 13:36:47 +0800 Subject: [PATCH 28/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 7cf7251..599196a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -61,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConCession; + private String isConcession; @Column(name = "STATUS") @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 de193d7..992531d 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 @@ -2568,6 +2568,24 @@ public class MesHqlPack { return packBean; } + /** + * 供应商 + * + * @param basVendor + * @param organizeCode + * @return + */ + public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); + if (!StringUtils.isEmpty(basVendor.getVendorNo())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); + } + if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 78ff224fe43b6700c28845065083d2edd3504682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 14:00:26 +0800 Subject: [PATCH 29/44] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ------------------ 1 file changed, 18 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 992531d..de193d7 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 @@ -2568,24 +2568,6 @@ public class MesHqlPack { return packBean; } - /** - * 供应商 - * - * @param basVendor - * @param organizeCode - * @return - */ - public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); - if (!StringUtils.isEmpty(basVendor.getVendorNo())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); - } - if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); - } - return packBean; - } - public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 80e572f07d65cd2af879dad47324919d60539d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 11 May 2020 15:28:24 +0800 Subject: [PATCH 30/44] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BD=93=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 46 ++++++++++++++++++++++ .../wms/repository/WmsThymeleafRepository.java | 16 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 3 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java new file mode 100644 index 0000000..d8b72ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -0,0 +1,46 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : WMS回显模板数据 + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_THYMELEAF") +@Api("WMS回显模板数据") +public class WmsThymeleaf extends BaseBean { + + private static final long serialVersionUID = -5751852067398308165L; + + @Column(name = "TL_CODE") + @ApiParam("模板代码") + private String tlCode; + + @Column(name = "TL_DESC") + @ApiParam("模板描述") + private String tlDesc; + + @Lob + @Column(name = "TL_CONTENT", columnDefinition = "TEXT") + @ApiParam(value = "模板内容") + private String tlContent; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java new file mode 100644 index 0000000..54c1aa5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsThymeleaf; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:17 + * @Modify: + **/ +@Repository +public interface WmsThymeleafRepository 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 663b86c..55dd8fd 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 @@ -3229,4 +3229,17 @@ public class WmsHqlPack { getStringBuilderPack(checkType, result); return result; } + + /** + * 模板信息分页查询条件 + * @param thymeleaf + * @return + */ + public static DdlPackBean packHqlWmsThymeleaf(WmsThymeleaf thymeleaf) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(thymeleaf.getTlCode(), "tlCode", result); + DdlPreparedPack.getStringLikerPack(thymeleaf.getTlDesc(), "tlDesc", result); + getStringBuilderPack(thymeleaf, result); + return result; + } } From 24806b9e2e2f72560e0ca58417321b84e7ea07b6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 11 May 2020 17:38:40 +0800 Subject: [PATCH 31/44] =?UTF-8?q?[oee=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/mes/bean/MesOee.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 2a3b94c..d40e746 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -68,13 +68,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总生产时间") - private String totalRunTime; + private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总停机时间") - private String totalStopTime; + private Double totalStopTime; @Column(name = "TOTAL_QTY") @ApiParam("总生产数") @@ -92,21 +92,21 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)") @ApiParam("时间开动率") - private String timeRate; + private Double timeRate; - @Column(name = "TAKT_RATE") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)") @ApiParam("性能开动率") - private String taktRate; + private Double taktRate; - @Column(name = "QUALIFIED_RATE") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)") @ApiParam("良品率") - private String qualifiedRate; + private Double qualifiedRate; - @Column(name = "OEE") + @Column(name = "OEE", columnDefinition = "decimal(18,3)") @ApiParam("OEE") - private String oee; + private Double oee; @Column(name = "BUSI_DATA") @ApiParam("自定义数据") From eb7511c39e666943832e6e199796f2891da22100 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 11 May 2020 18:14:56 +0800 Subject: [PATCH 32/44] bug:8268;8267;8266;8265 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index aecbbd9..0323dbd 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 @@ -3574,7 +3574,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"), + FIRST_MIDDLE_LAST(40, "首中末件"); private int value; private String description; From eaecf4b4b73c657e4af1061e3d99ff1413f5df6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 23:09:47 +0800 Subject: [PATCH 33/44] pom --- modules/i3plus-pojo-andon/pom.xml | 1 + modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 1 + modules/i3plus-pojo-ics/pom.xml | 2 ++ modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 1 + modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 1 + modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- 13 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..4988f31 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-andon jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..4104107 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-aps jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..9be7e80 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-form jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..53cfea6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-hardswitch jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..5e5ef03 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -11,6 +11,8 @@ 4.0.0 i3plus-pojo-ics + jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..44c0526 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-jobflow jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..122cb94 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-lac jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..c94172f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-platform jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..4dd7471 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-ptl jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..c45f09e 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-report jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..94fb42a 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-sweb jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..cac0256 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-wms jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..af52bb4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-workflow jar - + 1.0-TEST-SNAPSHOT From de9017ca5cb75efd8a45e48ba7d3073a10c8e91c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 23:19:35 +0800 Subject: [PATCH 34/44] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4988f31..4b9154c 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4104107..da2f55a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 9be7e80..c86f822 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 53cfea6..36594a5 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5e5ef03..93dfe19 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 44c0526..6b17e65 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 122cb94..ff17bee 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c94172f..7545af8 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4dd7471..c11bfc9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index c45f09e..f941c0d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 94fb42a..4c7b396 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index cac0256..c6788d4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index af52bb4..5c86a26 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/pom.xml b/pom.xml index fbbe86f..1bef72c 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 From 82af372fc09c0a603e191d313bc51879254ea361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:15:40 +0800 Subject: [PATCH 35/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=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/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 2 files changed, 8 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 373ace1..757594f 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 @@ -2568,7 +2568,8 @@ public class MesEnumUtil { IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "尾检"), + EDELIVERY_CHECK(40, "发货"); private int value; private String description; 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 de193d7..979ec7e 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 @@ -946,6 +946,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); } + if (!StringUtils.isEmpty(qcOrder.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( @@ -973,6 +976,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); } + if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } return packBean; } From 1f5052d679fa2625bffa4103506b44fdddc9e98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:39:48 +0800 Subject: [PATCH 36/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 757594f..c3892e2 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 @@ -2565,17 +2565,19 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - IN_MATERIAL_CHECK(5, "来料检验"), - FIRST_CHECK(10, "首检"), - ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"), - EDELIVERY_CHECK(40, "发货"); + IN_MATERIAL_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + FIRST_CHECK(10, "FIRST_CHECK", "首检"), + ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), + END_CHECK(30, "END_CHECK", "尾检"), + EDELIVERY_CHECK(40, "EDELIVERY_CHECK", "发货"); private int value; + private String code; private String description; - MES_QC_CHECK_TYPE(int value, String description) { + MES_QC_CHECK_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2583,6 +2585,8 @@ public class MesEnumUtil { return value; } + public String getCode() {return code;} + public String getDescription() { return description; } From 1f97be30783045095a0ee607b479b36960007ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 15:15:04 +0800 Subject: [PATCH 37/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=885=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesQcOrderDetailRepository.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/repository/MesQcOrderRepository.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..794d6ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f503196 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderRepository extends BaseRepository { +} From a6e9b90026a867e760be92bd1c657ae7d32d96ad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 May 2020 16:28:19 +0800 Subject: [PATCH 38/44] pom --- modules/i3plus-pojo-andon/pom.xml | 1 - modules/i3plus-pojo-aps/pom.xml | 1 - modules/i3plus-pojo-base/pom.xml | 1 - modules/i3plus-pojo-form/pom.xml | 1 - modules/i3plus-pojo-hardswitch/pom.xml | 1 - modules/i3plus-pojo-ics/pom.xml | 1 - modules/i3plus-pojo-jobflow/pom.xml | 1 - modules/i3plus-pojo-lac/pom.xml | 1 - modules/i3plus-pojo-mes-pcn/pom.xml | 1 - modules/i3plus-pojo-mes/pom.xml | 1 - modules/i3plus-pojo-model/pom.xml | 1 - modules/i3plus-pojo-platform/pom.xml | 1 - modules/i3plus-pojo-ptl/pom.xml | 1 - modules/i3plus-pojo-report/pom.xml | 1 - modules/i3plus-pojo-softswitch/pom.xml | 1 - modules/i3plus-pojo-sweb/pom.xml | 1 - modules/i3plus-pojo-wms/pom.xml | 1 - modules/i3plus-pojo-workflow/pom.xml | 1 - 18 files changed, 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4b9154c..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-andon jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index da2f55a..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-aps jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c86f822..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-form jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 36594a5..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-hardswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 93dfe19..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ics jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6b17e65..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-jobflow jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ff17bee..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-lac jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 7545af8..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-platform jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c11bfc9..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ptl jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index f941c0d..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-report jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 4c7b396..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-sweb jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c6788d4..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-wms jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5c86a26..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-workflow jar - 1.0-DEV-SNAPSHOT From 222ba4f8a4031f42a277e55d32cba4d2497fd82c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 17:49:54 +0800 Subject: [PATCH 39/44] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1825=20plc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7=E5=AD=97?= =?UTF-8?q?=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/mes/bean/MesPlc.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4d2fc73..fc99205 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName; From 0bafa0de52861f4d9c99e9bdc3d604720913c215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 12 May 2020 18:13:08 +0800 Subject: [PATCH 40/44] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java index d8b72ec..fdcf3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -39,6 +39,10 @@ public class WmsThymeleaf extends BaseBean { @ApiParam("模板描述") private String tlDesc; + @Column(name = "PROMPT_MSG") + @ApiParam("引导消息") + private String promptMsg; + @Lob @Column(name = "TL_CONTENT", columnDefinition = "TEXT") @ApiParam(value = "模板内容") From de9c901a3b2b0bf5d652caf6a29fefee36730378 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 18:19:20 +0800 Subject: [PATCH 41/44] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1826=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 60 ++++++++++++++++++++++ .../repository/MesPartStockScheduleRepository.java | 15 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java new file mode 100644 index 0000000..2d24638 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_STOCK_SCHEDULE") +@Api("MES_库存排程配置") +public class MesPartStockSchedule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8265586624645977526L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "MIN_CAPACITY") + @ApiParam("最小库存") + private Integer minCapacity; + + @Column(name = "TOTAL_CAPACITY") + @ApiParam("总容量") + private Integer totalCapacity; + + @Column(name = "STANDARD_CAPACITY") + @ApiParam("标准值") + private Integer standardCapacity; + + @Column(name = "SCHEDULE_CAPACITY") + @ApiParam("待生产箱数") + private Integer scheduleCapacity; + + @Column(name = "PLAN_QTY") + @ApiParam("产品JSP个数") + private Integer planQty; + + @Column(name = "TOTAL_PLAN_QTY") + @ApiParam("JSP总数") + private Integer totalPlanQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java new file mode 100644 index 0000000..fc15bd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartStockSchedule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:57 下午 + * @Modify: + */ +@Repository +public interface MesPartStockScheduleRepository extends BaseRepository { +} From 24ea607718ec878526be7913ba481fe2a81af44b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 12 May 2020 19:01:13 +0800 Subject: [PATCH 42/44] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 29 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 12 +++++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 12 +++++++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 +++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 417c5f1..57c8ee6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -73,6 +73,35 @@ public class PrintOrderDataModel implements Serializable { @Transient public String containerNo; + @ApiParam("道口") + @Transient + public String dock; + + @ApiParam("泊位") + @Transient + public String zdoc; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + public String createDateTime; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 7ccc46c..0600820 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -115,10 +119,14 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + @Transient @ApiParam("供应商电话") private String vendorCall; 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 681ae56..e18d087 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 @@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -159,10 +163,14 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } 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 55dd8fd..ad85d11 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 @@ -279,6 +279,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -693,6 +699,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsASNMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(), + wmsASNMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsASNMaster, result); return result; From 8d386caa71967d9d72a0ae547354d3c977e411c0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 09:36:33 +0800 Subject: [PATCH 43/44] =?UTF-8?q?1776=20=E5=B7=A5=E8=A3=85=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96-=E6=96=B0=E5=A2=9E=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E4=B8=8E=E5=BA=93=E4=BD=8D=E5=8C=B9=E9=85=8D=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 11 +++++++++++ 1 file changed, 11 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 a0d1272..2987077 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 @@ -212,6 +212,17 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer useCount; + + @Column(name = "SEQ_NO") + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer seqNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 00df3134b20e8fa2442bfabdb5d309a206f4ebaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 13 May 2020 11:11:53 +0800 Subject: [PATCH 44/44] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901829?= =?UTF-8?q?=E3=80=91-=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=A3=80=E6=B5=8B=E5=8D=95=E6=98=8E=E7=BB=86=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 11 +++++++---- .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 19 +++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index dcc8eed..59f5e0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; @@ -52,6 +51,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("数量") private BigDecimal qty; + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private BigDecimal finishQty; + @Column(name = "UNIT") @ApiParam("单位") private String unit; @@ -84,7 +87,7 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("检测整体结果") private Integer checkResult; - @Transient - @ApiParam("供应商名称") - private String supplierName; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 599196a..3816286 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -63,23 +62,19 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private String isConcession; - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - @Column(name = "CHECK_RESULT") - @ApiParam("检测整体结果") + @ApiParam("检测结果") private Integer checkResult; @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; - @Transient - @ApiParam("本批次生产总数") - private Integer currentLotNoSum; + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo; - @Transient - @ApiParam("收货批次") - private String srcLotNo; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; }