From e8274624268191560a9eab0dbe933429417ced06 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 26 Nov 2019 15:21:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 4 ++++ 2 files changed, 7 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 591b77b..5703187 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 @@ -147,6 +147,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + @Column(name = "LOT_NO") + @ApiParam("批次") + public String lotNo; @Transient @ApiParam("实际批次") private String actualLot; 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 3d90a3d..042c111 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 @@ -42,6 +42,10 @@ public class WmsVendorPart extends BaseBean { @ApiParam(value = "供应商物料号") private String vendorPartNo; + @Column(name = "MAX_AMOUNT") + @ApiParam(value = "供应商月提供最大数量") + private Double maxAmount; + @Transient @ApiParam("物料名称") private String partName; From d0e6d30a9ebaf7083bfc89a46c95e17a30178607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 26 Nov 2019 15:54:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#6639=20=E3=80=90VDA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99-FIFO=E8=B7=B3=E8=BF=87-=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 4 ---- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 2 files changed, 4 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 6af3b68..c9a988d 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 @@ -69,10 +69,6 @@ public class PrintOrderDataModel implements Serializable { @Transient public String vendorEmail; - @ApiParam(value = "标题") - @Transient - public String title; - 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/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 8ea05e4..fc098a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -175,6 +175,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; + @ApiParam(value = "标题") + @Transient + public String title; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; }