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

Merge remote-tracking branch 'origin/test' into test

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 23b06a53af 1a01c44f84
commit 8ae8383e79
71 changed files with 1043 additions and 534 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.base.annotation;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import java.lang.annotation.*;
@ -12,7 +12,7 @@ import java.lang.annotation.*;
@Target({ElementType.FIELD, ElementType.TYPE})
public @interface DynamicField {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
CommonEnumUtil.FIELD_TYPE webFieldType();
// 条件表达式:>,<,>=等
String conditionExpre() default "=";
// 条件连接符:and/or
@ -35,14 +35,16 @@ public @interface DynamicField {
int isShow() default 1;
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String entityName() default "";
// 下拉列表显示列名称,多个列名需要根据逗号分隔
String listColumnName() default "";
// 下拉搜索列名称,多个列名需要根据逗号分隔
String searchColumnName() default "";
// 回显列名
String explicitColumnName() default "";
// 下拉框规则
WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
// 是否多选:1-多选，默认2-单选
int isMultiple() default 2;
// 数据来源
String dataSrc() default "";
// 取值方式
CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM;
}

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

@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
public Long id;
//get单独处理
@ -65,7 +65,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码")
// @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ -82,52 +82,52 @@ public abstract class BaseBean implements Serializable {
@Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
public String createUser;
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String createDatetime;
@Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
public String modifyUser;
@Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.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)
@DynamicField(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)
@DynamicField(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)
@DynamicField(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)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String modifyDateTimeEnd;
@Transient

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

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import java.util.HashMap;
import java.util.Map;
/**
* @Description : hql脚本封装类
@ -141,6 +142,24 @@ public class DdlPackBean {
}
/**
* 添加查询条件-处理多个属性
* @param hql
* @param hqlMap
*/
public void addColumnQuery(String hql,HashMap<String,Object> hqlMap){
if(hqlPreparedMap == null){
hqlPreparedMap = new HashMap<>();
}
if(hqlMap != null && !hqlMap.isEmpty()) {
hqlPreparedMap.putAll(hqlMap);
}
whereAppend.append(hql);
}
/**
* 需要查询属性的数量
* @return
*/

