From 27ba751a0977ff0b173b17a8890293793d6280e5 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 1 Jul 2019 13:39:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9iqc=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=BB=98=E8=AE=A4=E5=80=BC?= 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 | 3 +++ 1 file changed, 3 insertions(+) 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 812efaa..f18b307 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 @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import net.bytebuddy.implementation.bind.annotation.Default; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -88,6 +90,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "标准包装", example = "1") private Double snp; + @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "收货检验否", example = "1") private Integer iqc; From 19b57647769bc8247d2d6e7ffd6c1ea3110f7b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 1 Jul 2019 16:29:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=20=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=20=E5=87=BA=E5=BA=93=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 12 ++++++++++++ 3 files changed, 36 insertions(+) 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 78d6fdc..9046594 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 @@ -64,6 +64,18 @@ public class BasVendor extends BaseBean{ @ApiParam(value = "密码") private String password; + @Column(name = "VENDOR_CALL") + @ApiParam("供应商电话") + private String vendorCall; + + @Column(name = "VENDOR_FAX") + @ApiParam("传真") + private String vendorFax; + + @Column(name = "VENDOR_PHONE") + @ApiParam("手机") + private String vendorPhone; + public BasVendor() { } 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 0f739c8..b3feab4 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 @@ -109,4 +109,16 @@ public class WmsASNMaster extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") public String remark; + + @Transient + @ApiParam("供应商电话") + private String vendorCall; + + @Transient + @ApiParam("传真") + private String vendorFax; + + @Transient + @ApiParam("手机") + private String vendorPhone; } 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 c400de9..3ba7285 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 @@ -119,4 +119,16 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("邮箱") private String vendorEmail; + + @Transient + @ApiParam("供应商电话") + private String vendorCall; + + @Transient + @ApiParam("传真") + private String vendorFax; + + @Transient + @ApiParam("手机") + private String vendorPhone; } From fede09a5ebdd8492546bb3bbe9a18264661e07a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 1 Jul 2019 17:01:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?WMS=5FERP=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E8=A1=A8=E4=BF=AE=E6=94=B9item=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 5b44eb5..d65afe3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -64,8 +64,8 @@ public class WmsMoveToERP extends BaseBean { private String carNo; @Column(name="ITEM") - @ApiParam(value = "行号", example = "0") - public Integer item; + @ApiParam(value = "行号") + public String item; @Column(name="PART_NO") @ApiParam("物料编码") From 1ee48f4ef8854394ec327bb07e9a28ab7d0cc670 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Mon, 1 Jul 2019 17:29:14 +0800 Subject: [PATCH 4/4] xxx --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index efee74e..f1c64dd 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 @@ -247,7 +247,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result);