From 20cdd4170c32f3c9ec85ab4970ff2669ff864a78 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 27 Dec 2018 11:59:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index cfefd6b..a450d3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -41,7 +41,7 @@ public class WmsCSOrderMaster extends BaseBean { public Integer orderType; @Column(name="ORDER_STATUS") - @ApiParam(value = "状态", example = "1" ) + @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1" ) public Integer orderStatus; @Column(name="ACTION_PERSENT") From a5e05ef36efa74d99272cc73f7f95f48fd3b1acf Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 27 Dec 2018 13:42:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E5=9C=A8=E8=B0=83=E7=BB=84=E4=BB=B6=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=AF=B9=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=9A=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA30=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E9=AA=8C=E8=AF=81=EF=BC=8C=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E4=B8=BAprompt=E7=9A=84=E4=B8=8D=E7=94=A8=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= 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 | 3 ++- 1 file changed, 2 insertions(+), 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 d2270cb..7bd9a7a 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 @@ -1446,7 +1446,8 @@ public class WmsEnumUtil { public enum ACTION_MOUDULE_PARAM_TYPE { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), - STRING(20, "字符串"); + STRING(20, "字符串"), + OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; private String description; From 3fcdba6c94cf59f95a5870e720bd64496ac69a5b Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 27 Dec 2018 14:59:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1b61f26..b65a081 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 @@ -30,7 +30,7 @@ public class WmsActionResponseBean { public Map barCode; @ApiParam("进度") - public String percent ="0"; + public String percent ="消息提示："; @ApiParam("当前步骤") public Integer currentStep; From b41698ba1b8de51cf2a527d2399e95dda2c86dcc Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 27 Dec 2018 17:42:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AFBUG?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2760420..5a789da 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 @@ -68,7 +68,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsDocMovementDetails, result); From b55906ced0c1890396bed84e329162d5bc4f9693 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 27 Dec 2018 17:43:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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/model/wms/OptionModel.java | 11 ++++++++ .../pojo/wms/bean/WmsActionGroupDetails.java | 8 ++++++ .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 8 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 +++++ 5 files changed, 64 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 7bd9a7a..58a362e 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 @@ -1838,5 +1838,36 @@ public class WmsEnumUtil { } } + /** + * 可选项类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPTION_TYPE { + OPTIONS(10, "OPTIONS", "可选项"), + BUTTON(20, "BUTTON", "按钮"); + + private String code; + private String description; + int value; + + OPTION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java index 78b9c4b..7ab343e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java @@ -17,4 +17,15 @@ public class OptionModel { private String name; private Integer value; + + /** + * 10=复选框，20=按钮，显示到查看历史左侧 + */ + private Integer type; + + /** + * 当Type=20时，此值代表需要跳转的步骤，前台要把此值放到 + * OperationBean. barcode字段并反馈给后台，流程管家使用此值处理 + */ + private String content; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index f41bf15..ca66d67 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -73,5 +73,13 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "流程名称") private String agName; + @Column(name = "GOTO_BTN_CODE") + @ApiParam(value = "跳转按钮代码") + private String goToBtnCode; + + @Column(name = "GOTO_BTN_NAME") + @ApiParam(value = "跳转按钮名称") + private String goToBtnName; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 6a3b866..dbc8b0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -101,6 +101,14 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "结束执行时间") public String endTime; + @Column(name = "GOTO_BTN_CODE") + @ApiParam(value = "跳转按钮代码") + private String goToBtnCode; + + @Column(name = "GOTO_BTN_NAME") + @ApiParam(value = "跳转按钮名称") + private String goToBtnName; + public WmsActionLogDetails() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 39c3971..4ccbc47 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -122,4 +122,10 @@ public class WmsMoveDetails extends BaseBean { this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; } + + public WmsMoveDetails(String partNo, double qty ,double transQty){ + this.partNo = partNo; + this.qty = qty; + this.transQty = transQty; + } } From b8d4a3a08a442905c5d8cdf2e9e7fe6121fe2592 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 28 Dec 2018 15:05:03 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 | 3 ++- 1 file changed, 2 insertions(+), 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 58a362e..a6a91f7 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 @@ -1554,7 +1554,8 @@ public class WmsEnumUtil { RESET(30, "重置按钮"), CHECK_DETAILS(40, "查看明细"), DELETE_DETAILS(50, "明细(删除)"), - CLEAR_DETAILS(60, "明细（清空）"); + CLEAR_DETAILS(60, "明细（清空）"), + CUSTOM_BUTTON(70, "自定义按钮"); private int value; private String description; From 46335b8a818a9f800d88f5c8c51e3d4193c48509 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 28 Dec 2018 20:00:47 +0800 Subject: [PATCH 7/7] =?UTF-8?q?redis=E4=BC=9A=E8=AF=9D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/Pager.java | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 9a3f932..6035ea3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -41,12 +41,17 @@ public class Pager { */ public Pager(int totalRows) { this.totalRows = totalRows; - totalPages = totalRows / pageSize; - - int mod = totalRows % pageSize; - if (mod > 0) { - totalPages++; + if(pageSize != 0) { + totalPages = totalRows / pageSize; + + int mod = totalRows % pageSize; + if (mod > 0) { + totalPages++; + } + }else{ + totalPages = 0; } + currentPage = 1; startRow = 0; resetEndRow(); @@ -56,12 +61,16 @@ public class Pager { this.totalRows = totalRows; this.pageSize = pageSize; - totalPages = totalRows / pageSize; - - int mod = totalRows % pageSize; - if (mod > 0) { - totalPages++; + if(pageSize != 0) { + totalPages = totalRows / pageSize; + int mod = totalRows % pageSize; + if (mod > 0) { + totalPages++; + } + }else{ + totalPages = 0; } + currentPage = 1; startRow = 0; resetEndRow();