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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
许心洁 5 years ago
parent 51d60a107a bf71cd07d0
commit 28ce8615fd
54 changed files with 696 additions and 370 deletions
Show Stats Download Patch File Download Diff File

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

@ -10,7 +10,7 @@ import java.lang.annotation.*;
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.TYPE})
public @interface FieldAnnotation {
public @interface DynamicField {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
// 条件表达式:>,<,>=等

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.base.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
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 com.alibaba.fastjson.annotation.JSONField;
@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
public Long id;
//get单独处理
@ -64,19 +64,19 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE")
@ApiParam(value ="组织代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
// @AnnoOutputColumn(hidden = true)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ApiParam(value = "有效性",example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
@ApiParam(value = "是否已删除",example = "2")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA
@ -84,64 +84,64 @@ public abstract class BaseBean implements Serializable {
@Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String createUser;
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String createDatetime;
@Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String modifyUser;
@Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String modifyDatetime;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
@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)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
@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)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
@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)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String modifyDateTimeEnd;
@Transient
@ApiParam(value = "排序属性")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String orderByParam = "";
@Transient
@ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
public transient Integer ascOrDesc = 1;

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

@ -1843,151 +1843,6 @@ public class BlockFormEnumUtil {
}
}
/**
* 数据库连接方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
private int value;
private String code;
private String description;
private String driverClassName;
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
this.value = value;
this.code = code;
this.description = description;
this.driverClassName = driverClassName;
this.defaultPort = port;
this.defaultSchemaPattern = defaultSchemaPattern;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getDriverClassName() {
return driverClassName;
}
public int getDefaultPort() {
return defaultPort;
}
public String getDefaultSchemaPattern() {
return defaultSchemaPattern;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 DATA_SOURCE_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
public String getJDBCUrl(String database,String host,Integer port){
if(this.getValue() == SOURCE_MARIA_DB.getValue()){
return getJDBCUrlMySQL(database,host,port);
}else if(this.getValue() == SOURCE_ORACLE.getValue()){
return getJDBCUrlOracle(database,host,port);
}else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
return getJDBCUrlPostgreSQL(database,host,port);
}else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
return getJDBCUrlSQLServer(database,host,port);
}
return null;
}
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){
return SOURCE_MARIA_DB;
}else if(databaseProductName.indexOf(":oracle:") != -1){
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}
}
return null;
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
}
private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
return "jdbc:postgresql://"+host+":"+port+"/"+database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_STATUS {
CONN_SUCCESS(10, "连接成功", "连接成功"),

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

@ -331,6 +331,7 @@ public class BlockSoftSwitchEnumUtil {
/**
* 数据库连接方式
*/
@Deprecated // 不建议使用 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),

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

