From 868be93389ab1b358749174c03c202312827e97b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 14 Mar 2019 14:25:59 +0800 Subject: [PATCH 01/20] =?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/20] =?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/20] =?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/20] =?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/20] =?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/20] =?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/20] 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/20] =?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/20] =?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/20] =?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); From a495ea2fceba5e32e18d0d0d837de9e11b89b68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 18 Mar 2019 09:34:32 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 80aec01..1d4c7f5 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 @@ -1353,7 +1353,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { CREATE(10, "新建"), - FINISH(20, "待处理"), + FINISH(20, "处理中"), FAIL(30, "已完成"), CLOSE(40, "已关闭"), CANCEL(50, "已取消"); From 11bbe2a57d084c1fc361f10f6169eec45b8022d1 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 13:13:17 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index ce8cd86..1730e20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -69,6 +69,12 @@ public class WmsActionResponseBean { public Boolean isBtnDisabled = true; /** + * 默认为true，如果这个值为true就禁用按钮否则可用， + */ + @ApiParam(value = "按钮是否禁用") + public Boolean isDetailsBtnDisabled = true; + + /** * 与 toSelected 属性配合使用， * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ From 630c6e8f66cba493dade236bdafad6ab2870c8c5 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Mon, 18 Mar 2019 15:52:33 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=81?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsTaskCreateLog.java | 86 ++++++++++++++++++++++ .../wms/repository/WmsTaskCreateLogRepository.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 33 +++++++++ 3 files changed, 133 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java new file mode 100644 index 0000000..695e9ad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description : 作业任务生成日志 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-18 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TASK_CREATE_LOG") +@Api("作业任务生成日志表") +public class WmsTaskCreateLog extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务单号") + public String taskNo; + + @Column(name = "DATA_SRC") + @ApiParam("数据来源") + public String dataSrc; + + @Column(name = "OP_TYPE_CODE") + @ApiParam("作业类型") + public String opTypeCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public Integer transStatus; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单号") + private String refSrc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name = "CALL_FUN") + @ApiParam("实现类") + public String callFun; + + @Column(name = "START_TIME") + @ApiParam("开始执行时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + public Date startTime; + + @Column(name = "END_TIME") + @ApiParam("结束执行时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + public Date endTime; + + @Column(name = "IN_PARAMS") + @ApiParam(value = "输入参数") + private String inParams; + + @Column(name = "OUT_PARAMS") + @ApiParam(value = "输出参数") + private String outParams; + + @Column(name = "OUT_RESULT") + @ApiParam(value = "执行结果") + private String outResult; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java new file mode 100644 index 0000000..aff25b2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskCreateLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog; + +/** + * @Description : 作业任务生成日志 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-18 15:58 + * @Modify: + **/ +public interface WmsTaskCreateLogRepository extends BaseRepository { +} 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 72983b8..c725160 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 @@ -1434,4 +1434,37 @@ public class WmsHqlPack { getStringBuilderPack(taskDetails, result); return result.toString(); } + + /** + * 根据条件查询任务生成日志 + * @param wmsTaskCreateLog + * @return + */ + public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); + HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); + getStringBuilderPack(wmsTaskCreateLog, result); + return result.toString(); + } + + /** + * 根据条件查询作业处理组件 + * @param wmsTransModule + * @return + */ + public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { + StringBuffer result = new StringBuffer(); + if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){ + HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + } + if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){ + HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + } + if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){ + HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + } + getStringBuilderPack(wmsTransModule, result); + return result.toString(); + } } From 05efe333ccd878d7b053b2d101bcf93151183a53 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 16:23:41 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/LabelTemplateModel.java | 22 +++++++++ .../pojo/platform/bean/SysLabelTemplate.java | 48 +++++++++++++++++++ .../pojo/platform/bean/SysLabelTemplateParam.java | 55 ++++++++++++++++++++++ .../SysLabelTemplateParamRepository.java | 14 ++++++ .../repository/SysLabelTemplateRepository.java | 14 ++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 ++++++++++++++ 6 files changed, 189 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java new file mode 100644 index 0000000..0759bd3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 打印模板封装model + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 13:52 + * @Modify: + **/ +@Data +public class LabelTemplateModel { + + private SysLabelTemplate labelTemplate; + + private List templateParamList; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java new file mode 100644 index 0000000..8a8428d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LABELTEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class SysLabelTemplate extends BaseBean { + + @Column(name="TEMPLATECODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATENAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java new file mode 100644 index 0000000..505b65d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LABELTEMPLATEPARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class SysLabelTemplateParam extends BaseBean { + + @Column(name="TEMPLATEID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATECODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATEPARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java new file mode 100644 index 0000000..901ea87 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 12:03:01.024 + * @Modify : + **/ +public interface SysLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java new file mode 100644 index 0000000..77fc673 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 12:03:01.024 + * @Modify : + **/ +public interface SysLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index dd792df..1cb1348 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -665,4 +665,40 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 打印模板复杂查询 + * @param sysLabelTemplate + * @return + */ + public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result); + HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result); + + // 添加默认排序 + HqlPack.getOrderDefault(sysLabelTemplate); + + return result.toString(); + } + + /** + * 打印模板参数复杂查询 + * @param sysLabelTemplateParam + * @return + */ + public static String packHqlSysLabelTemplateParams(SysLabelTemplateParam sysLabelTemplateParam) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result); + HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result); + + // 添加默认排序 + HqlPack.getOrderDefault(sysLabelTemplateParam); + + return result.toString(); + } } \ No newline at end of file From fd6552b4ac9c183486be090ead1d4dac12e33ad3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 18 Mar 2019 18:46:44 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 238 +++++++++++++-------- .../estsh/i3plus/pojo/platform/bean/SysTool.java | 9 +- 2 files changed, 153 insertions(+), 94 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 3b6f931..5509994 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -261,10 +261,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - return entityManager.createQuery("from " + persistentClass.getName()) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); + if(pager.getTotalRows() > 0) { + return entityManager.createQuery("from " + persistentClass.getName()) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -474,41 +478,49 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; - return entityManager.createQuery(queryString) - .setParameter(propertyName, value) - .getResultList(); + if(pager.getTotalRows() > 0){ + String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; + return entityManager.createQuery(queryString) + .setParameter(propertyName, value) + .getResultList(); + }else{ + return new ArrayList(); + } } @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if(propertyNames.length != values.length){ - throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); - } - StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model "); + if(pager.getTotalRows() > 0){ + if(propertyNames.length != values.length){ + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model "); - int size = propertyNames.length; - if (size > 0) { - queryString.append("where 1=1 "); - } + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } - for (int i = 0; i < size; i++) { - if(values[i] != null) { - queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + for (int i = 0; i < size; i++) { + if(values[i] != null) { + queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + } } - } - if(orderByStuff != null && orderByStuff.length() > 0){ - queryString.append(orderByStuff); - } + if(orderByStuff != null && orderByStuff.length() > 0){ + queryString.append(orderByStuff); + } - Query queryObject = entityManager.createQuery(queryString.toString()); - for (int i = 0; i < size; i++) { - queryObject.setParameter(propertyNames[i], values[i]); - } + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + queryObject.setParameter(propertyNames[i], values[i]); + } - return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -594,47 +606,55 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if(propertyNames.length != values.length){ - throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); - } - StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); + if(pager.getTotalRows() > 0){ + if(propertyNames.length != values.length){ + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); - if (hqlWhere != null && hqlWhere.length() > 0) { - queryString.append(hqlWhere); - } + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } - int size = propertyNames.length; - for (int i = 0; i < size; i++) { - if(values[i] != null) { - queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if(values[i] != null) { + queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + } } - } - queryString.append(" " + orderByStuff); + queryString.append(" " + orderByStuff); - Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); - for (int i = 0; i < size; i++) { - if(values[i] != null) { - queryObject.setParameter(propertyNames[i], values[i]); + Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); + for (int i = 0; i < size; i++) { + if(values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } } - } - return queryObject.getResultList(); + return queryObject.getResultList(); + }else{ + return new ArrayList(); + } } @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); + if(pager.getTotalRows() > 0) { + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); - if (hqlWhere != null && hqlWhere.length() > 0) { - queryString.append(hqlWhere); - } + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } - return entityManager.createQuery(queryString.toString()) + return entityManager.createQuery(queryString.toString()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -680,31 +700,39 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hqlWhere, Pager pager) { - StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); + if(pager.getTotalRows() > 0){ + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); - if (hqlWhere != null && hqlWhere.length() > 0) { - queryString.append(hqlWhere); - } + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } - return entityManager.createQuery(queryString.toString()) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); + return entityManager.createQuery(queryString.toString()) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } } @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - Query queryObject = entityManager.createQuery(hql); - for(int i=0;i 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(paramName[i], paramValue[i].toString()); + } } - } - return queryObject.setFirstResult(pager.getStartRow()) + return queryObject.setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -719,18 +747,26 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Pager pager) { - return entityManager.createNativeQuery(sql) + if(pager.getTotalRows() > 0) { + return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) .getResultList(); + }else{ + return new ArrayList(); + } } @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - return entityManager.createNativeQuery(sql,entity) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); + if(pager.getTotalRows() > 0){ + return entityManager.createNativeQuery(sql,entity) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -793,17 +829,21 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - StringBuffer queryString = new StringBuffer(); + if(pager.getTotalRows() > 0) { + StringBuffer queryString = new StringBuffer(); - queryString.append(hql + " as model where 1=1 "); + queryString.append(hql + " as model where 1=1 "); - if (hqlWhere != null && hqlWhere.length() > 0) { - queryString.append(hqlWhere); - } + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } - queryString.append(" " + orderByStuff); + queryString.append(" " + orderByStuff); - return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -825,19 +865,27 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + if(pager.getTotalRows() > 0){ + return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + }else{ + return new ArrayList(); + } } @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - Query queryObject = entityManager.createQuery(hql); - for(int i=0;i 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(paramName[i], paramValue[i].toString()); + } } - } - return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + }else{ + return new ArrayList(); + } } @Override @@ -847,10 +895,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - return entityManager.createNativeQuery(sql) - .setFirstResult(pager.getStartRow()) - .setMaxResults(pager.getPageSize()) - .getResultList(); + if(pager.getTotalRows() > 0){ + return entityManager.createNativeQuery(sql) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + }else{ + return new ArrayList(); + } } /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java index 92badd8..2a03f16 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,13 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_TOOL") +@Table(name="SYS_TOOL",indexes = + { + @Index(name="sys_tool_tool_type_idx",columnList = "tool_type_id"), + @Index(name="sys_tool_tool_status_idx",columnList = "TOOL_STATUS"), + @Index(name="sys_tool_tool_conn_type_idx",columnList = "TOOL_CONN_TYPE"), + @Index(name="sys_tool_tool_data_type_idx",columnList = "TOOL_DATA_TYPE") + }) @Api(value="硬件设备表",description = "硬件设备表") public class SysTool extends BaseBean { From 4055e6fa768fde70005783d57a5f4287b2a1b9c2 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Mar 2019 19:53:28 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index faa65b3..e7222a2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -38,6 +39,11 @@ public class SysDictionary extends BaseBean { @ApiParam(value ="字典代码") private String dictionaryCode; + //枚举 CommonEnumUtil.SOFT_TYPE + @Column(name="SOFT_TYPE") + @ApiParam(value ="微服务软件类型") + private Integer softType; + // 根节点-1 @Column(name="PARENT_ID") @ApiParam(value ="父节点" , example = "-1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index dd792df..89919a8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -406,9 +406,10 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); + HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); - HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); @@ -426,9 +427,10 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); - HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index a7a82de..24db11e 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -49,8 +49,6 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="排序") private Integer rowSort; - private Integer rowSeq; - @Column(name="ROW_STYLE",columnDefinition = "TEXT") @ApiParam(value ="行样式") private String rowStyle; From b883f7de2d85f1aaefe24c8f7c7232bb96d6f17f Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 18 Mar 2019 20:20:11 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 3 +++ 1 file changed, 3 insertions(+) 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 f11f782..99f3f47 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 @@ -97,4 +97,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; + + @Transient + private List movementDetailsList; } From c4ef1e66f348c5cfb62c10df4d5839fb71860d60 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 21:08:08 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 +++++++++++++++++ .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 45 ++++++++++++++++++++++ .../pojo/platform/bean/SysLabelTemplate.java | 8 ++-- .../pojo/platform/bean/SysLabelTemplateParam.java | 10 ++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++- 5 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java 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 4aff7bf..7f1c3a8 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 @@ -1584,6 +1584,42 @@ public class WmsEnumUtil { } /** + * 打印单号数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_ORDER_TYPE { + PO(10, "PO"), + MOVEMENT(20, "MOVEMENT"), + ASN(30, "ASN"); + + private int value; + private String description; + + PRINT_ORDER_TYPE(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; + } + } + + /** * 组件统一返回提示 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 new file mode 100644 index 0000000..7389c5e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 订单打印数据封装model + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:50 + * @Modify: + **/ +@Data +public class PrintOrderDataModel { + + @ApiParam(value = "工厂代码") + public String organizeCode; + + @ApiParam(value = "单号") + public String orderNo; + + @ApiParam(value = "业务类型", example = "-1") + public Integer busiType; + + @ApiParam(value = "状态", example = "-1") + public Integer status; + + @ApiParam(value = "打印标志", example = "-1") + public Integer printFlag; + + @ApiParam(value = "供应商编号") + public String vendorNo; + + @ApiParam(value = "客户编号") + public String custNo; + + @ApiParam(value = "版本") + public String version; + + @ApiParam(value = "ERP单号") + public String erpSrcNo; + + @ApiParam(value = "业务数据类型", example = "-1") + public Integer busiDataType; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 8a8428d..7759328 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -25,19 +25,19 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LABELTEMPLATE") +@Table(name="SYS_LABEL_TEMPLATE") @Api(value="打印模板",description = "打印模板") public class SysLabelTemplate extends BaseBean { - @Column(name="TEMPLATECODE") + @Column(name="TEMPLATE_CODE") @ApiParam(value ="模板代码") private String templateCode; - @Column(name="TEMPLATENAME") + @Column(name="TEMPLATE_NAME") @ApiParam(value ="模板名称") private String templateName; - @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT") + @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT") @ApiParam(value ="模板内容") private String templateContent; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 505b65d..6b39045 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -27,24 +27,24 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LABELTEMPLATEPARAM") +@Table(name="SYS_LABEL_TEMPLATE_PARAM") @Api(value="打印模板参数",description = "打印模板参数") public class SysLabelTemplateParam extends BaseBean { - @Column(name="TEMPLATEID") + @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="TEMPLATECODE") + @Column(name="TEMPLATE_CODE") @ApiParam(value ="模板代码") private String templateCode; - @Column(name="TEMPLATEPARAM") + @Column(name="TEMPLATE_PARAM") @ApiParam(value ="模板参数") private String templateParam; - @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT") + @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT") @ApiParam(value ="模板参数描述") private String templateParamText; 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 c725160..2cc7367 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 @@ -782,7 +782,11 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - + HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); From bbfd340fd0e2f722aa9163dab6463787b2acfa5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 18 Mar 2019 21:39:21 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E8=B4=A8=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 10 ---------- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 1583f39..779e705 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -75,14 +75,4 @@ public class WmsQCDetails extends BaseBean { @Column(name = "REJECT_QTY") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; - - @Column(name = "QC_USER") - @ApiParam("检验员") - public String qcUser; - - @Column(name = "QC_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") - public String qcTime; - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index 0246ac2..b1ae594 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -70,4 +71,13 @@ public class WmsQCTrans extends BaseBean { @Column(name="SN") @ApiParam("条码") public String sn; + + @Column(name = "QC_USER") + @ApiParam("检验员") + public String qcUser; + + @Column(name = "QC_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") + public String qcTime; } From 148d8081295a86083cbb9ebf58622218a2fda86a Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 10:55:02 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 42 ++++++++++++++++++++++ 1 file changed, 42 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 7f1c3a8..7a99b67 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 @@ -2068,4 +2068,46 @@ public class WmsEnumUtil { return null; } } + + /** + * 数据状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_STATUS { + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), + LOCKING(3, "全部", "fa cell-fa fa-lock"); + + private int value; + private String description; + private String code; + + DATA_STATUS(int value, String code, String description){ + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue () { + return value; + } + + public String getDescription () { + return description; + } + + public String getCode() { + return code; + } + + 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].getDescription(); + } + } + return tmp; + } + } }