From 3a7d7a79248e646326239ebfdc4e9a4287a17202 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Mar 2020 18:36:08 +0800 Subject: [PATCH] =?UTF-8?q?bug7754=E3=80=907754=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8E=A5=E6=94=B6=E5=AF=B9=E6=96=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9C=A8=E6=88=91=E4=BB=AC=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=8A=A5=E5=B7=A5=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E6=8E=A5=E6=94=B6=E5=88=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E8=87=AA=E5=8A=A8=E5=AF=B9=E8=AF=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BF=9B=E8=A1=8C=E6=8A=A5=E5=B7=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=B8=AD=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E4=BA=86=E6=9D=A1=E7=A0=81=EF=BC=8C=E9=9B=B6=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 5 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++ 4 files changed, 72 insertions(+) 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 44f3039..d7b4c19 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 @@ -139,6 +139,15 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } @@ -2977,6 +2986,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } /** @@ -5150,4 +5169,45 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(int value,String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file 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 74d1911..b807a04 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 @@ -170,6 +170,10 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description") private Integer isSingleStep; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; 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 741493d..2833b2f 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 @@ -183,6 +183,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; 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 793e485..68b8086 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 @@ -1908,6 +1908,9 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } + if (wmsTransModule.getId() != null) { + DdlPreparedPack.getNumEqualPack(wmsTransModule.getId(), "id", packBean); + } if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { packBean.setOrderByStr(wmsTransModule.orderBy()); }