@ -38,7 +38,7 @@ public class CommonEnumUtil {
HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8400, 15, "APS", "高级计划与排程"),
APS(28, 8400, 15, "i3aps", "高级计划与排程"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
@ -1397,17 +1397,17 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SQL_WHERE {
EQUAL(1, " = ", "等于"),
NOT_EQUAL(2, " <> ", "不等于"),
MORE(3, " > ", "大于"),
LESS(4, " < ", "小于"),
MORE_OR_EQUAL(5, " >= ", "大于等于"),
LESS_OR_EQUAL (6, " <= ", "小于等于"),
LIKE(7, " LIKE ", "全模糊"),
START_LIKE(7, " LIKE ", "前模糊"),
END_LIKE(7, " LIKE ", "后模糊"),
IN(8, " IN ", " in "),
BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),;
EQUAL(10, " = ", "等于"),
NOT_EQUAL(11, " <> ", "不等于"),
MORE(20, " > ", "大于"),
LESS(30, " < ", "小于"),
MORE_OR_EQUAL(21, " >= ", "大于等于"),
LESS_OR_EQUAL (31, " <= ", "小于等于"),
LIKE(40, " LIKE ", "全模糊"),
START_LIKE(41, " LIKE ", "前模糊"),
END_LIKE(52, " LIKE ", "后模糊"),
IN(50, " IN ", " in "),
BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),;
private int value;
private String code;
@ -1724,4 +1724,150 @@ public class CommonEnumUtil {
}
}
/**
* 数据库连接方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
private int value;
private String code;
private String description;
private String driverClassName;
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
this.value = value;
this.code = code;
this.description = description;
this.driverClassName = driverClassName;
this.defaultPort = port;
this.defaultSchemaPattern = defaultSchemaPattern;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getDriverClassName() {
return driverClassName;
}
public int getDefaultPort() {
return defaultPort;
}
public String getDefaultSchemaPattern() {
return defaultSchemaPattern;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 DATA_SOURCE_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
public String getJDBCUrl(String database,String host,Integer port){
if(this.getValue() == SOURCE_MARIA_DB.getValue()){
return getJDBCUrlMySQL(database,host,port);
}else if(this.getValue() == SOURCE_ORACLE.getValue()){
return getJDBCUrlOracle(database,host,port);
}else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
return getJDBCUrlPostgreSQL(database,host,port);
}else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
return getJDBCUrlSQLServer(database,host,port);
}
return null;
}
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){
return SOURCE_MARIA_DB;
}else if(databaseProductName.indexOf(":oracle:") != -1){
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}
}
return null;
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
}
private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
return "jdbc:postgresql://"+host+":"+port+"/"+database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
}
}

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

@ -50,14 +50,14 @@ public class MesEnumUtil {
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -3419,7 +3419,8 @@ public class MesEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;

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

@ -16,49 +16,14 @@ public class MesPcnEnumUtil {
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_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;
}
}
/**
* JIS发运是否按主队列顺序扫描
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_TYPE {
TRUE(10, "是"),
FALSE(20, "否");
private int value;
private String description;
MES_JIS_SCAN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -86,7 +51,7 @@ public class MesPcnEnumUtil {
* JIS发运队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QUEUE_JIS_STATUS {
public enum JIS_QUEUE_STATUS {
TRUE(10, "已发运"),
FALSE(20, "未发运");
@ -94,7 +59,7 @@ public class MesPcnEnumUtil {
private int value;
private String description;
MES_QUEUE_JIS_STATUS(int value, String description) {
JIS_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1530,7 +1495,10 @@ public class MesPcnEnumUtil {
/**
* 数据库连接方式
* wei.peng
* Copy 代码禁止修改枚举内容,整合枚举会产生兼容性问题 ;
*/
@Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
@ -2513,7 +2481,8 @@ public class MesPcnEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;

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

@ -4913,4 +4913,36 @@ public class WmsEnumUtil {
}
}
/**
* 自定义列表：优先级 (CUSTOMIZE_PROP)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUSTOMIZE_PROP {
DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义");
private int value;
private String description;
CUSTOMIZE_PROP(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
}

28
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java
Unescape Escape View File

@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "QUEUE_NO")
@ApiParam("显示主队列数")
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型组")
private String produceCategoryCode;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
}

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :JIS发运队列
@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Transient
@ApiParam("颜色")
private String color;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java
Unescape Escape View File

@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
@ApiParam("状态")
private Integer status;
@Column(name = "FINAL_STATUS")
@ApiParam("明细整体状态")
private Integer finalStatus;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

38
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_TIME")
@Api("工步参数")
public class MesTime extends BaseBean {
@Column(name = "MODULE")
@ApiParam("组件")
private String module;
@Column(name = "ELAPSE")
@ApiParam("耗时")
private Long elapse;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
}

20
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java
Unescape Escape View File

@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable {
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("明细整体状态")
private Integer finalStatus;
@ApiParam("状态名称")
private String statusName;
@ApiParam("明细状态名称")
private String detailStatusName;
@ApiParam("明细整体状态名称")
private Integer finalStatusName;
@ApiParam("颜色")
private String color;
public String getStatusName() {
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status);
}
public String getDetailStatusName() {
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus);
}
public String getFinalStatusName() {
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus);
}
public QueueJisModel() {
}
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) {
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) {
this.jisNo = jisNo;
this.vinCode = vinCode;
this.carNo = carNo;
@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable {
this.produceCategoryCode = produceCategoryCode;
this.detailStatus = detailStatus;
this.serialNumber = serialNumber;
this.finalStatus = finalStatus;
}
}

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java
Unescape Escape View File

@ -49,4 +49,7 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("图片路径")
private String imageUrl;
@ApiParam("多个数据集")
private List<StationResultBean<T>> stationResultBeans;
}

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java
Unescape Escape View File

@ -0,0 +1,10 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime;
import org.springframework.stereotype.Repository;
@Repository
public interface MesTimeRepository extends BaseRepository<MesTime, Long> {
}

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

@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "QUEUE_NO")
@ApiParam("显示主队列数")
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理队列数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型组")
private String produceCategoryCode;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
}

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

@ -26,7 +26,7 @@ import java.util.List;
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN"),
@Index(columnList = "partNo")
@Index(columnList = "PART_NO")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {

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

@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
@ApiParam("状态")
private Integer status;
@Column(name = "FINAL_STATUS")
@ApiParam("发运整体状态")
private Integer finalStatus;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

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

@ -2105,8 +2105,8 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(patternJis.getPatternNo())) {
DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean);
}
if (!StringUtils.isEmpty(patternJis.getTopNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean);
if (!StringUtils.isEmpty(patternJis.getQueueNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean);
}
if (!StringUtils.isEmpty(patternJis.getHandleNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);

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

@ -30,6 +30,9 @@ public class ClassFieldModel implements Serializable {
@ApiParam(value ="属性名")
private String fieldName;
@ApiParam(value ="字段名称")
private String fieldColumnName;
@ApiParam(value ="属性类型名称")
private String fieldTypeName;

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

@ -40,6 +40,9 @@ public class ClassModel implements Serializable {
@ApiParam(value ="类名")
private String clzSimpleName;
@ApiParam(value ="表名称名")
private String clzTableName;
@ApiParam(value ="类全名")
private String clzFullName;

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.report;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -17,7 +18,8 @@ public class BrDataSourceModel {
/**
* 默认数据源信息
*/
public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", null, null, "使用默认数据源");
public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT",
CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源");
@ApiParam(value ="数据源名称")
private String sourceName;

