From 4055e6fa768fde70005783d57a5f4287b2a1b9c2 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Mar 2019 19:53:28 +0800 Subject: [PATCH 01/21] =?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 02/21] =?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 03/21] =?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 04/21] =?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 05/21] =?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; + } + } } From 8da671628cd2ed3c9da7e2af091165a97b2c4bb0 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 11:54:00 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E7=9B=98=E7=82=B9PC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 3 +-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++++- 5 files changed, 26 insertions(+), 4 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 80aec01..80aad67 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 @@ -1833,7 +1833,7 @@ public class WmsEnumUtil { STEP_SEQ("STEP_SEQ", "步骤调用序号"), MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), - ORDER_NO("ORDER_NO", "盘点主表序号"); + CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index c4a8117..a9391f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer snStatus; /** - * 处理状态:1=已创建,5=已盘,10=已冻结 - * ,20=已解冻,30=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") 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 9ab2ff2..f9dfc7a 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 @@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Transient + @ApiParam(value = "盘点物料清单") + public List wmsCSPartList; + + @Transient + @ApiParam(value = "盘点存储区清单") + public List wmsCSZoneList; + + @Transient + @ApiParam(value = "盘点库位清单") + public List wmsCSLocateList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index ab4f8e7..72049d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 盘点存储区信息 @@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean { @Column(name="ZONE_NO") @ApiParam("存储区代码") public String zoneNo; + + @Transient + @ApiParam("库位代码") + public String locateNo; } 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..f2fbd4b 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 @@ -24,6 +24,12 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { + public static String packInParams(String colnumName,String[] params){ + StringBuffer sb = new StringBuffer(); + HqlPack.getInPackString(String.join(",", params),colnumName,sb); + return sb.toString(); + } + /** * 封装公用查询参数 * @param bean 实体对象 @@ -188,7 +194,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 738db8d8372f0bcbb4a73ddf8bb6d75e61cdcde9 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 13:30:33 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=A7=92=E8=89=B2=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BE=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 42 ++++++++++++++++++++++ .../pojo/model/platform/UserRolePagerModel.java | 20 +++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 +++++++ 3 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.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 7a99b67..d0a8309 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 @@ -2110,4 +2110,46 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 打印模板 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TEMPLATE { + SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"), + ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"), + RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板"); + + private int value; + private String code; + private String description; + + PRINT_TEMPLATE(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; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java new file mode 100644 index 0000000..4ca730e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-19 13:52 + * @Modify: + **/ +@Data +public class UserRolePagerModel { + + private SysRole sysRole; + + private Pager pager; +} 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 2cc7367..b78f3e2 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 @@ -1471,4 +1471,16 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransModule, result); return result.toString(); } + /** + * 根据条件查询系统配置信息 + * @param wmsConfig + * @return + */ + public static String packHqlWmsConfig(WmsConfig wmsConfig) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + getStringBuilderPack(wmsConfig, result); + return result.toString(); + } + } From fa4c4cd95716d7b23adefff216b8ee47d0b4bd99 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 15:34:09 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 9 --------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 2 files changed, 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 8707b77..753b7e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -96,13 +96,4 @@ public class WmsOpType extends BaseBean { @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; - - @Column(name = "TM_ID") - @ApiParam(value = "处理组件编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long tmId; - - @Column(name = "DATA_SRC") - @ApiParam("数据来源") - private String dataSrc; } 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 2cc7367..823b0df 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 @@ -351,7 +351,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result); HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); getStringBuilderPack(wmsOpType, result); From 5c6ab755dded7aee9789998378863ae95961ee7e Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 15:45:22 +0800 Subject: [PATCH 09/21] =?UTF-8?q?userTime=E6=94=B9=E4=B8=BAuserTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.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/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 753b7e2..c889b78 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -91,7 +91,7 @@ public class WmsOpType extends BaseBean { @Column(name = "USE_TIME") @ApiParam(value = "标准工时(每箱)", example = "0") - private Integer userTime; + private Integer useTime; @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") From 8d442fcafa4ef17ddda8ad7dd1e684fb5499458f Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 16:34:00 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f9dfc7a..05c572c 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 @@ -68,13 +68,13 @@ public class WmsCSOrderMaster extends BaseBean { @Transient @ApiParam(value = "盘点物料清单") - public List wmsCSPartList; + public String[] wmsCSParts; @Transient @ApiParam(value = "盘点存储区清单") - public List wmsCSZoneList; + public String[] wmsCSZones; @Transient @ApiParam(value = "盘点库位清单") - public List wmsCSLocateList; + public String[] wmsCSLocates; } From ebc92f6290c7dcf349c95eeb9bbc2001333542b0 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 19 Mar 2019 16:49:38 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ 1 file changed, 8 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 99f3f47..a2ddf74 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 @@ -100,4 +100,12 @@ public class WmsDocMovementMaster extends BaseBean { @Transient private List movementDetailsList; + + @Transient + @ApiParam(value = "源库存地代码") + private String srcAreaNo; + + @Transient + @ApiParam(value = "目的库存地代码") + private String desrAreaNo; } From 2e020d7be2c4ef4811d468f1b2aa22134f765630 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 17:24:38 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 9acb8ee..0d72080 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 @@ -2074,9 +2074,8 @@ public class WmsEnumUtil { */ @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"); + YES(1, "是", "fa fa-success cell-fa fa-check"), + NO(2, "否", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String description; From 4ef08afaa7ff22d46e37520ea7cd90ed3934da7f Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 19 Mar 2019 17:40:37 +0800 Subject: [PATCH 13/21] dragon --- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 40 +++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f858769..893a13b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") - @ApiParam(value = "交易数量", example = "1") - private Double qty; - - @Column(name = "REJECT_QTY") - @ApiParam(value = "不合格交易数量", example = "1") - private Double rejectQty; - @Column(name = "TRANS_STATUS") @ApiParam(value = "状态", example = "10") private Integer transStatus; @@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean { @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage; + + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; + + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } From 6cf53459e28a037ff8b23485d0c1d08d08eb1527 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 19:24:41 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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 | 1 + 1 file changed, 1 insertion(+) 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 6787a24..f93613e 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 @@ -648,6 +648,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); From 73d2da12edd7f62dfda811c03b069dd74cf2c8f3 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 20:21:52 +0800 Subject: [PATCH 15/21] =?UTF-8?q?po=E7=89=88=E6=9C=AC=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 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 0d72080..fbbd992 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 @@ -2151,4 +2151,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 版本号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VERSION { + PO_VERSION(10, "VERSION", "PO版本号"); + + private int value; + private String code; + private String description; + + VERSION(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; + } + } } From bd6f6c05468039f39a41ccc6309b78fcfb32a927 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 19 Mar 2019 21:19:30 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6V2.0=EF=BC=9A=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=A1=A8=E4=B8=AD=E6=95=B0=E9=87=8F=E7=B1=BB=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B8=8E=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= 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 0d72080..431c6cf 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 @@ -2034,7 +2034,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_QUAN_GENERAL_TAG { - MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负"); + SRC(-1, "SRC", "一条：负"), ZERO(0, "ZERO", "一条：0"), DEST(1, "DEST", "一条：正"), TWO(2, "TWO", "两条：一正一负"); private String code; private String description; From c9215a70798956fa79dae3ee655b3176bdd3a38f Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 20 Mar 2019 11:12:47 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B7=A5=E5=8E=82=EF=BC=9B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=90=88=E5=B9=B6hql=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 180 ++++++++++++--------- 1 file changed, 105 insertions(+), 75 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 f93613e..13e6304 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 @@ -24,15 +24,16 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName,String[] params){ + public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params),colnumName,sb); + HqlPack.getInPackString(String.join(",", params), colnumName, sb); return sb.toString(); } /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -88,6 +89,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 查询任务合并的移库单明细 查询条件封装 * @@ -98,17 +100,15 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { - if (i == orderNos.size()) { - orderNoStr.append("'" + orderNos.get(i) + "'"); - } else { - orderNoStr.append("'" + orderNos.get(i) + "',"); - } + orderNoStr.append("'" + orderNos.get(i) + "',"); } + orderNoStr.deleteCharAt(orderNoStr.length() - 1); result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + - "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo"); + " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + + " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo"); return result.toString(); } + /** * 库存移动单查询封装 * @@ -217,10 +217,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); - if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { + if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { + if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } @@ -411,6 +411,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 查询满足处理周期的作业类型 查询条件封装 * @@ -441,6 +442,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 存储区信息 查询条件封装 * @@ -457,7 +459,7 @@ public class WmsHqlPack { //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); @@ -523,7 +525,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - getStringBuilderPack(wmsASNMaster,result); + getStringBuilderPack(wmsASNMaster, result); return result.toString(); } @@ -602,7 +604,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -661,6 +663,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -683,10 +686,11 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -699,15 +703,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); @@ -716,10 +721,11 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -732,6 +738,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -758,6 +765,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -873,17 +881,19 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); @@ -892,14 +902,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); @@ -908,10 +919,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -921,15 +933,15 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); @@ -938,10 +950,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1161,9 +1174,10 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { StringBuffer result = new StringBuffer(); //查询参数封装 agDescC;agNameC @@ -1176,9 +1190,10 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { StringBuffer result = new StringBuffer(); //查询参数封装 @@ -1225,6 +1240,7 @@ public class WmsHqlPack { /** * 作业记录 查询条件封装 + * * @param wmsActionLog * @return */ @@ -1232,19 +1248,19 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); + HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsActionLog, result); @@ -1253,15 +1269,16 @@ public class WmsHqlPack { /** * 作业记录明细 查询条件封装 + * * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { StringBuffer result = new StringBuffer(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); @@ -1293,14 +1310,15 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 + * 按moveNo 取最后一笔插入的数据 + * * @param wmsMoveSn * @return */ public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsMoveSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); @@ -1308,53 +1326,57 @@ public class WmsHqlPack { } /** - * 根据条件查询库存条码信息 + * 根据条件查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); } /** - * 根据条件模糊查询库存条码信息 + * 根据条件模糊查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); getStringBuilderPack(wmsStockSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } /** - * 根据条件查询库存信息 + * 根据条件查询库存信息 + * * @param wmsStockQuan * @return */ public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsStockQuan, result); return result.toString(); } /** - * 根据用户角色id列表查询数据权限信息 + * 根据用户角色id列表查询数据权限信息 + * * @return */ public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); String data = String.join(",", roleIds); HqlPack.getInPackString(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); @@ -1363,14 +1385,15 @@ public class WmsHqlPack { /** * 根据权限数据拼查询任务详情sql + * * @param groupDataAuth * @return */ - public static String packHqlWmsTaskDetail(Map> groupDataAuth) { + public static String packHqlWmsTaskDetail(Map> groupDataAuth) { StringBuffer result = new StringBuffer(); Set>> entries = groupDataAuth.entrySet(); //拼sql - entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ + entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> { List value = o.getValue(); List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); @@ -1401,33 +1424,35 @@ public class WmsHqlPack { /** * 给定字段动态in sql + * * @param columnName * @param vals * @return */ - public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { + public static String packHqlAndIn(BaseBean bean, String columnName, List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data,columnName,result); + HqlPack.getInPackString(data, columnName, result); getStringBuilderPack(bean, result); return result.toString(); } /** * 根据条件查询dataAuth + * * @param wmsDataAuth * @return */ public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { StringBuffer result = new StringBuffer(); - if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ - HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { + HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){ - HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { + HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){ - HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { + HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); } getStringBuilderPack(wmsDataAuth, result); return result.toString(); @@ -1435,6 +1460,7 @@ public class WmsHqlPack { /** * 根据条件查询任务明细信息 + * * @param taskDetails * @return */ @@ -1447,6 +1473,7 @@ public class WmsHqlPack { /** * 根据条件查询任务生成日志 + * * @param wmsTaskCreateLog * @return */ @@ -1460,25 +1487,28 @@ public class WmsHqlPack { /** * 根据条件查询作业处理组件 + * * @param wmsTransModule * @return */ public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { StringBuffer result = new StringBuffer(); - if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); } - if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); } - if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); } getStringBuilderPack(wmsTransModule, result); return result.toString(); } + /** * 根据条件查询系统配置信息 + * * @param wmsConfig * @return */ From 234aad93e3bc96486aa0a95dd3fee3f0220927f3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 20 Mar 2019 15:47:31 +0800 Subject: [PATCH 18/21] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=202.=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= 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 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 2 files changed, 8 insertions(+), 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 1730e20..b99f4ec 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 @@ -75,6 +75,12 @@ public class WmsActionResponseBean { public Boolean isDetailsBtnDisabled = true; /** + * 默认为true，如果这个值为true就禁用按钮否则可用， + */ + @ApiParam(value = "输入框是否禁用") + public Boolean isInputBtnDisabled = false; + + /** * 与 toSelected 属性配合使用， * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ 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 f93613e..5862925 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 @@ -1405,10 +1405,11 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { + public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); HqlPack.getInPackString(data,columnName,result); + HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); } From b9d00d181e76e2a8c878440a4c040bf1387e6dc1 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Wed, 20 Mar 2019 18:31:32 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 62 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 2 +- 2 files changed, 63 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 6a11b45..5baff68 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 @@ -1913,6 +1913,35 @@ public class WmsEnumUtil { } /** + * 通用条码枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMON_SN { + PO_SN("PO_SN", "PO条码"); + + private String code; + private String description; + int value; + + COMMON_SN(String code, String description) { + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** * 可选项类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2191,4 +2220,37 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 包装类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TYPE { + BOX(10 , "BOX", "BOX（盒）"), + CARTON(20 , "CARTON", "CARTON（箱）"), + PALLET(30 , "PALLET", "PALLET（栈板）"), + CONTAINER(40 , "PALLET", "PALLET（集装箱）"); + + private String code; + private String description; + int value; + + PACKAGE_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-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 b1ae594..e7610a3 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 @@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="PASS_QTY") @ApiParam("合格数量") From 970fa83557ac27ea51ceb75474ac712de6ef9e04 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 20 Mar 2019 19:11:28 +0800 Subject: [PATCH 20/21] dragon --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 13e6304..898c921 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 @@ -93,10 +93,11 @@ public class WmsHqlPack { /** * 查询任务合并的移库单明细 查询条件封装 * + * @param colName * @param orderNos * @return */ - public static String packWmsOrderDetailsByOrderNos(List orderNos) { + public static String packWmsOrderDetailsByOrderNos(String colName, List orderNos) { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { @@ -105,7 +106,7 @@ public class WmsHqlPack { orderNoStr.deleteCharAt(orderNoStr.length() - 1); result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo"); + " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo"); return result.toString(); } From 569e872ebc0362152d99f18b3dd19a215ff7ebd2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 20 Mar 2019 21:07:26 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=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 --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 1431 ++++++++++++++++++++ .../pojo/base/enumutil/BlockReportEnumUtil.java | 2 +- 2 files changed, 1432 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java new file mode 100644 index 0000000..87a3261 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -0,0 +1,1431 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : 模块表单枚举类 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-12-25 21:08 + * @Modify: + **/ +public class BlockFormEnumUtil { + + /** + * 原数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FORM_TABLE_TYPE { + TABLE(1, "table", "表"), + VIEW(2, "view", "视图"); + + private int value; + private String code; + private String description; + + private FORM_TABLE_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static FORM_TABLE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 行信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TABLE_ROW_PICK { + SINGLE(1, "single", "单选"), + MULTI(2, "multi", "多选"); + + private int value; + private String code; + private String description; + + private TABLE_ROW_PICK(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TABLE_ROW_PICK valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 显示行号信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TABLE_ROW_NUMBER { + SHOW(1, "show", "显示"), + HIDE(2, "hide", "隐藏"); + + private int value; + private String code; + private String description; + + private TABLE_ROW_NUMBER(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TABLE_ROW_NUMBER valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 元素新增信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_ADD_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_ADD_STATUS(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ELEMENT_ADD_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 元素编辑信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_EDIT_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_EDIT_STATUS(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ELEMENT_EDIT_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 元素编辑信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_DEL_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_DEL_STATUS(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ELEMENT_DEL_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 元素查询信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_FIND_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_FIND_STATUS(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ELEMENT_FIND_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 元素控件类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_CONTROL_TYPE { + RADIO(100, "RADIO", "单选"), + CHECKBOX(110, "CHECKBOX", "复选"), + TEXT(200, "TEXT", "文本"), + NUMBER(210, "NUMBER", "数字"), + PASSWORD(230, "PASSWORD", "密码"), + DATE(300, "DATE", "日期(yyyy-MM-dd)"), + DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), + DICTIONARY(800, "DICT_SELECT", "字典"), + CASCADE(900, "CASCADE", "级联"); + //FILE(400, "file", "文件"), + //IMAGE(410, "image", "image"), + //OFF(500, "color", "颜色"), + + private int value; + private String code; + private String description; + + private PROPERTY_CONTROL_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_CONTROL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 属性字段排序规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_ORDER_BY { + ASC(1, "ASC", "升序"), + DESC(2, "DESC", "降序"); + + private int value; + private String name; + private String description; + + PROPERTY_ORDER_BY(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + 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].getName(); + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 虚拟类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_VIRTUAL_TYPE { + STRING_SPLICE(10, "SPLICE", "字符串拼接"), + NUM_ADD(20, "ADD", "加法计算"), + NUM_LESS(30, "MIN", "减法计算"), + NUM_MAKE(40, "MUL", "乘法计算"), + NUM_DIVISION(50, "DIVISION", "除法计算"); + + private int value; + private String code; + private String description; + + private PROPERTY_VIRTUAL_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_VIRTUAL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 属性类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_TYPE { + STRING(10, "String", "字符串"), + CHAR(11, "Character", "单字符"), + INTEGER(20, "Integer", "短整型"), + LONG(21, "Long", "长整型"), + DOUBLE(30, "Double", "大浮点型"), + FLOAT(31, "Float", "小浮点型"), + BOOLEAN(40, "Boolean", "布尔值"), + BYTE(50, "Byte", "字节"), + DATE(60, "Date", "日期"); + + private int value; + private String code; + private String description; + + private PROPERTY_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 执行类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXECUTION_TYPE { + SQL(10, "SQL", "SQL脚本"), + CLASS_METHOD(20, "ClassMethod", "类方法"); + + private int value; + private String code; + private String description; + + private EXECUTION_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static EXECUTION_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 拦截器类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERCEPT_TYPE { + ELEMENT_ADD(10, "ELEMENT_ADD", "元素新增"), + ELEMENT_EDIT(20, "ELEMENT_EDIT", "元素修改"), + ELEMENT_DEL(30, "ELEMENT_DEL", "元素删除"), + ELEMENT_FIND(40, "ELEMENT_FIND", "元素查询"), + CUSTOM_BUTTON(50, "CUSTOM_BUTTON", "自定义按钮"); + + private int value; + private String code; + private String description; + + private INTERCEPT_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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static INTERCEPT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 拦截器位置信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERCEPT_POSITION { + BEFORE_EXECUTION(10, "BEFORE", "执行前"), + AFTER_SUCCESS(20, "AFTER_SUCCESS", "执行成功后"), + AFTER_FAIL(30, "AFTER_FAIL", "执行失败后"); + + private int value; + private String code; + private String description; + + private INTERCEPT_POSITION(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static INTERCEPT_POSITION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 拦截器业务结果处理信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERCEPT_PROCESS_RESULT { + CONTINUE_AFTER_SUCCESS(10, "CONTINUE_AFTER_SUCCESS", "成功后继续"), + STOP_AFTER_SUCCESS(20, "STOP_AFTER_SUCCESS", "成功后停止"), + CONTINUE_AFTER_FAIL(30, "CONTINUE_AFTER_FAIL", "失败后继续"), + CONTINUE_AFTER_STOP(40, "CONTINUE_AFTER_STOP", "失败后停止"); + + private int value; + private String code; + private String description; + + private INTERCEPT_PROCESS_RESULT(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static INTERCEPT_PROCESS_RESULT valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 表单功能明细 触发信息 + * + * onclick script 元素上发生鼠标点击时触发。 + * ondblclick script 元素上发生鼠标双击时触发。 + * ondrag script 元素被拖动时运行的脚本。 + * ondragend script 在拖动操作末端运行的脚本。 + * ondragenter script 当元素元素已被拖动到有效拖放区域时运行的脚本。 + * ondragleave script 当元素离开有效拖放目标时运行的脚本。 + * ondragover script 当元素在有效拖放目标上正在被拖动时运行的脚本。 + * ondragstart script 在拖动操作开端运行的脚本。 + * ondrop script 当被拖元素正在被拖放时运行的脚本。 + * onmousedown script 当元素上按下鼠标按钮时触发。 + * onmousemove script 当鼠标指针移动到元素上时触发。 + * onmouseout script 当鼠标指针移出元素时触发。 + * onmouseover script 当鼠标指针移动到元素上时触发。 + * onmouseup script 当在元素上释放鼠标按钮时触发。 + * onmousewheel script 当鼠标滚轮正在被滚动时运行的脚本。 + * onscroll script 当元素滚动条被滚动时运行的脚本。 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_EVENT { + CLICK(10, "CLICK", "单击"), + DB_LCLICK(20, "DB_LCLICK", "双击"), + MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), + MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入"); + + private int value; + private String code; + private String description; + + private TRIGGER_EVENT(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; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TRIGGER_EVENT valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 表单功能明细 触发效果信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_EFFECT { + DIALOG(10, "DIALOG", "弹出窗口"), + WINDOW_NEW(20, "NEW_WINDOW", "新开窗口"), + SQL(30, "SQL", "执行SQL"), + CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"); + + private int value; + private String name; + private String description; + + TRIGGER_EFFECT(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static TRIGGER_EFFECT valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * SQL 连接关系信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SQL_REF_TYPE { + GT(1, ">", "大于"), + GT_EQUAL(2, ">=", "大于等于"), + LT(3, "<", "小于等于"), + LT_EQUAL(4, "<=", "小于等于"), + EQUAL(5, "=", "等于"), + EQUAL_NOT(6, "<>", "不等于"); + + private int value; + private String name; + private String description; + + SQL_REF_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static SQL_REF_TYPE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index e8a2dbd..5e56bd1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description : 模块枚举类 + * @Description : 模块报表枚举类 * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-12-25 21:08