108
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -2175,4 +2175,112 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
* PC自定义搜索-字段类型
* 10-文本，20-数字，30-下拉框，40，时间，50-开窗
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE {
TEXT(10, "text"), NUMBER(20, "number"),
SELECT(30, "select"), DATETIME(40, "datetime"),
LIST(50, "list");
private int value;
private String description;
FIELD_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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 FIELD_TYPE codeOf(Integer value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**
* PC自定义搜索-取值方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_FIELD_GET_WAY {
ENUM(10, "SINGLE_OBJ", "枚举"),
OBJ(20, "MULTIPLE_OBJ", "对象"),
URL(30, "SINGLE_OBJ", "接口");
private int value;
private String code;
private String description;
DYNAMIC_FIELD_GET_WAY(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static DYNAMIC_FIELD_GET_WAY codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

57
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -14,26 +14,26 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HQL_EXPRESSION {
GT(10,">","大于"),
LT(20,"<","小于"),
EQ(30,"=","等于"),
NEQ(40,"!=","不等于"),
GTE(50,">=","大于等于"),
LTE(60,"<=","小于等于"),
LIKE(70,"like","LIKE"),
IN(80,"in","包含");
GT(">",">","大于"),
LT("<","<","小于"),
EQ("=","=","等于"),
NEQ("!=","!=","不等于"),
GTE(">=",">=","大于等于"),
LTE("<=","<=","小于等于"),
LIKE("like","like","LIKE"),
IN("in","in","包含");
private int value;
private String value;
private String code;
private String description;
HQL_EXPRESSION(int value, String code, String description) {
HQL_EXPRESSION(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
public String getValue() {
return value;
}
@ -45,38 +45,22 @@ public class MesEnumUtil {
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].description;
}
}
return tmp;
}
public static String codeOf(int val) {
String tmp = null;
public static String valueOfDesc(String val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
if (values()[i].value.equals(val)) {
return values()[i].description;
}
}
return tmp;
return null;
}
public static int descOf(String desc) {
int tmp = 1;
public static HQL_EXPRESSION codeOf(String value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
if (values()[i].value.equals(value)) {
return values()[i];
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
return null;
}
}
@ -5093,7 +5077,8 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BOARD_TYPE {
BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
private String code;
private String description;

128
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -139,6 +139,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2990,6 +2991,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -3177,6 +3179,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -3190,7 +3193,10 @@ public class WmsEnumUtil {
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {return descOf(desc);}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
}
@ -4200,7 +4206,8 @@ public class WmsEnumUtil {
}
}
/**分类
/**
* 分类
* 物流规则 处理单位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -4364,7 +4371,7 @@ public class WmsEnumUtil {
/**
* 日志推送至MQ的处理类型
* 规格层级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SPEC_LEVEL {
@ -4936,51 +4943,6 @@ public class WmsEnumUtil {
}
/**
* WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE {
TEXT(10, "text"), NUMBER(20, "number"),
SELECT(30, "select"), DATETIME(40, "datetime"),
LIST(50, "list");
private int value;
private String description;
FIELD_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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 FIELD_TYPE codeOf(Integer value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value==value) {
return values()[i];
}
}
return null;
}
}
/**
* 推送类型单位
* 默认为 10
*/
@ -5054,6 +5016,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -5067,7 +5030,10 @@ public class WmsEnumUtil {
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {return descOf(desc);}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
}
/**
@ -5302,69 +5268,6 @@ public class WmsEnumUtil {
}
/**
* 动态查询-下拉框规则
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_FIELD_SELECT_RULE {
SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"),
MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"),
SINGLE_URL(30, "SINGLE_URL", "单选接口"),
MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口");
private int value;
private String code;
private String description;
DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static DYNAMIC_FIELD_SELECT_RULE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 波次合并规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -5899,6 +5802,7 @@ public class WmsEnumUtil {
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
Unescape Escape View File

@ -69,7 +69,7 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "ITEM_QTY")
@ApiParam("原材料用量")
private String itemQty;
private Double itemQty;
@Column(name = "ITEM_UNIT")
@ApiParam("原材料单位")

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
import cn.estsh.i3plus.pojo.mes.bean.MesOee;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -48,4 +49,7 @@ public class BoardModel {
@ApiParam("看板设备明细")
private List<MesBoardEquDetail> boardEquDetailList;
@ApiParam("oee")
private List<MesOee> oeeList;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java
Unescape Escape View File

@ -7,5 +7,5 @@ import java.util.List;
@Data
public class FilterGroup {
private String andOr;
private List<FilterRuleAndOr> groups;
private List<FilterRules> groups;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java
Unescape Escape View File

@ -4,7 +4,7 @@ import lombok.Data;
@Data
public class FilterRule {
private String filed;
private String field;
private String op;
private String value;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Data;
import java.util.List;
@Data
public class FilterRuleAndOr {
public class FilterRules {
private String andOr;
private List<FilterRule> rules;
}

1
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java
Unescape Escape View File

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.model.common;
import lombok.Data;
import java.util.LinkedHashMap;
/**
* @Description :

9
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
Unescape Escape View File

@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.Map;
@ -20,9 +24,12 @@ import java.util.Map;
**/
@Data
@XStreamAlias("server")
@XmlRootElement(name ="server")
@XmlAccessorType(XmlAccessType.NONE)
public class SuitServerModel {
// 执行方法命令
@XmlElement
@ApiParam(value = "适配器code")
private String suitCaseCode;
/* 认证使用 以后使用 */
@ -31,6 +38,7 @@ public class SuitServerModel {
// 请求ID
private String requestId;
// 传输单对象
@XmlElement(name = "data")
private Object obj;
// 传输集合
private List list;
@ -44,6 +52,7 @@ public class SuitServerModel {
*/
// @XStreamImplicit
@XStreamCDATA
@XmlElement
private String suitMessage;
/**

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

@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable {
private static final long serialVersionUID = -6376845639646448495L;
@ApiParam(value = "系统名称")
public String systemName;
@ApiParam(value = "实体名称")
public String entityName;

1
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java
Unescape Escape View File

@ -31,6 +31,7 @@ import javax.persistence.Table;
@Api(value = "长数据", description = "长数据")
public class BsLongData extends BaseBean {
private static final long serialVersionUID = -329128754646765129L;
@Column(name = "REF_ID")
@ApiParam(value = "关联id")
private Long refId;

3
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
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;
@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean {
//CommonEnumUtil.HTTP_METHOD_TYPE
@Column(name = "REQUEST_METHOD_ID")
@ApiParam(value = "请求方式id")
@AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
private Integer requestMethodId;
@Transient

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean {
private static final long serialVersionUID = -1980207700343546396L;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custNo;
@Column(name = "CUST_NAME")
@ApiParam(value = "客户简称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custName;
@Column(name = "CUST_DESC")
@ApiParam(value = "客户全称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custDesc;
@Column(name = "CUST_ADDR")
@ApiParam(value = "客户地址")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custAddr;
@Column(name = "CUST_OWNER")
@ApiParam(value = "联系人")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custOwner;
@Column(name = "CUST_EMAIL")
@ApiParam(value = "邮箱")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custEmail;
@Column(name = "CUST_TEL")
@ApiParam(value = "电话号码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custTel;
@Column(name = "CUST_FAX")
@ApiParam(value = "传真")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custFax;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,18 +33,24 @@ public class BasVendor extends BaseBean{
private static final long serialVersionUID = 9214639813072592779L;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String vendorNo;
@Column(name="VENDOR_NAME")
@ApiParam("供应商简称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String vendorName;
@Column(name="VENDOR_DESC")
@ApiParam("供应商全称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String vendorDesc;
@Column(name = "USER_NAME")
@ApiParam("用户名")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
private String userName;
@Column(name="VENDOR_ADDR")
@ -51,46 +59,57 @@ public class BasVendor extends BaseBean{
@Column(name="VENDOR_OWNER")
@ApiParam("联系人")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorOwner;
@Column(name="VENDOR_EMAIL")
@ApiParam("邮箱")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorEmail;
@Column(name = "IS_ASN")
@ApiParam(value = "是否发ASN", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isAsn;
@Column(name = "PASSWORD")
@ApiParam(value = "密码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String password;
@Column(name = "VENDOR_CALL")
@ApiParam("供应商电话")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorCall;
@Column(name = "VENDOR_FAX")
@ApiParam("传真")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorFax;
@Column(name = "VENDOR_PHONE")
@ApiParam("手机")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorPhone;
@Column(name = "KILOBIT")
@ApiParam("千位符号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String kilobit;
@Column(name = "DECIMALS")
@ApiParam("小数位符号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String decimals;
//20-承运商
@Column(name = "VENDOR_TYPE")
@ApiParam("供应商类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE")
private Integer vendorType;
@Column(name = "MAP_LOCATION")
@ApiParam("经纬度")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String mapLocation;
public BasVendor() {

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String woekorderNo;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
private String pdlineNo;
@Column(name="PLAN_PRODUCT_TIME")
@ApiParam("生产日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String planProductTime;
@Column(name="SHIFT_NO")
@ApiParam("班次代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
private String shitNo;
@Column(name="START_PRODUCT_TIME")
@ApiParam("开始生产时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String startProductTime;
@Column(name="END_PRODUCT_TIME")
@ApiParam("结束生产时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String endProductTime;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS")
private Integer orderStatus = 0;
@Column(name="SEQ")
@ApiParam(value = "排序号", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer seq = 0;
public Integer getOrderStatus() {

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -41,7 +41,7 @@ public class QadBop implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Long id;
//get单独处理

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Long id;
//get单独处理

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -13,12 +13,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -45,7 +40,7 @@ public class SodDet implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Long id;
//get单独处理

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean {
private static final long serialVersionUID = -4332932784803175933L;
@Column(name = "ORDER_NO")
@ApiParam(value = "合同号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "VENDOR_CODE")
@ApiParam(value = "供应商代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorCode;
@Column(name = "VENDOR_NAME")
@ApiParam(value = "供应商名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
private String vendorName;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partName;
@Column(name = "CONSIGNMENT")
@ApiParam(value = "是否寄售")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer consignment=2;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -35,37 +35,37 @@ public class WareHouse extends BaseBean {
private static final long serialVersionUID = 7914396535326597148L;
@Column(name = "CODE")
@ApiParam("仓库代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String code;
@Column(name = "NAME")
@ApiParam("仓库名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String name;
@Column(name = "ADDRESS")
@ApiParam("仓库地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String address;
@Column(name = "WH_LENGTH")
@ApiParam(value = "长(单位：全局设置参数中的基本单元)")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer whLength;
@Column(name = "WH_WIDTH")
@ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer whWidth;
@Column(name = "WH_HEIGHT")
@ApiParam(value = "高(单位：全局设置参数中的基本单元)")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer whHeight;
@Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
@ApiParam(value = "基本单元（米）")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double baseUnit;
@Column(name = "MAP_LOCATION")

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,38 +34,63 @@ public class WmsAreaOwner extends BaseBean {
private static final long serialVersionUID = -5772266802563087135L;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String locateNo;
@Column(name="PART_NO")
@ApiParam("物料编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
public String partNameRdd;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorNo;
@Column(name = "OWNER_USER_NO")
@ApiParam(value = "负责人")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
private String ownerUserNo;
@Column(name = "IS_PRE_ASSIGN")
@ApiParam(value = "是否预分配人员")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isPreAssign;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
private String shiftNo;
@Transient

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,21 +32,21 @@ public class WmsBhChildDetectionItem extends BaseBean {
@Column(name = "CHECK_TYPE")
@ApiParam("检测大类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@Column(name = "ITEM_CHECK_CODE")
@ApiParam("子检测项代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemCheckCode;
@Column(name = "ITEM_CHECK_NAME")
@ApiParam("子检测项名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemCheckName;
@Column(name = "VALUE_TYPE")
@ApiParam("值类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
private Integer valueType;
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
@ -37,61 +38,61 @@ public class WmsBom extends BaseBean {
private static final long serialVersionUID = 5555657644784074446L;
@Column(name = "PART_NO")
@ApiParam(value = "父物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "父物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "UNIT")
@ApiParam(value = "计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String unit;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "数量")
@ColumnDefault("0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam(value = "子物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNo;
@Column(name = "ITEM_PART_NAM")
@ApiParam(value = "子料物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNam;
@Column(name = "ITEM_UNIT")
@ApiParam(value = "子计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemUnit;
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "子用量")
@ColumnDefault("0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double itemQty;
@Column(name = "BOM_NUM")
@ApiParam(value = "BOM编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomNum;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomVersion;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_START_TIME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String effStartTime;
@ -99,24 +100,24 @@ public class WmsBom extends BaseBean {
@ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_END_TIME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String effEndTime;
@Column(name = "LOCATE_NO")
@ApiParam(value = "线边库位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String locateNo;
@Column(name = "TERMINAL_NO")
@ApiParam(value = "工位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String terminalNo;
@Column(name = "BOM_TYPE")
@ApiParam(value = "BOM类型")
@ColumnDefault("10")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
@AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
private Integer bomType;

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
@ -35,61 +36,61 @@ import javax.persistence.Transient;
public class WmsBomHistory extends BaseBean {
@Column(name = "PART_NO")
@ApiParam(value = "父物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "父物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "UNIT")
@ApiParam(value = "计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String unit;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "数量")
@ColumnDefault("0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam(value = "子物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNo;
@Column(name = "ITEM_PART_NAM")
@ApiParam(value = "子料物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNam;
@Column(name = "ITEM_UNIT")
@ApiParam(value = "子计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemUnit;
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "子用量")
@ColumnDefault("0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double itemQty;
@Column(name = "BOM_NUM")
@ApiParam(value = "BOM编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomNum;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomVersion;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_START_TIME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String effStartTime;
@ -97,28 +98,28 @@ public class WmsBomHistory extends BaseBean {
@ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_END_TIME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String effEndTime;
@Column(name = "LOCATE_NO")
@ApiParam(value = "线边库位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String locateNo;
@Column(name = "TERMINAL_NO")
@ApiParam(value = "工位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String terminalNo;
@Column(name = "NEW_BOM_VERSION")
@ApiParam(value = "工位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String newBomVersion;
@Column(name = "BOM_TYPE")
@ApiParam(value = "BOM类型")
@ColumnDefault("10")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
@AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
private Integer bomType;

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 车辆信息
@ -32,37 +33,54 @@ public class WmsCar extends BaseBean {
@Column(name = "CAR_NO")
@ApiParam(value = "车牌号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String carNo;
@Column(name = "CAR_DESC")
@ApiParam(value = "车辆描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String carDesc;
@Column(name = "MAX_CAPACITY")
@ApiParam(value = "载重量(KG)")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String maxCapacity;
@Column(name = "DRIVER_NO")
@ApiParam(value = "默认驾驶员")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver",
searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo")
private String driverNo;
@Column(name = "PHONE")
@ApiParam(value = "车主电话")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String phone;
@Column(name = "VENDOR_NO")
@ApiParam(value = "所属供应商")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorNo;
@Transient
@ApiParam("司机名称")
@Column(name = "DRIVER_NAME_RDD")
@ApiParam("驾驶员名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver",
searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName")
private String driverNameRdd;
@Transient
@Column(name = "VENDOR_NAME_RDD")
@ApiParam(value = "供应商名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
private String vendorNameRdd;
@Column(name = "MAP_LOCATION")
@ApiParam("经纬度")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String mapLocation;
}

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

@ -1,20 +1,20 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :容器类型
@ -33,22 +33,27 @@ import javax.persistence.Transient;
public class WmsContainerType extends BaseBean {
private static final long serialVersionUID = 4849044986767609347L;
@ApiParam(value = "容器类型代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String ctCode;
@Column(name = "CT_NAME")
@ApiParam(value = "容器类型名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String ctName;
@Column(name = "USE_LIMIT")
@ApiParam(value = "使用期限")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private Integer useLimit;
@Column(name = "IS_RECYCLE")
@ApiParam(value = "是否回收")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isRecycle;
@Column(name = "LIMIT_UOM")
@ApiParam(value = "期限单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String limitUom;
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -37,77 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
@Column(name = "STRATEGY_NAME")
@ApiParam(value = "策略名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String strategyName;
@Column(name = "part_type")
@ApiParam(value = "物料分类")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC")
private String partType;
@Column(name = "STRATEGY_TYPE")
@ApiParam(value = "策略分类", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class)
private Integer strategyType;
@Column(name = "CYCLE_RULE")
@ApiParam(value = "循环规则")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String cycleRule;
@Column(name = "START_DATE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
@ApiParam(value = "开始日期", example = "0")
private String startDate;
@Column(name = "END_DATE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
@ApiParam(value = "结束日期", example = "0")
private String endDate;
@Column(name = "NUM_MAX")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
@ApiParam(value = "明细数量上限")
private Integer numMax;
@Column(name = "COVERAGE_RATE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
@ApiParam(value = "抽盘覆盖率")
private Double coverageRate;
@Column(name = "ZONE_NOS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam(value = "存储区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNos;
@Column(name = "LOCATES")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam(value = "盘点库位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String locates;
@Column(name = "last_run_time")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
@ApiParam(value = "上次运行时间")
private String lastRunTime;
@Column(name = "next_run_time")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
@ApiParam(value = "下次运行时间")
private String nextRunTime;
@Column(name = "REMAKE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@ApiParam(value = "备注")
private String remake;
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam(value = "已盘物料")
@Column(name = "INVENTORY_MATERIAL")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String inventoryMaterial;
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam(value = "已盘库位")
@Column(name = "INVENTORY_LOCATION")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String inventoryLocation;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 客户零件关系表
@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean {
private static final long serialVersionUID = 3903166651913139058L;
@Column(name = "CUSTOMER_CODE")
@ApiParam(value = "客户代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
private String customerCode;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam(value = "客户零件号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String customerPartNo;
@Transient
@Column(name = "CUSTOMER_DESC")
@ApiParam(value = "客户全称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc")
private String custDesc;
@Transient
@Column(name = "PART_NAME")
@ApiParam(value ="物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partName;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,21 +31,21 @@ import javax.persistence.Table;
public class WmsDock extends BaseBean {
@Column(name="DOCK_CODE")
@ApiParam("道口代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String dockCode;
@Column(name="DOCK_ADDRESS")
@ApiParam("道口发运地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String dockAddress;
@Column(name="DOCK_DESC")
@ApiParam("道口发运地址描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String dockDesc;
@Column(name="DOCK_TYPE")
@ApiParam("道口类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE")
private Integer dockType;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,42 +33,42 @@ public class WmsDockOrderInfo extends BaseBean {
@Column(name="DOCK_CODE")
@ApiParam("道口代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String dockCode;
@Column(name="ORDER_DATE")
@ApiParam("预约日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String orderDate;
@Column(name="WINDOW_TIME")
@ApiParam("窗口时间")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String windowTime;
@Column(name="ORDER_STATUS")
@ApiParam("预约状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS")
private Integer orderStatus;
@Column(name="SUPPLIER_CODE")
@ApiParam("供应商编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String supplierCode;
@Column(name="CAR_NO")
@ApiParam("车辆编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String carNo;
@Column(name="DRIVER_NAME")
@ApiParam("驾驶员")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String driverName;
@Column(name="ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Transient

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,11 +32,11 @@ public class WmsDockWindowTime extends BaseBean {
@Column(name="DOCK_CODE")
@ApiParam("道口代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String dockCode;
@Column(name="WINDOW_TIME")
@ApiParam("窗口时间")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String windowTime;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{
private static final long serialVersionUID = 3557978060450659460L;
@Column(name="PART_NO")
@ApiParam(value ="物料编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam(value ="物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name="START_DATE")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value ="开始日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String startDate;
@Column(name="END_DATE")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value ="结束日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String endDate;
@Column(name="LOT_QTY")
@ApiParam(value ="样本数量", example = "-1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer lotQty;
@Column(name="COUNTER")
@ApiParam(value ="已收货件数", example = "-1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer counter;
@Column(name="CHECK_COUNTER")
@ApiParam(value ="已抽点件数", example = "-1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer checkCounter;
@Transient

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean {
private static final long serialVersionUID = -8425904594036746967L;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String locateNo;
@Column(name = "LOCATE_NAME")
@ApiParam(value = "库位名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String locateName;
/**
@ -49,104 +50,106 @@ public class WmsLocate extends BaseBean {
@Column(name = "LOCATE_TYPE")
@ApiParam(value = "库位类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE")
private Integer locateType;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Column(name = "FURNITURE_NO")
@ApiParam(value = "家具代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String furnitureNo;
@Column(name = "X")
@ApiParam(value = "X", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer x;
@Column(name = "Y")
@ApiParam(value = "Y", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer y;
@Column(name = "Z")
@ApiParam(value = "Z", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer z;
@Column(name = "LC_LENGTH")
@ApiParam(value = "长")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer lcLength;
@Column(name = "LC_WIDTH")
@ApiParam(value = "宽")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer lcWidth;
@Column(name = "LC_HEIGHT")
@ApiParam(value = "高")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer lcHeight;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer seq;
@Column(name = "STATUS")
@ApiParam(value = "库位状态", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS")
private Integer status;
@Column(name = "MAX_PACKAGE_QTY")
@ApiParam(value = "最大包装数量", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer maxPackageQty;
@Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大零件数量", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double maxPartQty;
@Column(name = "STOCK_UNIT")
@ApiParam(value = "存放单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String stockUnit;
@Column(name = "LINE_CODE")
@ApiParam(value = "生产线")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String lineCode;
@Column(name = "BOX_QTY")
@ApiParam(value = "箱数", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer boxQty;
@Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "零件数", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double partQty;
@Column(name = "ENCRYPTION_NO")
@ApiParam(value = "加密编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String encryptionNo;
@Column(name = "LAST_CS_TIME")
@ApiParam(value = "末次盘点时间")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String lastCsTime;
@Column(name = "POSITION")

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean {
private static final long serialVersionUID = 9134745988014340144L;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "拉动数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double pullQty;
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最大值", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double max;
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最小值", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double min;
@Column(name = "IS_GENERATE_PICKLIST")
@ApiParam(value = "是否生成领料单", example = "2")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isGeneratePicklist;
@Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)")
@ApiParam(value = "安全库存", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double safetyStock;
@Column(name = "MOQ", columnDefinition = "decimal(18,8)")
@ApiParam(value = "起订量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double moq;
@Transient

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -37,41 +39,58 @@ public class WmsMoveDetails extends BaseBean {
private static final long serialVersionUID = -5898637337319011710L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String orderNo;
@Column(name = "ITEM")
@ApiParam(value = "行号", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Integer item;
@Column(name = "PART_NO")
@ApiParam("物料编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
public String partNameRdd;
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
public String vendorNo;
@Column(name = "CUST_NO")
@ApiParam("客户编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
public String custNo;
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "处理数量", example = "0")
@ColumnDefault("0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Double transQty;
@Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "已处理数量", example = "0")
@ColumnDefault("0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Double handledQty;
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "不合格处理数量", example = "0")
@ColumnDefault("0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Double rejectQty;
public Double getRejectQty() {
@ -80,30 +99,49 @@ public class WmsMoveDetails extends BaseBean {
@Column(name = "UNIT")
@ApiParam("单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String unit;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
public String srcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
public String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
public String srcLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
public String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
public String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
public String destLocateNo;
/**
@ -112,10 +150,12 @@ public class WmsMoveDetails extends BaseBean {
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS")
public Integer itemStatus;
@Column(name = "REF_ITEM")
@ApiParam("关联单据行号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refItem;
/**
@ -123,14 +163,17 @@ public class WmsMoveDetails extends BaseBean {
*/
@Column(name = "REF_TYPE")
@ApiParam("关联单据类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
public String refType;
@Column(name = "REF_SRC")
@ApiParam("关联单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refSrc;
@Column(name = "GROUP_NO")
@ApiParam("分组号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String groupNo;
@ApiParam(value = "待出库数量", example = "0")
@ -200,6 +243,7 @@ public class WmsMoveDetails extends BaseBean {
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer consignation = 2;
public Integer getIsSnapshot() {

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :容器类型
* @Description :包装规格
* @Reference :
* @Author : 容器类型
* @Author :
* @CreateDate : 2019-11-07 16:06
* @Modify:
* @Modify: 2020-04-27 修改头部描述-dragon
**/
@Data
@Entity
@ -30,34 +31,45 @@ import javax.persistence.Transient;
public class WmsPackageSpec extends BaseBean {
private static final long serialVersionUID = 4849044986767609445L;
@ApiParam(value = "包装规格代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String specCode;
@Column(name = "SPEC_NAME")
@ApiParam(value = "包装规格名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String specName;
@Column(name = "QTY")
@ApiParam(value = "包装数量")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double qty;
@Column(name = "PARENT_SPEC")
@ApiParam(value = "上级规格")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode")
private String parentSpec;
@Column(name = "SPEC_LEVEL")
@ApiParam(value = "规格层级")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL")
private Integer specLevel;
@Column(name = "IS_MIXED")
@ApiParam(value = "是否混包")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isMixed;
@Column(name = "POCKET_TYPE")
@ApiParam(value = "容器类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode")
private String pocketType;
@ApiParam(value = "上级规格名称")
@Transient
@Column(name = "PARENT_NAME")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName")
private String parentName;
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -32,237 +33,239 @@ import javax.persistence.*;
@Api("物料表")
public class WmsPart extends BaseBean {
private static final long serialVersionUID = 4849044986767609346L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_SPEC")
@ApiParam(value = "物料规格")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partSpec;
@Column(name = "PART_TYPE_DESC")
@ApiParam(value = "物料类型描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partTypeDesc;
@Column(name = "PART_TYPE")
@ApiParam(value = "物料类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class)
private String partType;
@Column(name = "PART_TYPE_DESC")
@ApiParam(value = "物料类型描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partTypeDesc;
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String stockUnit;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String inLocateNo;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标包", example = "1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double snp;
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "是否免检", example = "1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer iqc;
@Column(name = "PART_SPEC")
@ApiParam(value = "物料规格")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partSpec;
@Column(name = "GRAPHI_NO")
@ApiParam(value = "图号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String graphiNo;
@Column(name = "VERSION")
@ApiParam(value = "版本")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String version;
@Column(name = "COLOR")
@ApiParam(value = "颜色")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String color;
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String stockUnit;
@Column(name = "ABC")
@ApiParam(value = "分类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String abc;
@Column(name = "BUY_UNIT")
@ApiParam(value = "采购单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String buyUnit;
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double bu2su;
@Column(name = "PRICE_UNIT")
@ApiParam(value = "计价单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String priceUnit;
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double pu2su;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标包", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double snp;
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "是否免检", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer iqc;
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double min;
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double max;
@Column(name = "PART_GROUP")
@ApiParam(value = "物料组")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String partGroup;
@Column(name = "LOT_CHECK_RULE")
@ApiParam(value = "批次校验规则")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String lotCheckRule;
@Column(name = "SN_CONTROL")
@ApiParam(value = "是否条码管理", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer snControl;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String inLocateNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String prodCfgTypeCode;
@Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String prodCfgTypeName;
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseFlag = "2";
@Column(name = "OUT_CLOSE_TYPE")
@ApiParam("结算方式")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseType;
@Column(name = "OUT_CLOSE_VENDOR")
@ApiParam("结算供应商")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String outCloseVendor;
@Column(name = "QUALITY_DAYS")
@ApiParam("保质期天数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer qualityDays;
@Column(name = "IS_REPORT_PARTNO")
@ApiParam("是否报工零件")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isReportPartNo;
@Column(name = "REPORT_LOCATE_NO")
@ApiParam("报工库位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String reportLocateNo;
@Column(name = "REPORT_ZONE_NO")
@ApiParam("报工存储区")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String reportZoneNo;
@Column(name = "PRODUCT_LINES")
@ApiParam("报工产线")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
private String productLines;
@Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
@ApiParam(value = "待质检比例", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double proportion;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;
@Transient
@ApiParam("总数量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
@Transient
@ApiParam("库存水平")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String stockLevelStatus;
@Column(name = "verb_num")
@ApiParam(value = "单次拆包数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot = 2;
@Column(name = "PULL_WAY")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM,
isRequire = 2, entityName = "PULL_WAY_STATUS")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式")
private String pullWay;
@Column(name = "TAIL_QTY_MODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE")
@ApiParam(value = "尾数计算方式", example = "1")
private Integer tailQtyMode;
@Column(name = "CYCLE_RQUEST_PERIOD")
@ApiParam(value = "循环补货周期", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer cycleRquestPeriod = 0;
@Column(name = "CYCLE_RQUEST_QTY")
@ApiParam(value = "循环补货数量", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double cycleRquestQty = 0d;
@Column(name = "CURING_TIME")
@ApiParam(value = "固化时间", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double curingTime = 0d;
public int getIqcVal() {

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,26 +32,26 @@ public class WmsPartCheckType extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partName;
@Column(name = "CHECK_TYPE")
@ApiParam("检测大类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@Column(name = "SAMPLE_SIZE")
@ApiParam("样本数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer sampleSize;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -39,121 +39,121 @@ public class WmsPartExtend extends BaseBean {
@Column(name = "IS_SETTLE")
@ApiParam(value = "是否内部交易")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isSettle;
@Column(name = "SETTLE_FACTORY_CODE")
@ApiParam(value = "结算工厂")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String settleFactoryCode;
@Column(name = "SETTLE_REC_ERP_WH")
@ApiParam(value = "结算物料收货库存")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String settleRecErpWh;
@Column(name = "VALUATION_CLASS")
@ApiParam(value = "评估类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String valuationClass;
@Column(name = "VALUATION_CLASS_NAME")
@ApiParam(value = "评估类描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String valuationClassName;
@Column(name = "MC_CODE")
@ApiParam(value = "MRP控制者")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String mcCode;
@Column(name = "MC_NAME")
@ApiParam(value = "MRP控制者名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String mcName;
@Column(name = "IS_STEEL")
@ApiParam(value = "是否为钢卷料")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE")
private Integer isSteel;
@Column(name = "IS_PACKAGE_MATERIAL")
@ApiParam(value = "是否为包材")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isPackageMaterial;
@Column(name = "RECEIVING_TYPE")
@ApiParam(value = "收货类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String receivingType;
@Column(name = "LOT_CONTROL")
@ApiParam(value = "批次控制")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String lotControl;
@Column(name = "RANGE_LOT")
@ApiParam(value = "批次容差")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer rangeLot;
@Column(name = "QUALITY_RATE")
@ApiParam(value = "质检率")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double qualityRate;
@Column(name = "ROUTING")
@ApiParam(value = "工艺")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String routing;
@Column(name = "PO_PART_MULTIPLE")
@ApiParam(value = "乘倍包装")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String poPartMultiple;
@Column(name = "RANGE_QTY_RATE")
@ApiParam(value = "数量容差")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer rangeQtyRate;
@Column(name = "RANGE_INVENTORY")
@ApiParam(value = "盘点容差")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer rangeInventory;
@Column(name = "PROD_LINE")
@ApiParam(value = "产品类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String prodLine;
@Column(name = "SUPPLY_TYPE")
@ApiParam(value = "供货类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE")
private Integer supplyType;
@Column(name = "RECEIVING_MODE")
@ApiParam(value = "收货方式")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD")
private Integer receivingMethod;
@Column(name = "PRE_RECEIVING_DAY")
@ApiParam(value = "预收货天数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer preReceivingDay;
@Column(name = "IS_WAY_CALCULATION")
@ApiParam(value = "是否计算在途库存")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isWayCalculation;
@Column(name = "IS_AUTO_PURCHASE")
@ApiParam(value = "是否自动采购")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isAutoPurchase;
@Column(name = "AUTO_PURCHASE_QTY")
@ApiParam(value = "自动采购数量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer autoPurchaseQty;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{
private static final long serialVersionUID = 9214639813072864436L;
@Column(name="PART_GROUP_NO")
@ApiParam("物料组编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partGroupNo;
@Column(name="PART_GROUP_NAME")
@ApiParam("物料组名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partGroupName;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,46 +32,46 @@ public class WmsPartItemCheck extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partNo;
@Column(name = "CHECK_TYPE")
@ApiParam("检测大类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@Column(name = "CHECK_ITEM_CODE")
@ApiParam("子检测项代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkItemCode;
@Column(name = "CHECK_ITEM_NAME")
@ApiParam("子检测项名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkItemName;
@Column(name = "VALUE_TYPE")
@ApiParam("子检测箱值类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
private Integer valueType;
@Column(name = "STANDARD")
@ApiParam("标准值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer standard;
@Column(name = "MAX")
@ApiParam("最大值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double max;
@Column(name = "MIN")
@ApiParam("最小值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double min;
}

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

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -16,11 +14,11 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :容器类型
* @Description :物料包装关系
* @Reference :
* @Author : 容器类型
* @Author :
* @CreateDate : 2019-11-07 16:06
* @Modify:
* @Modify: 2020-04-27 修改头部描述-dragon
**/
@Data
@Entity

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean {
private static final long serialVersionUID = -131043081244530896L;
@Column(name="PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String prodCfgTypeCode;
@Column(name="PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String prodCfgTypeName;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -31,21 +30,21 @@ import javax.persistence.Table;
public class WmsPullRule extends BaseBean {
@Column(name = "PULL_WAY")
@ApiParam(value = "拉动类型", example = "10")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS")
private Integer pullWay;
@Column(name = "CONTAIN_UNFINISH_ORDER")
@ApiParam(value = "考虑未完成的移库单", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer containUnfinishOrder;
@Column(name = "CONTAIN_EXIST_PERIOD")
@ApiParam(value = "考虑现有库存", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer containExistStock;
@Column(name = "TAIL_QTY_MODE")
@ApiParam(value = "尾数计算方式", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE")
private Integer tailQtyMode;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String woekorderNo;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
private String pdlineNo;
@Column(name="PLAN_PRODUCT_TIME")
@ApiParam("生产日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String planProductTime;
@Column(name="SHIFT_NO")
@ApiParam("班次代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift",
searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo")
private String shitNo;
@Column(name="START_PRODUCT_TIME")
@ApiParam("开始生产时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String startProductTime;
@Column(name="END_PRODUCT_TIME")
@ApiParam("结束生产时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String endProductTime;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS")
private Integer orderStatus = 0;
@Column(name="IS_SUSPEND")
@ApiParam(value = "是否暂停", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isSuspend = 2;
@Column(name="PULL_TASK_TYPE")
@ApiParam(value = "拉动任务类型", example = "10")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE")
private Integer pullTaskType;
@Column(name="SEQ")
@ApiParam(value = "排序号", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer seq;
public Integer getOrderStatus() {

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean {
private static final long serialVersionUID = 2701710669030092148L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String orderNo;
/**
@ -43,6 +46,7 @@ public class WmsQCMaster extends BaseBean {
@Column(name = "ORDER_TYPE")
@ApiParam(value = "业务类型", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE")
public Integer orderType;
/**
@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean {
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS")
public Integer orderStatus;
@Column(name = "REMARK")
@ApiParam("备注")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String remark;
@Column(name = "CUST_NO")
@ApiParam("客户编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
public String custNo;
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
public String vendorNo;
@Column(name = "VERSION")
@ApiParam(value = "版本", example = "1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Integer version;
@Column(name = "REF_TYPE")
@ApiParam("关联单号类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
public String refType;
@Column(name = "REF_SRC")
@ApiParam("关联单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refSrc;
@Transient
@Column(name = "CUST_NAME")
@ApiParam(value = "客户简称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo")
private String custName;
@Transient
@ApiParam(value = "供应商简称")
@Column(name = "VENDOR_DESC")
@ApiParam(value = "供应商全称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo")
private String VendorDesc;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK")
public Integer isTask;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件", example = "2")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
public Integer isPart;
@Transient

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean {
private static final long serialVersionUID = 7759454799191378612L;
@Column(name = "ROUTING_CODE")
@ApiParam(value = "线路代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String routingCode;
@Column(name = "ROUTING_NAME")
@ApiParam(value = "线路名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String routingName;
@Column(name = "ROUTING_DESC")
@ApiParam(value = "线路描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String routingDesc;
@Column(name = "FOR_PROUCT_CLASS")
@ApiParam(value = "适用产品分类")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer forProductClass;
@Column(name = "FOR_WAREHOUSE")
@ApiParam(value = "适用仓库", example ="1")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer forWareHouse;
@Column(name = "FOR_PRODUCT")
@ApiParam(value = "适用产品")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer forProduct;
@Transient

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shiftNo;
@Column(name="SHIFT_NAME")
@ApiParam("班次名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shiftName;
@Column(name="START_TIME")
@ApiParam("开始时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String startTime;
@Column(name="END_TIME")
@ApiParam("结束时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String endTime;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,45 +34,60 @@ public class WmsShippingFlag extends BaseBean {
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo")
private String custNo;
@Column(name = "FLAG_NO")
@ApiParam(value = "客户发往地编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String flagNo;
@Column(name = "FLAG_NAME")
@ApiParam(value = "客户发往地名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String flagName;
@Column(name = "SHIPP_QTY")
@ApiParam(value = "发运数量控制")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer shippQty;
@Column(name = "FLAG_DESC")
@ApiParam(value = "全称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagDesc;
@Column(name = "FLAG_ADDR")
@ApiParam(value = "客户发往地址")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagAddr;
@Column(name = "FLAG_OWNER")
@ApiParam(value = "联系人")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagOwner;
@Column(name = "FLAG_EMAIL")
@ApiParam(value = "邮箱")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagEmail;
@Column(name = "FLAG_TEL")
@ApiParam(value = "联系人电话")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagTel;
@Column(name = "FLAG_FAX")
@ApiParam(value = "传真")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String flagFax;
@Column(name="TEMPLATE_NO")
@ApiParam("模板编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/wms/label/sys-label-template/cloud-query",
searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode")
private String templateNo;
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -34,7 +35,7 @@ public class WmsSnOperateRecord extends BaseBean {
@Column(name = "SN")
@ApiParam(value = "条码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String sn;
@Column(name = "LINE_CODE")
@ -77,12 +78,12 @@ public class WmsSnOperateRecord extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam(value = "操作类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE")
private Integer operateType;
@Column(name = "ref_sn")
@ApiParam(value = "关联二维码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String refSN;
}

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -12,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@ -52,75 +50,107 @@ public class WmsStockSn extends BaseBean {
private static final long serialVersionUID = 4869307400585363697L;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name = "LOT_NO", nullable = false)
@ApiParam("收货批次")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String lotNo = "";
@Column(name = "DATE_CODE", nullable = false)
@ApiParam(value = "供应商批次")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String dateCode = "";
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String fixLotNo = "";
@Column(name = "QUALITY_DATE")
@ApiParam("保质期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String qualityDate;
@Column(name = "LEFT_CODE", nullable = false)
@ApiParam(value = "生产批次")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String leftCode = "";
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
public String vendorNo;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
private String custNo;
@Column(name = "SHIPPING_FLAG")
@ApiParam(value = "发往地")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shippingFlag;
@Column(name = "SN")
@ApiParam(value = "条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String sn;
@Column(name = "SN_2D")
@ApiParam(value = "二维码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String sn2d;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String packageNo;
@Column(name = "UNIT")
@ApiParam(value = "单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String unit;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty = 0d;
/**
@ -128,49 +158,58 @@ public class WmsStockSn extends BaseBean {
*/
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS")
private Integer qcStatus;
/**
* 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
*/
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS")
private Integer snStatus;
/**
* 1:已打印；2：未打印；3：退料生成条码
*/
@Column(name = "PRINTED")
@ApiParam(value = "是否打印", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS")
private Integer printed;
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private Date pdate;
/**
* 1=ASN,10=PO,20=SO
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String refType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String refSrc;
@Column(name = "CUST_SN")
@ApiParam(value = "客户条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custSn;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String workCenterCode;
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE")
private Integer snType = 10;
@ApiParam(value = "仓库名称")

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -35,21 +35,21 @@ public class WmsSubPart extends BaseBean {
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "SUB_PART_NO")
@ApiParam(value = "替代物料编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String subPartNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "SUB_PART_NAME")
@ApiParam(value = "替代物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String subPartName;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
/**
* @Description : 工位表
@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{
private static final long serialVersionUID = 9214639813072592713L;
@Column(name="TERMINAL_NO")
@ApiParam("工位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String terminalNo;
@Column(name="TERMINAL_NAME")
@ApiParam("工位名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String terminalName;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
private String pdlineNo;
}

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,33 +33,41 @@ public class WmsTmsDriver extends BaseBean {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String driverNo;
@Column(name="DRIVER_NAME")
@ApiParam(value ="驾驶员姓名")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String driverName;
@Column(name="SEX")
@ApiParam(value ="驾驶员性别")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer sex;
@Column(name="AGE")
@ApiParam(value ="驾驶员年龄")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String age;
@Column(name="ID_NO")
@ApiParam(value ="驾驶员身份证号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String idNo;
@Column(name="ADRESS")
@ApiParam(value ="驾驶员籍贯")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String adress;
@Column(name="PHONE")
@ApiParam(value ="车牌号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String phone;
@Column(name="LOGIN_NO")
@ApiParam(value =" 登录账号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String loginNo;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,30 +38,47 @@ public class WmsTransQuan extends BaseBean {
private static final long serialVersionUID = -7379945456037422449L;
@Column(name = "TRANS_NO")
@ApiParam(value = "事务编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String transNo;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name = "UNIT")
@ApiParam(value = "单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String unit;
@Column(name = "TRANS_STATUS")
@ -76,75 +95,95 @@ public class WmsTransQuan extends BaseBean {
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String refSrc;
@Column(name = "TRANS_CODE")
@ApiParam(value = "交易代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String transCode;
@Column(name = "MOVE_NO")
@ApiParam(value = "库存移动单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String moveNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorNo;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo")
private String custNo;
@Column(name = "ERROR_MESSAGE")
@ApiParam(value = "错误信息")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String errorMessage;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "可用数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Double qty;
@Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "不合格数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double failQty;
@Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "隔离数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double holdQty;
@Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "质检中数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double qcQty;
@Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "待入库数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double rinQty;
@Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "冻结数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double freezeQty;
@Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "寄售数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double consignQty;
@Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "锁定数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double lockQty;
@Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double scrapQty;
@Column(name="TRANS_TYPE_NAME")
@ApiParam(value ="交易名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String transTypeName;
/*@Transient

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -43,46 +44,46 @@ public class WmsTransportRule extends BaseBean {
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE")
public Integer busiType;
@Column(name = "BUSI_SCENE_TYPE")
@ApiParam("业务场景")
@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE")
public Integer busiSceneType;
@Column(name = "SRC_AREA_NO")
@ApiParam("发货库存地")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String srcAreaNo;
@Column(name = "DEST_AREA_NO")
@ApiParam("目标库存地")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String destAreaNo;
@Column(name = "OUT_VENDOR_NO")
@ApiParam("委外供应商编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String outVendorNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String partNo;
@Column(name = "CUST_NO")
@ApiParam("客户编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String custNo;
@Column(name = "IS_TRANSPORT")
@ApiParam("是否安排运输")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
public Integer isTransport;
@Column(name = "REMARK",length = 255)

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,14 +33,17 @@ public class WmsUnit extends BaseBean {
private static final long serialVersionUID = 7332606009041273554L;
@Column(name = "UNIT_CODE")
@ApiParam(value = "单位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String unitCode;
@Column(name = "UNIT_NAME")
@ApiParam(value = "单位名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String unitName;
@Column(name = "UNIT_PRECISION")
@ApiParam(value = "单位精度")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer unitPrecision;
public Integer getUnitPrecisionValue(){

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,14 +33,17 @@ public class WmsUnitConvert extends BaseBean {
private static final long serialVersionUID = -466720560879335877L;
@Column(name = "UNIT_CODE")
@ApiParam(value = "单位代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String unitCode;
@Column(name = "DEST_UNIT_CODE")
@ApiParam(value = "目标单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String destUnitCode;
@Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double unitCoefficient;
public Double getUnitCoefficientVal() {

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 供应商零件关系
@ -32,10 +33,16 @@ public class WmsVendorPart extends BaseBean {
private static final long serialVersionUID = 7339520734918140529L;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "VENDOR_PART_NO")
@ -44,14 +51,20 @@ public class WmsVendorPart extends BaseBean {
@Column(name = "MAX_AMOUNT")
@ApiParam(value = "供应商月提供最大数量")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double maxAmount;
@Transient
@Column(name = "PART_NO_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partName;
@Transient
@Column(name = "VENDOR_NAME")
@ApiParam("供应商名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
private String vendorName;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,30 +33,43 @@ public class WmsWorkCenter extends BaseBean {
private static final long serialVersionUID = 415180808859365167L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam(value = "工作中心名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String workCenterName;
@Column(name = "ERP_WORK_CENTER")
@ApiParam(value = "ERP_工作中心")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String erpWorkCenter;
@Column(name = "WORK_VER")
@ApiParam(value = "生产版本")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String workVer;
@Column(name = "SRC_ZONE_NO")
@ApiParam(value = "原料扣减库区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String srcZoneNo;
@Column(name = "DESC_ZONE_NO")
@ApiParam(value = "成品库区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String descZoneNo;
@Column(name = "DESC_LOCATION_CODE")
@ApiParam(value = "成品库位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String descLocationCode;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 工作中心线边库区关系
@ -28,21 +29,33 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Api(value="工作中心线边库区关系",description = "工作中心线边库区关系")
public class WmsWorkCenterZone extends BaseBean {
private static final long serialVersionUID = 950689993212839817L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
private String workCenterCode;
@Column(name = "ZONE_NO")
@ApiParam(value = "线边库区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Transient
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter",
searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName")
private String workCenterName;
@Transient
@Column(name = "ZONE_NAME")
@ApiParam("线边库区名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneName")
private String zoneName;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,42 +34,57 @@ public class WmsZonePart extends BaseBean{
private static final long serialVersionUID = 9214639813072592546L;
@Column(name="ZONE_NO")
@ApiParam("存储区编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
private String zoneNo;
@Column(name="PART_NO")
@ApiParam("物料编码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name="PULL_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "拉动数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double pullQty;
@Column(name="MAX", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "最大值", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double max;
@Column(name="MIN", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "最小值", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double min;
@Column(name = "IS_GENERATE_PICKLIST")
@ApiParam(value = "是否生成领料单", example = "2")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isGeneratePickList;
@Column(name="MOQ", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "起订量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double moq;
@Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "安全量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double safetyQty;
}

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

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -35,82 +35,82 @@ public class WmsZones extends BaseBean {
private static final long serialVersionUID = 7759454799191378612L;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String whNo;
@Column(name = "AREA_NO")
@ApiParam(value = "库存地代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String zoneNo;
@Column(name = "ZONE_NAME")
@ApiParam(value = "存储区名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String zoneName;
@Column(name = "PARENT_ZONE_NO")
@ApiParam(value = "父级存储区", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String parentZoneNo;
@Column(name = "IS_SON_NODE")
@ApiParam(value = "是否子节点")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "TRUE_OR_FALSE")
private Integer isSonNode;
@Column(name = "IS_PM")
@ApiParam(value = "零件级管控", example = "2")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isPm;
@Column(name = "IS_LM")
@ApiParam(value = "批次级管控", example = "2")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isLm;
@Column(name = "IS_SN")
@ApiParam(value = "条码级管控", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isSn;
@Column(name = "IS_MIX")
@ApiParam(value = "允许混淆", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isMix;
@Column(name = "IS_SC")
@ApiParam(value = "库容检查", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isSc;
@Column(name = "STRATEGY")
@ApiParam(value = "堆放策略")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String strategy;
@Column(name = "IS_NEGATIVE")
@ApiParam(value = "允许负库存", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer isNegative;
@Column(name = "CHECK_FIFO")
@ApiParam(value = "校验先进先出", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer checkFifo;
@Column(name = "ZONE_LENGTH")
@ApiParam(value = "长")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer zoneLength;
@Column(name = "ZONE_WIDTH")
@ApiParam(value = "宽")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Integer zoneWidth;
@Column(name = "POSITION")
@ -119,17 +119,17 @@ public class WmsZones extends BaseBean {
@Column(name = "ZONE_PULL_WAY")
@ApiParam(value = "补货方式", example = "10")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "ZONE_PULL_WAY")
private Integer zonePullWay;
@Column(name = "PULL_CYCLE")
@ApiParam(value = "固定拉动周期", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer pullCycle;
@Column(name = "LAST_PULL_TIME")
@ApiParam(value = "上次拉动时间")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private String lastPullTime;
@Transient

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

@ -7,10 +7,8 @@ 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.Index;
import javax.persistence.Table;
import javax.persistence.*;
/**
* @Description : WMS字段信息表
@ -21,10 +19,14 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_FIELDINFO", indexes = {
@Table(name = "WMS_FIELDINFO",
indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "ENTITY_NAME")
})
@Index(columnList = "ENTITY_NAME")},
uniqueConstraints = {
@UniqueConstraint(columnNames = {
"FIELD_NAME", "ENTITY_NAME"})}
)
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -109,7 +111,15 @@ public class WmsFieldInfo extends BaseBean {
@ApiParam(value = "回显列名")
private String explicitColumnName;
@Column(name = "DYNAMIC_FIELD_SELECT_RULE")
@Column(name = "IS_MULTIPLE")
@ApiParam(value = "是否多选")
private Integer isMultiple;
@Column(name = "DATA_SRC")
@ApiParam(value = "数据来源")
private String dataSrc;
@Column(name = "GET_VAL_WAY")
@ApiParam(value = "下拉框规则")
private Integer selectRule;
private Integer getValWay;
}

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

@ -89,9 +89,9 @@ public class WmsListElement extends BaseBean {
@ApiParam(value = "字段类型")
private Integer fieldType;
@Column(name = "DYNAMIC_FIELD_SELECT_RULE")
@Column(name = "DYNAMIC_FIELD_GET_WAY")
@ApiParam(value = "下拉框规则")
private Integer selectRule;
private Integer getValWay;
@Column(name = "ENTITY_NAME")
@ApiParam(value = "实体名称")

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -19,19 +20,19 @@ import lombok.Data;
public class WmsPartItemCheckModel {
@ApiParam("子检测项代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkItemCode;
@ApiParam("子检测项名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkItemName;
@ApiParam("子检测箱值类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
private Integer valueType;
@ApiParam("检测值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double checkValue;
@ApiParam("是否合格")
@ -39,15 +40,15 @@ public class WmsPartItemCheckModel {
public Integer isQualified;
@ApiParam("标准值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer standard;
@ApiParam("最大值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double max;
@ApiParam("最小值")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double min;
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -2964,7 +2964,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result);
DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result);
DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result);
getStringBuilderPack(wmsFieldInfo, result);
return result;
}

Write Preview
Loading…
Cancel
Save