From 868be93389ab1b358749174c03c202312827e97b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 14 Mar 2019 14:25:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB=E8=A1=A8=E7=9A=84CUSTOMER?= =?UTF-8?q?=5FNO=E4=BF=AE=E6=94=B9=E6=88=90=E4=BA=86CUST=5FNO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 11 ----------- .../estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 16 ++-------------- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++-- .../estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 6 files changed, 13 insertions(+), 36 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 2e4c55f..179c7b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -34,18 +34,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("订单号") public String orderNo; - /** - * 单据类型:REG=原物料采购, - * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 - */ @Column(name = "ASN_TYPE") @ApiParam("单据类型") public String asnType; - /** - * 状态:1=新建,10=收货中,20=收货完成, - * 30=入库中,40=入库完成,90=已关闭,91=已取消 - */ @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; @@ -74,7 +66,4 @@ public class WmsASNMaster extends BaseBean { @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; - @Transient - @ApiParam(value = "单据明细集合") - public List wmsASNMasterDetailsList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index ff1b98b..640d69e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -56,11 +56,11 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("PO行号") public String poItem; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") public String planTime; @@ -110,16 +110,4 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam(value = "已收数量", example = "0") public Double recQty; - @Override - public String toString() { - return "WmsASNMasterDetails{" + - "recQty=" + recQty + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", item=" + item + - ", qty=" + qty + - ", unit='" + unit + '\'' + - ", orderNo='" + orderNo + '\'' + - '}'; - } } 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 ec2dbfd..68a1b12 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 @@ -55,9 +55,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam(value = "客户编号") - private String customerNo; + private String custNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") 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 6e62522..f65e744 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 @@ -67,13 +67,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; @Column(name = "ERP_WH_NO") @ApiParam("默认收货库存地") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 9663b9f..8c1eae2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -52,9 +52,9 @@ public class WmsQCMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") - public String customerNo; + public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") 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 2bfbed9..9d209d1 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 @@ -58,8 +58,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -116,7 +116,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result); getStringBuilderPack(wmsDocMovementMaster, result); From 87a033a427624de5552c68349d3a6d7f77babecb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 14 Mar 2019 14:30:56 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E4=BB=8EzDate,zTime=E6=94=B9=E6=88=90planDate,planTime,?= =?UTF-8?q?=E5=90=A6=E5=88=99HQL=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 2568b63..ff54102 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 @@ -79,13 +79,13 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "条码打印数量", example = "1") private Double printQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam(value = "计划日期") - private String zdate; + private String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") - private String ztime; + private String planTime; @Column(name = "SRC_NO") @ApiParam(value = "源单号") From c4a9a4ac1e9fb9777952ba8b1a7e37b08a5033f8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 15 Mar 2019 14:01:27 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3id=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java index 865e00d..6a7d958 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java @@ -35,9 +35,9 @@ public class SnowflakeIdMaker { private long twepoch = 1288834974657L; - private long workerIdBits = 10L; + private long workerIdBits = 5L; private long datacenterIdBits = 5L; - private long maxWorkerId = -1L ^ (-1L << workerIdBits); //1023 + private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30 private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); //30 private long sequenceBits = 12L; From 114816d4830849d77aa890aa84761a81f9ab4723 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 15 Mar 2019 17:50:40 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ---------------------- 1 file changed, 34 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 ca1763a..a5b6f20 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 @@ -958,40 +958,6 @@ public class WmsEnumUtil { } /** - * 库存条码表条码质量状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_QUALITY_STATUS { - NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); - - private int value; - private String description; - - SN_QUALITY_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * 业务表：库存条码状态 * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ From 972d2b04a7611d1a3e4f32fc99638bf9c49cdc1b Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 15 Mar 2019 18:56:16 +0800 Subject: [PATCH 05/10] =?UTF-8?q?wmshpak=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 ef9999f..4424e51 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 @@ -802,6 +802,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); @@ -1408,9 +1409,6 @@ public class WmsHqlPack { */ public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { StringBuffer result = new StringBuffer(); - if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){ - HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result); - } if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); } From e7fa2f3abf5fe3840b9503637b9eca3898c3f902 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 15 Mar 2019 19:52:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?NC,=E7=9B=98=E7=82=B9=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 31 ++++++++++++++++++++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 30 insertions(+), 2 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 9571e6f..b2c4f53 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 @@ -962,13 +962,15 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SN_QUALITY_STATUS { - NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"); private int value; + private String code; private String description; - SN_QUALITY_STATUS(int value, String description) { + SN_QUALITY_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -980,6 +982,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -989,6 +995,26 @@ public class WmsEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SN_QUALITY_STATUS codeOf(Integer value) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** @@ -1087,6 +1113,7 @@ public class WmsEnumUtil { } return tmp; } + } /** 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 9d209d1..4f5ae6b 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 @@ -872,6 +872,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); getStringBuilderPack(wmsMoveMaster, result); From a4301ce4b280a546d5753101daf1250d3d7de712 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 15 Mar 2019 20:06:17 +0800 Subject: [PATCH 07/10] redis.pusHashMap --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 33 ---------------------- 1 file changed, 33 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 ad9d8ef..cab6f23 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 @@ -957,39 +957,6 @@ public class WmsEnumUtil { } } - /** - * 库存条码表条码质量状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_QUALITY_STATUS { - NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); - - private int value; - private String description; - - SN_QUALITY_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } /** * 业务表：库存条码状态 From 20cea81ea2a5456d06a968216beb8e26e1543851 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Sat, 16 Mar 2019 15:47:09 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=96=B0=E5=BB=BA=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 39 ++++++++++++++++++++++ 1 file changed, 39 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 cab6f23..f6da59e 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 @@ -957,6 +957,45 @@ public class WmsEnumUtil { } } + /** + * ASN单据状态 10=新建,20=收货中,30=收货完成，40=已关闭,50=已取消 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASN_STATUS { + + CREATE(10, "新建"), + RECEIPT(20, "收货中"), + RECEIPT_FINISH(30, "收货完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); + + private int value; + private String description; + + ASN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * 业务表：库存条码状态 From 5951d7fad868b3626d7e42429ed312bfb8dabf2a Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Sat, 16 Mar 2019 17:25:24 +0800 Subject: [PATCH 09/10] =?UTF-8?q?schedule=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E6=95=B4=EF=BC=8Cfallback=E7=86=94=E6=96=AD?= =?UTF-8?q?=E6=9C=BA=E5=88=B6=E6=94=B9=E4=B8=BAfactory=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseFallBackBean.java | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java index 6c0fae6..870b7f7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.base.bean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @Description : 基础fallback类，用于处理熔断 * @Reference : @@ -8,9 +11,27 @@ package cn.estsh.i3plus.pojo.base.bean; * @Modify: **/ public class BaseFallBackBean { + private static final Logger LOGGER = LoggerFactory.getLogger(BaseFallBackBean.class); + +// LOGGER.error("【微服出错，熔断】{}",cause.getMessage()); +// LOGGER.error("【微服出错，熔断】{}",cause.getLocalizedMessage()); +// LOGGER.error("【微服出错，熔断】{}",cause.getCause()); +// cause.printStackTrace(); + + public BaseResultBean makeBaseFallBack(Throwable cause){ + LOGGER.error("【熔断信息】{}",cause.getMessage()); + LOGGER.error("【熔断原因】{}",cause.getCause()); + return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause); + } + + public BaseResultBean makeBaseFallBack(String msg,Throwable cause){ + LOGGER.error("【熔断信息】{}",cause.getMessage()); + LOGGER.error("【熔断原因】{}",cause.getCause()); + return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg); + } public BaseResultBean makeBaseFallBack(){ - return makeBaseFallBack("服务暂停"); + return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。"); } public BaseResultBean makeBaseFallBack(String msg){ From 61cfb47e5d332f07fc660c3e21e374ef5038803c Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 09:18:31 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 6e62522..f65e744 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 @@ -67,13 +67,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; @Column(name = "ERP_WH_NO") @ApiParam("默认收货库存地") 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 ef9999f..6b0c494 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 @@ -58,8 +58,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result);