From cc98e84ba43b4ab42b0a2e2453fdb00117ddeb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Mar 2020 10:14:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=AA=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 6 +++- .../i3plus/pojo/model/wms/WmsListSearchModel.java | 34 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 11 +++++-- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 16 +++++----- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 8 +++++ 9 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 2d18d24..3df382d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -34,5 +34,9 @@ public @interface DynamicField { // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; // 下拉枚举名称 - String enumName() default ""; + String entityName() default ""; + // 下拉列表显示列名称,多个列名需要根据逗号分隔 + String listColumnName() default ""; + // 下拉搜索列名称,多个列名需要根据逗号分隔 + String searchColumnName() default ""; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java new file mode 100644 index 0000000..43e219f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : silliter + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsListSearchModel { + + @ApiParam(value = "开窗列表查询key") + private String searchKey; + + @ApiParam(value = "开窗列表查询value") + private String searchValue; + + @ApiParam(value = "排序参数") + private String orderByParams; + + @ApiParam(value = "分页组件") + private Pager pager; + + @ApiParam(value = "实体类名") + private String objClassName; + + @ApiParam(value = "有效性") + public Integer isValid; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 7dfbfcc..c1ca40c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.PtlEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -15,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -45,7 +45,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "CONTROL_TYPE") @ApiParam("控制器类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE") private Integer controlType; @Column(name = "IP") @@ -65,7 +65,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("控制器状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS") private Integer status; @Column(name = "FREQUENCY") @@ -73,4 +73,9 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 3cd1329..8d2a609 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable { @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index bb576ab..5ead0fb 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -64,37 +64,37 @@ public class PtlTag extends BaseBean implements Serializable { @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") @ApiParam("亮灯状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS") private Integer lightStatus; @Column(name = "TAG_STATUS") @ApiParam("标签状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS") private Integer tagStatus; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE") private Integer lightMode; @Column(name = "LIGHT_COLOR") @ApiParam("亮灯颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR") private Integer lightColor; @Column(name = "IS_BUZZING") @ApiParam("是否蜂鸣") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING") private Integer isBuzzing; @Column(name = "MUSIC_TYPE") @ApiParam("音乐类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE") private Integer musicType; @Column(name = "DISPLAY_CONTEXT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 4eeefd9..338d1d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @@ -102,7 +102,7 @@ public class WmsLocate extends BaseBean { @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") 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 c0a9d25..42c9bf0 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 = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "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") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "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") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "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("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "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 = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "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") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "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/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index f991b51..4c9e00d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -60,32 +60,32 @@ public class WmsZones extends BaseBean { @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @@ -95,12 +95,12 @@ public class WmsZones extends BaseBean { @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 924d245..b46e544 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -92,4 +92,12 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "LIST_COLUMNNAME") + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @Column(name = "SEARCH_COLUMNNAME") + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; }