I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wms初始化扫描实体字段新增逻辑优化

Browse Source
yun-zuoyi
袁津哲 5 years ago
parent 76b5087e60
commit 7d4ba10449
7 changed files with 107 additions and 6 deletions
Show Stats Download Patch File Download Diff File

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java
Unescape Escape View File

@ -13,4 +13,22 @@ import java.lang.annotation.*;
public @interface FieldAnnotation {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
// 条件表达式:>,<,>=等
String conditionExpre() default "=";
// 条件连接符:and/or
String conditionConnector() default "and";
// 排序序号
int seq() default 0;
// 字段列宽度
double width() default 0d;
// 排序规则:默认0-不排序，1-升序2-降序
int sort() default 0;
// 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
int isWider() default 2;
// 是否勾选:默认1-勾选，2-非勾选
int isSelect() default 1;
// 是否必选:默认1-必选，2-非必选
int isRequire() default 1;
// 是否表单字段展示:默认1-显示，2-隐藏
int isShow() default 1;
}

5
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -41,6 +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)
public Long id;
//get单独处理
@ -63,6 +64,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE")
@ApiParam(value ="组织代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
// @AnnoOutputColumn(hidden = true)
public String organizeCode;
@ -87,15 +89,18 @@ public abstract class BaseBean implements Serializable {
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
public String createDatetime;
@Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String modifyUser;
@Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
public String modifyDatetime;
@Transient

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
Unescape Escape View File

@ -45,4 +45,7 @@ public class WmsSearchElementModel extends BaseBean {
@ApiParam(value = "是否共享")
private Integer isShare;
@ApiParam(value = "搜索名称")
private String searchName;
}

34
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
Unescape Escape View File

@ -35,14 +35,17 @@ public class WmsPart extends BaseBean {
private static final long serialVersionUID = 4849044986767609346L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_SPEC")
@ApiParam(value = "物料规格")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partSpec;
@Column(name = "PART_TYPE")
@ -53,46 +56,57 @@ public class WmsPart extends BaseBean {
@Column(name = "PART_TYPE_DESC")
@ApiParam(value = "物料类型描述")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partTypeDesc;
@Column(name = "GRAPHI_NO")
@ApiParam(value = "图号")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String graphiNo;
@Column(name = "VERSION")
@ApiParam(value = "版本")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String version;
@Column(name = "COLOR")
@ApiParam(value = "颜色")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String color;
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String stockUnit;
@Column(name = "ABC")
@ApiParam(value = "分类")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String abc;
@Column(name = "BUY_UNIT")
@ApiParam(value = "采购单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String buyUnit;
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double bu2su;
@Column(name = "PRICE_UNIT")
@ApiParam(value = "计价单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String priceUnit;
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double pu2su;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标包", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double snp;
@ColumnDefault("2")
@ -103,18 +117,22 @@ public class WmsPart extends BaseBean {
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double min;
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double max;
@Column(name = "PART_GROUP")
@ApiParam(value = "物料组")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partGroup;
@Column(name = "LOT_CHECK_RULE")
@ApiParam(value = "批次校验规则")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String lotCheckRule;
@Column(name = "SN_CONTROL")
@ -124,34 +142,42 @@ public class WmsPart extends BaseBean {
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String inLocateNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String prodCfgTypeCode;
@Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String prodCfgTypeName;
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String outCloseFlag = "2";
@Column(name = "OUT_CLOSE_TYPE")
@ApiParam("结算方式")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String outCloseType;
@Column(name = "OUT_CLOSE_VENDOR")
@ApiParam("结算供应商")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String outCloseVendor;
@Column(name = "QUALITY_DAYS")
@ApiParam("保质期天数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer qualityDays;
@Column(name = "IS_REPORT_PARTNO")
@ -161,18 +187,22 @@ public class WmsPart extends BaseBean {
@Column(name = "REPORT_LOCATE_NO")
@ApiParam("报工库位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String reportLocateNo;
@Column(name = "REPORT_ZONE_NO")
@ApiParam("报工存储区")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String reportZoneNo;
@Column(name = "PRODUCT_LINES")
@ApiParam("报工产线")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String productLines;
@Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
@ApiParam(value = "待质检比例", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double proportion;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ -183,11 +213,13 @@ public class WmsPart extends BaseBean {
@Transient
@ApiParam("总数量")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double qty;
@Transient
@ApiParam("库存水平")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String stockLevelStatus;
@Column(name="verb_num")
@ -206,10 +238,12 @@ public class WmsPart extends BaseBean {
@Column(name = "CYCLE_RQUEST_PERIOD")
@ApiParam(value = "循环补货周期", example = "0")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer cycleRquestPeriod = 0;
@Column(name = "CYCLE_RQUEST_QTY")
@ApiParam(value = "循环补货数量", example = "0")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Double cycleRquestQty = 0d;
public int getIqcVal(){

38
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java
Unescape Escape View File

@ -7,7 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@ -29,6 +28,7 @@ import javax.persistence.Table;
public class WmsFieldInfo extends BaseBean {
private static final long serialVersionUID = 3903166651913139064L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@ -48,4 +48,40 @@ public class WmsFieldInfo extends BaseBean {
@Column(name = "ENTITY_DESC")
@ApiParam(value = "实体描述")
private String entityDesc;
@Column(name = "SEQ")
@ApiParam(value = "序列号:字段标题排序使用默认0（不排序）")
private Integer seq;
@Column(name = "IS_REQUIRE")
@ApiParam(value = "是否必选:默认1-必选，2-非必选")
private Integer isRequire;
@Column(name = "WIDTH", columnDefinition = "decimal(18,8)")
@ApiParam(value = "宽度", example = "0")
private Double width;
@Column(name = "SORT")
@ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
private Integer sort;
@Column(name = "IS_WIDER")
@ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
private Integer isWider;
@Column(name = "IS_SELECT")
@ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
private Integer isSelect;
@Column(name = "IS_SHOW")
@ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏")
private Integer isShow;
@Column(name = "CONDITION_EXPRE")
@ApiParam(value = "条件表达式:>,<,>=等")
private String conditionExpre;
@Column(name = "CONDITION_CONNECTOR")
@ApiParam(value = "条件连接符:and/or")
private String conditionConnector;
}

11
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Table;
public class WmsListElement extends BaseBean {
private static final long serialVersionUID = 3903166651913139060L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@ -45,14 +46,10 @@ public class WmsListElement extends BaseBean {
@ApiParam(value = "是否必选:默认1-必选，2-非必选")
private Integer isRequire;
@Column(name = "WIDTH", columnDefinition = "decimal(2,5)")
@Column(name = "WIDTH", columnDefinition = "decimal(18,8)")
@ApiParam(value = "宽度", example = "0")
private Double width;
public Double getWidth() {
return this.width == null ? 0 : this.width.doubleValue();
}
@Column(name = "SORT")
@ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
private Integer sort;
@ -72,4 +69,8 @@ public class WmsListElement extends BaseBean {
@Column(name = "DEFAULT_VALUE")
@ApiParam(value = "表单字段默认值")
private String defaultValue;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号")
private String userCode;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class WmsSearchElementFunction extends BaseBean {
@ApiParam(value = "组名称")
private String groupName;
@Column(name = "SEARCH_NAME")
@ApiParam(value = "搜索名称")
private String searchName;
@Column(name = "SEARCH_ELEMENT_ID")
@ApiParam(value = "搜索元素ID")
private Long searchElementId;

Write Preview
Loading…
Cancel
Save