From fc79b1b0f3d8401fc664020e36e3151cb1503884 Mon Sep 17 00:00:00 2001 From: lpx Date: Thu, 7 Nov 2019 10:09:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91=E3=80=90308=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-4.2=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=90?= =?UTF-8?q?1132=E6=89=AB=E6=8F=8F=E6=9F=A5=E8=AF=A2-4.2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 ed412ca..b57b7bc 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 @@ -806,7 +806,10 @@ public class WmsEnumUtil { VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), - VDA_SN_("VDA_SN_MERGE", "VDA条码合并"); + VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), + VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), + VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"); + private String value; private String description; From fc49ddeea586a7430b057e688dabfeca347d1342 Mon Sep 17 00:00:00 2001 From: lpx Date: Thu, 7 Nov 2019 15:00:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BA=8B=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91=E3=80=90326EU=E4=BA=8B=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E5=8A=A1=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=901157=C2=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index de05dbf..d5a5fe5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -224,7 +224,6 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -233,6 +232,16 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } + public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) { + this.partNo = partNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.busiTypeCode = busiTypeCode; + this.qty = qty; + } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,