From e95db40c236110934e7b843560b32e1787a50dec Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Tue, 2 Jul 2019 17:35:32 +0800 Subject: [PATCH 1/3] 123 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9bba3de..cece287 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 @@ -2505,7 +2505,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); private int value; private String description; From 81ed2465e3c9ca9a13c52d51d54f48691b38c77b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jul 2019 17:35:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 5427a91..efc024e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("源仓库编号") public String srcWhNo; + @Column + @ApiParam("是否范围内") + public Integer isScope; + public WmsCSFactTrans(){} + public Integer getIsScopeVal() { + return isScope== null ? 0 : this.isScope.intValue(); + } + public WmsCSFactTrans(Double factQty, String partNo){ if(factQty == null) { this.factQty = 0d; @@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean { } this.partNo = partNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + } } From 994da92b4e197feae41724b5eded4b154845e2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 2 Jul 2019 18:51:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=86=BB=E7=BB=93=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=9BstockQuan=E6=B7=BB=E5=8A=A0getVal?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 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 9bba3de..5355046 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 @@ -1082,7 +1082,8 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"); + HANDLE_ERROR(40, "处理出错"), + TEST(50, "调试"); private int value; private String description; @@ -2693,7 +2694,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP","AMP系统"); + AMP("AMP", "AMP系统"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 73a9619..0c5cb4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -122,39 +122,39 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - public Double getQty() { + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } - public Double getFailQty() { + public Double getFailQtyVal() { return this.failQty == null ? 0 : this.failQty; } - public Double getHoldQty() { + public Double getHoldQtyVal() { return this.holdQty == null ? 0 : this.holdQty; } - public Double getQcQty() { + public Double getQcQtyVal() { return this.qcQty == null ? 0 : this.qcQty; } - public Double getRinQty() { + public Double getRinQtyVal() { return this.rinQty == null ? 0 : this.rinQty; } - public Double getFreezeQty() { + public Double getFreezeQtyVal() { return this.freezeQty == null ? 0 : this.freezeQty; } - public Double getConsignQty() { + public Double getConsignQtyVal() { return this.consignQty == null ? 0 : this.consignQty; } - public Double getLockQty() { + public Double getLockQtyVal() { return this.lockQty == null ? 0 : this.lockQty; } - public Double getScrapQty() { + public Double getScrapQtyVal() { return this.scrapQty == null ? 0 : this.scrapQty; }