17
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.model.report;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.report.bean.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -71,18 +72,18 @@ public class TemplateModel implements Serializable {
@ApiParam(value = "跨服务调用解析后数据")
private Object option;
@ApiParam(value = "分页参数")
private Pager pager;
@ApiParam(value = "页面查询条件")
private Map<String,Object> findParam;
@ApiParam("执行 HQL ")
private String selectHql;
private String selectSql;
@ApiParam("执行 HQL 返回数量")
private String countSql;
@ApiParam("执行 HQL 返回数量")
private String countHql;
//
// @ApiParam("执行 HQL 参数名称 ")
// private String[] paramName;
//
// @ApiParam("执行 HQL 参数值 ")
// private Object[] paramValue;
private String querySql;
}

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

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElement;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElement;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

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

@ -19,6 +19,9 @@ public class WmsSearchGroupModel {
@ApiParam(value = "组列表")
private List<WmsSearchElementModel> searchElementModelList;
@ApiParam(value = "排序参数")
private String orderByParams;
@ApiParam(value = "分页组件")
private Pager pager;
}

42
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java
Unescape Escape View File

@ -55,21 +55,21 @@ public class BrPojo extends BaseBean {
@ApiParam(value ="数据源编码")
private String sourceCode;
@Column(name="SOURCE_TYPE")
@ApiParam(value ="数据源类型")
private Integer sourceType;
@Column(name="SOURCE_NAME")
@ApiParam(value ="数据源名称")
private String sourceName;
@Column(name="POJO_PACKAGE_CODE")
@ApiParam(value ="对象全路径")
private String pojoPackageCode;
@Column(name="POJO_CODE")
@ApiParam(value ="对象代码")
private String pojoCode;
@Column(name="POJO_TABLE_NAME")
@ApiParam(value ="对象表名称")
private String pojoTableName;
@Column(name="POJO_CODE_ALIAS")
@ApiParam(value ="对象别名")
private String pojoCodeAlias;
@Column(name="POJO_TABLE_NAME_ALIAS")
@ApiParam(value ="对象表别名")
private String pojoTableNameAlias;
@Column(name="pojo_name")
@ApiParam(value ="对象名称")
@ -79,9 +79,9 @@ public class BrPojo extends BaseBean {
@ApiParam(value ="对象排序")
private Integer pojoSort;
@Column(name="POJO_ATTR")
@Column(name="POJO_COLUMN_NAME")
@ApiParam(value ="连接属性")
private String pojoAttr;
private String pojoColumnName;
@Column(name="JOIN_TYPE")
@ApiParam(value ="连接关系")
@ -107,20 +107,20 @@ public class BrPojo extends BaseBean {
private String joinPojoNameRdd;
@Column(name="JOIN_POJO_CODE_RDD")
@ApiParam(value ="连接对象代码")
private String joinPojoCodeRdd;
@ApiParam(value ="连接对象名称")
private String joinTableNameRdd;
@Column(name="JOIN_POJO_CODE_ALIAS_RDD")
@ApiParam(value ="连接对象别名")
private String joinPojoCodeAliasRdd;
@ApiParam(value ="连接对象表别名")
private String joinTableNameAliasRdd;
@Column(name="JOIN_POJO_ATTR")
@ApiParam(value ="连接对象属性")
private String joinPojoAttr;
@Column(name="JOIN_COLUMN_NAME")
@ApiParam(value ="连接字段名称")
private String joinColumnName;
@Column(name="POJO_HQL")
@Column(name="POJO_SQL")
@ApiParam(value ="对象名称")
private String pojoHql;
private String pojoSql;
@Column(name="POJO_DESCRIPTION")
@ApiParam(value ="对象描述")

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

@ -52,17 +52,17 @@ public class BrPojoAttr extends BaseBean {
@ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
private String packageNameRdd;
@Column(name="POJO_NAME_ALIAS")
@Column(name="POJO_TABLE_NAME_ALIAS")
@ApiParam(value ="对象别名")
private String pojoNameAlias;
private String pojoTableNameAlias;
@Column(name="ATTR_NAME")
@Column(name="ATTR_COLUMN_NAME")
@ApiParam(value ="属性别名")
private String attrName;
private String attrColumnName;
@Column(name="ATTR_NAME_ALIAS")
@Column(name="ATTR_COLUMN_NAME_ALIAS")
@ApiParam(value ="属性别名")
private String attrNameAlias;
private String attrColumnNameAlias;
@Column(name="PARENT_ID")
@ApiParam(value ="上级ID",example = "-1")

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

@ -53,21 +53,25 @@ public class BrPojoFilterAttr extends BaseBean {
@ApiParam(value ="对象名称")
private String pojoNameRdd;
@Column(name="POJO_CODE_RDD")
@ApiParam(value ="对象代码")
private String pojoCodeRdd;
@Column(name="POJO_TABLE_NAME_RDD")
@ApiParam(value ="对象表名称")
private String pojoTableNameRdd;
@Column(name="POJO_CODE_ALIAS_RDD")
@Column(name="POJO_TABLE_NAME_ALIAS_RDD")
@ApiParam(value ="对象别名")
private String pojoCodeAliasRdd;
private String pojoTableNameAliasRdd;
@Column(name="POJO_ATTR")
@Column(name="POJO_COLUMN_NAME")
@ApiParam(value ="对象属性")
private String pojoAttr;
private String pojoColumnName;
@Column(name="PACKAGE_POJO_ATTR")
// @Column(name="POJO_CODE_NAME")
// @ApiParam(value ="对象属性")
// private String pojoCodeName;
//
@Column(name="POJO_TABLE_COLUMN_NAME")
@ApiParam(value ="对象属性全路径")
private String packagePojoAttr;
private String pojoTableColumnName;
/************************************** 属性信息 **************************************/

23
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java
Unescape Escape View File

@ -48,21 +48,26 @@ public class BrPojoViewAttr extends BaseBean {
@ApiParam(value = "对象名称")
private String pojoNameRdd;
@Column(name = "POJO_CODE_RDD")
@Column(name = "POJO_TABLE_NAME_RDD")
@ApiParam(value = "对象代码")
private String pojoCodeRdd;
private String pojoTableNameRdd;
@Column(name = "POJO_CODE_ALIAS_RDD")
@Column(name = "POJO_TABLE_NAME_ALIAS_RDD")
@ApiParam(value = "对象别名")
private String pojoCodeAliasRdd;
private String pojoTableNameAliasRdd;
@Column(name="POJO_ATTR")
@Column(name="POJO_COLUMN_NAME")
@ApiParam(value ="对象属性")
private String pojoAttr;
private String pojoColumnName;
@Column(name="PACKAGE_POJO_ATTR")
@ApiParam(value ="对象属性全路径")
private String packagePojoAttr;
// @Column(name="POJO_CODE_NAME")
// @ApiParam(value ="对象属性")
// private String pojoCodeName;
//
// @Column(name="PACKAGE_POJO_ATTR")
// @ApiParam(value ="对象属性全路径")
// private String packagePojoAttr;
@Column(name="VIEW_ATTR_ALIAS")
@ApiParam(value ="视图属性别名")

4
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
Unescape Escape View File

@ -192,9 +192,9 @@ public class ReportHqlPack {
DdlPreparedPack.getNumEqualPack(pojo.getJoinType(),"joinType",result);
DdlPreparedPack.getNumEqualPack(pojo.getPojoType(),"pojoType",result);
DdlPreparedPack.getNumEqualPack(pojo.getWhereType(),"whereType",result);
DdlPreparedPack.getStringEqualPack(pojo.getPojoCodeAlias(),"pojoCodeAlias",result);
DdlPreparedPack.getStringEqualPack(pojo.getPojoTableNameAlias(),"pojoTableNameAlias",result);
DdlPreparedPack.getStringLikerPack(pojo.getPojoName(),"pojoName",result);
DdlPreparedPack.getStringLikerPack(pojo.getPojoCode(),"pojoCode",result);
DdlPreparedPack.getStringLikerPack(pojo.getPojoTableName(),"pojoTableName",result);
return result;
}

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -41,7 +41,7 @@ public class QadBop implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = WmsEnumUtil.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

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

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

@ -196,7 +196,7 @@ public class WmsMoveDetails extends BaseBean {
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
private Integer consignation = 2;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
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 io.swagger.annotations.Api;
@ -35,216 +35,216 @@ public class WmsPart extends BaseBean {
private static final long serialVersionUID = 4849044986767609346L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_SPEC")
@ApiParam(value = "物料规格")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partSpec;
@Column(name = "PART_TYPE")
@ApiParam(value = "物料类型")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
private String partType;
@Column(name = "PART_TYPE_DESC")
@ApiParam(value = "物料类型描述")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partTypeDesc;
@Column(name = "GRAPHI_NO")
@ApiParam(value = "图号")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String graphiNo;
@Column(name = "VERSION")
@ApiParam(value = "版本")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String version;
@Column(name = "COLOR")
@ApiParam(value = "颜色")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String color;
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String stockUnit;
@Column(name = "ABC")
@ApiParam(value = "分类")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String abc;
@Column(name = "BUY_UNIT")
@ApiParam(value = "采购单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String buyUnit;
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率1", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double bu2su;
@Column(name = "PRICE_UNIT")
@ApiParam(value = "计价单位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String priceUnit;
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ApiParam(value = "换算率2", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double pu2su;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标包", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double snp;
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "是否免检", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer iqc;
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最低库存", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double min;
@Column(name = "MAX", columnDefinition = "decimal(18,8)")
@ApiParam(value = "最高库存", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double max;
@Column(name = "PART_GROUP")
@ApiParam(value = "物料组")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partGroup;
@Column(name = "LOT_CHECK_RULE")
@ApiParam(value = "批次校验规则")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String lotCheckRule;
@Column(name = "SN_CONTROL")
@ApiParam(value = "是否条码管理", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer snControl;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String inLocateNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String prodCfgTypeCode;
@Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String prodCfgTypeName;
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseFlag = "2";
@Column(name = "OUT_CLOSE_TYPE")
@ApiParam("结算方式")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseType;
@Column(name = "OUT_CLOSE_VENDOR")
@ApiParam("结算供应商")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseVendor;
@Column(name = "QUALITY_DAYS")
@ApiParam("保质期天数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer qualityDays;
@Column(name = "IS_REPORT_PARTNO")
@ApiParam("是否报工零件")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
private Integer isReportPartNo;
@Column(name = "REPORT_LOCATE_NO")
@ApiParam("报工库位")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String reportLocateNo;
@Column(name = "REPORT_ZONE_NO")
@ApiParam("报工存储区")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String reportZoneNo;
@Column(name = "PRODUCT_LINES")
@ApiParam("报工产线")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String productLines;
@Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
@ApiParam(value = "待质检比例", example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double proportion;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;
@Transient
@ApiParam("总数量")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
@Transient
@ApiParam("库存水平")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String stockLevelStatus;
@Column(name="verb_num")
@ApiParam(value = "单次拆包数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot = 2;
@Column(name = "PULL_WAY")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式", example = "0")
private Integer pullWay = 0;
@Column(name = "CYCLE_RQUEST_PERIOD")
@ApiParam(value = "循环补货周期", example = "0")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer cycleRquestPeriod = 0;
@Column(name = "CYCLE_RQUEST_QTY")
@ApiParam(value = "循环补货数量", example = "0")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double cycleRquestQty = 0d;
public int getIqcVal(){

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

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 物料组信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_PART_GROUP")
@Api("物料组信息")
public class WmsPartGroup extends BaseBean{
private static final long serialVersionUID = 9214639813072864436L;
@Column(name="PART_GROUP_NO")
@ApiParam("物料组编号")
private String partGroupNo;
@Column(name="PART_GROUP_NAME")
@ApiParam("物料组名称")
private String partGroupName;
}

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

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 物料组明细信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_PART_GROUP_DETAILS")
@Api("物料组明细信息")
public class WmsPartGroupDetails extends BaseBean{
private static final long serialVersionUID = 9214639813072864444L;
@Column(name="PART_GROUP_NO")
@ApiParam("物料组编号")
private String partGroupNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
private String partNameRdd;
}

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

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 物料组物流路线信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_PART_GROUP_ROUTE")
@Api("物料组物流路线信息")
public class WmsPartGroupRoute extends BaseBean{
private static final long serialVersionUID = 9214639813072864438L;
@Column(name="PART_GROUP_NO")
@ApiParam("物料组编号")
private String partGroupNo;
@Column(name = "ROUTING_CODE")
@ApiParam(value = "线路代码")
private String routingCode;
@Column(name = "ROUTING_NAME")
@ApiParam(value = "线路名称")
private String routingName;
}

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

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
package cn.estsh.i3plus.pojo.wms.bean.dynamictable;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;

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

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
package cn.estsh.i3plus.pojo.wms.bean.dynamictable;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
package cn.estsh.i3plus.pojo.wms.bean.dynamictable;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
package cn.estsh.i3plus.pojo.wms.bean.dynamictable;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;

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

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
package cn.estsh.i3plus.pojo.wms.bean.dynamictable;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
import org.springframework.stereotype.Repository;
/**

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElementFunction;
import org.springframework.stereotype.Repository;
/**

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElement;
import org.springframework.stereotype.Repository;
/**

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :物料组明细信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 15:17
* @Modify:
**/
@Repository
public interface WmsPartGroupDetailsRepository extends BaseRepository<WmsPartGroupDetails,Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup;
import org.springframework.stereotype.Repository;
/**
* @Description :物料组信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 15:17
* @Modify:
**/
@Repository
public interface WmsPartGroupRepository extends BaseRepository<WmsPartGroup,Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute;
import org.springframework.stereotype.Repository;
/**
* @Description :物料组物流路线信息
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-01-15 15:17
* @Modify:
**/
@Repository
public interface WmsPartGroupRouteRepository extends BaseRepository<WmsPartGroupRoute,Long> {
}

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
import org.springframework.stereotype.Repository;
/**

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElement;
import org.springframework.stereotype.Repository;
/**

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

@ -7,9 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@ -2772,4 +2771,54 @@ public class WmsHqlPack {
getStringBuilderPack(searchElementFunction, result);
return result;
}
/**
* 物料组信息分页查询条件
*
* @param wmsPartGroup
* @return
*/
public static DdlPackBean packHqlWmsPartGroup(WmsPartGroup wmsPartGroup) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupNo(), "partGroupNo", result);
DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupName(), "partGroupName", result);
getStringBuilderPack(wmsPartGroup, result);
return result;
}
/**
* 物料组物流路线信息分页查询条件
*
* @param wmsPartGroupRoute
* @return
*/
public static DdlPackBean packHqlWmsPartGroupRoute(WmsPartGroupRoute wmsPartGroupRoute) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsPartGroupRoute.getPartGroupNo(), "partGroupNo", result);
getStringBuilderPack(wmsPartGroupRoute, result);
return result;
}
/**
* 物料组物流路线信息分页查询条件
*
* @param wmsPartGroupDetails
* @return
*/
public static DdlPackBean packHqlWmsPartGroupDetails(WmsPartGroupDetails wmsPartGroupDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsPartGroupDetails.getPartGroupNo(), "partGroupNo", result);
getStringBuilderPack(wmsPartGroupDetails, result);
return result;
}
}

1
pom.xml
Unescape Escape View File

@ -31,6 +31,7 @@
<module>modules/i3plus-pojo-mes-pcn</module>
<module>modules/i3plus-pojo-sweb</module>
<module>modules/i3plus-pojo-andon</module>
<module>modules/i3plus-pojo-aps</module>
<module>modules/i3plus-pojo-lac</module>
<module>modules/i3plus-pojo-ptl</module>
<module>modules/i3plus-pojo-ptl-pcn</module>

Write Preview
Loading…
Cancel
Save