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 2e2b0a2..6067155 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 @@ -31,4 +31,6 @@ public @interface FieldAnnotation { int isRequire() default 1; // 是否表单字段展示:默认1-显示,2-隐藏 int isShow() default 1; + // 是否跳过本字段扫描 0-不跳过,1-跳过 + int isSkip() default 0; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9c10c6c..c91a810 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 @@ -64,19 +64,19 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除,软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -84,58 +84,64 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用,查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用,查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用,查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用,查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型,1 正序,2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 9226c3a..9c96abd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -77,10 +78,18 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + public MesQcCheckStandard() { } - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; @@ -92,5 +101,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkFrequency = checkFrequency; this.partName = partName; this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..b038988 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + private List childQcList; + + public QcCheckStandardModel() { + } + + public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index ecbf355..8338df3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -27,8 +27,12 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam(value = "新增数据操作类") private String baseRepository; - public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + @ApiParam("处理类型") + private int handleType; + + public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { this.baseRepository = baseRepository; this.wmsFieldInfoList = wmsFieldInfoList; + this.handleType = handleType; } } 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 748e194..0d4e335 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 @@ -56,170 +56,170 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double snp; @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name="verb_num") @@ -227,23 +227,23 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index d654c64..7371f25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -77,4 +77,8 @@ public class WmsListElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; }