From 7945213f6e93774be97299392c44fc07b0697eb8 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sat, 24 Jul 2021 19:53:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?19048=20--=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=80=89=E6=8B=A9ERP=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E3=80=91=E5=AD=97=E6=AE=B5=20--20210710?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a65a085..41c8480 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -826,4 +826,10 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; } + + public WmsDocMovementDetails (String erpSrcNo,String partNo,Double outQty) { + this.erpSrcNo = erpSrcNo; + this.partNo = partNo; + this.outQty = outQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index aed8e5f..006abbd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -249,6 +249,10 @@ public class WmsPOMasterDetails extends BaseBean { private Double sumRcQty; @Transient + @ApiParam("退货数量") + private Double outQty; + + @Transient @ApiParam("单据集合") private List orderNoLst; From add0708fb28a90815b9569caef74740749820f29 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 26 Jul 2021 16:07:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=903617=20=E6=94=B6=E8=B4=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93-=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 6060bdd..56c453d 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 @@ -1025,11 +1025,22 @@ public class WmsStockSn extends BaseBean { this.vendorNo = vendorNo; } - - - public WmsStockSn(String partNo, Double qty) { this.partNo = partNo; this.qty = qty; } + + public WmsStockSn(WmsStockSn wmsStockSn, String modifyDatetime ,String modifyUser) { + this.sn = wmsStockSn.getSn(); + this.partNo = wmsStockSn.getPartNo(); + this.partNameRdd = wmsStockSn.getPartNameRdd(); + this.qty = wmsStockSn.getQty(); + this.vendorNo = wmsStockSn.getVendorNo(); + this.lotNo = wmsStockSn.getLotNo(); + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.leftCode = wmsStockSn.getLeftCode(); + this.dateCode = wmsStockSn.getDateCode(); + this.fixLotNo = wmsStockSn.getFixLotNo(); + } }