From f7c98e39825e3d1f7b673231fc27bc6cacf0e2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 16 Jan 2020 09:18:56 +0800 Subject: [PATCH] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/annotation/FieldAnnotation.java | 4 +++- .../estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 +++++++------- .../estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 4 ++++ .../i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 6067155..d23889d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -9,7 +9,7 @@ import java.lang.annotation.*; */ @Documented @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) +@Target({ElementType.FIELD, ElementType.TYPE}) public @interface FieldAnnotation { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); @@ -33,4 +33,6 @@ public @interface FieldAnnotation { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; + // 下拉枚举名称 + String enumName() default ""; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java index 22e8533..4704dd1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,4 +18,7 @@ public class WmsSearchGroupModel { @ApiParam(value = "组列表") private List searchElementModelList; + + @ApiParam(value = "分页组件") + private Pager pager; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8f9fb9f..58179a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -112,7 +112,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -137,7 +137,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @@ -182,7 +182,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -207,7 +207,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -228,12 +228,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index b1f3e68..22dfa8d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "字段类型") private String fieldType; + @Column(name = "ENUM_NAME") + @ApiParam(value = "字段枚举名称") + private String enumName; + @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") private String entityName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index 302f426..5fd19b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -21,6 +21,7 @@ import javax.persistence.*; @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { @Index(columnList = "FIELD_NAME"), + @Index(columnList = "FIELD_TYPE"), @Index(columnList = "SEARCH_NAME"), @Index(columnList = "USER_CODE") }) @@ -40,6 +41,10 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "标题名称") private String titleName; + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + @Column(name = "CONDITION_EXPRE") @ApiParam(value = "条件表达式:>,<,>=等") private String conditionExpre; 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 18b3395..ba45abb 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 @@ -2767,8 +2767,8 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result); - DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result); + DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); getStringBuilderPack(searchElementFunction, result); return result; }