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
陈思洁 6 years ago
parent 5feae0dd1a 2d30f2da0f
commit babc158ed6
53 changed files with 636 additions and 350 deletions
Show Stats Download Patch File Download Diff File

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

@ -121,14 +121,17 @@ public class Material extends BaseAPS {
@Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小库存数量")
@FieldAnnotation(property = false)
private Double minStockCount;
@Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="安全库存数量")
@FieldAnnotation(property = false)
private Double safeStockCount;
@Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大库存数量")
@FieldAnnotation(property = false)
private Double maxStockCount;
@Column(name="ORDER_BATCH_PERIOD")

6
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

@ -9,8 +9,8 @@ import java.lang.annotation.*;
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
public @interface FieldAnnotation {
@Target({ElementType.FIELD, ElementType.TYPE})
public @interface DynamicField {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
// 条件表达式:>,<,>=等
@ -33,4 +33,6 @@ public @interface FieldAnnotation {
int isShow() default 1;
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String enumName() default "";
}

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";
}
}
}

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

@ -3379,7 +3379,7 @@ public class MesEnumUtil {
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
STOP_PCS_CTL("stopPcsCtl", "停止监控");
private String value;

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

@ -1530,13 +1530,16 @@ public class MesPcnEnumUtil {
/**
* 数据库连接方式
* wei.peng
* Copy 代码禁止修改枚举内容,整合枚举会产生兼容性问题 ;
*/
@Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
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;

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

@ -4875,4 +4875,81 @@ public class WmsEnumUtil {
}
}
/**
* 流程提交类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;
private String description;
GROUP_COMMIT_MODE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public int getCode() {
return code;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 自定义列表：优先级 (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;
}
}
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -266,6 +266,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val);
}
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名

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;
}

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

@ -19,11 +19,11 @@ public class StepResult<T> {
private String msg;
public static StepResult getSuccessComplete() {
return new StepResult(true);
return new StepResult(true,"");
}
public static StepResult getNonComplete() {
return new StepResult(false);
return new StepResult(false,"");
}
public static StepResult getSuccessComplete(String msg) {

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> {
}

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

@ -29,7 +29,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN")
@Index(columnList = "KP_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "ITEM_PART_NO")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {

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

@ -26,7 +26,8 @@ import java.math.BigDecimal;
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean {

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

@ -26,6 +26,7 @@ import javax.persistence.*;
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("产品条码履历表")

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

@ -25,7 +25,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN")
@Index(columnList = "SN"),
@Index(columnList = "PART_NO")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@ -93,4 +94,24 @@ public class MesQcCheckData extends BaseBean {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("班次")
private String shiftCode;
@Transient
@ApiParam("班组")
private String shiftGroupName;
@Transient
@ApiParam("班长")
private String squadLeader;
@Transient
@ApiParam("工作单元名称")
private String workCellName;
}

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

@ -27,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {

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

@ -1822,13 +1822,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
@ -1849,10 +1849,12 @@ public class MesHqlPack {
// mesProduceSn.getOutWorkCenterEndTime(),
// "outWorkCenterTime", packBean, true);
}
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1865,11 +1867,11 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean);
if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean);
@ -1892,15 +1894,17 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
/**
* 物料追溯
* 包装明细
*
* @param ifPackageDetail
* @param organizeCode
@ -1931,10 +1935,10 @@ public class MesHqlPack {
public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
@ -1951,10 +1955,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1968,15 +1974,15 @@ public class MesHqlPack {
public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode);
if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
if (mesQcCheckData.getCheckType() != null) {
DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
@ -1985,10 +1991,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -2005,13 +2013,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean);
@ -2028,10 +2036,12 @@ public class MesHqlPack {
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
}
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return 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;
}

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

@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String vendorEmail;
@ApiParam(value = "集装箱号")
@Transient
public String containerNo;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();

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;

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -17,4 +18,10 @@ 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单独处理

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

@ -2,6 +2,7 @@ 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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean {
@AnnoOutputColumn
private Integer autoInit;
// 1=true, 2 = false
@Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
@ApiParam(value = "是否连带提交创建状态移动单", example = "2")
@AnnoOutputColumn
private Integer isCommitRefMove;
@Column(name = "COMMIT_MODE", nullable = false)
@ApiParam(value = "提交移动单模式")
@AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class)
private Integer commitMode;
// 1=true, 2 = false
@Column(name = "IS_AUTO_COMMIT", nullable = false)
@ApiParam(value = "是否自动提交", example = "1")
@ApiParam(value = "是否自动提交")
@AnnoOutputColumn
private Integer isAutoCommit;
@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean {
return this.endAmId == null ? 0 : this.endAmId.longValue();
}
public int getIsCommitRefMoveVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
public int getCommitModeVal() {
return this.commitMode == null ? 0 : this.commitMode.intValue();
}
public int getIsAutoCommitVal() {

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

@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean {
this.organizeCode = organizeCode;
this.qty=qty;
}
public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){
this.orderNo=orderNo;
this.partNo=partNo;
this.partNameRdd=partNameRdd;
this.qty=qty;
this.factQty=factQty;
this.locateNo=locateNo;
}
}

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

@ -1,5 +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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean {
@Column(name = "LOCATE_NO")
@ApiParam("库位编号")
@AnnoOutputColumn(hidden = true)
public String locateNo;
@Column(name = "UNIT")
@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean {
public String unit;
@Transient
@ApiParam("存储区编号")
@ApiParam("存储区编号组")
@AnnoOutputColumn(hidden = true)
public String[] zoneNos;
public WmsCSRange(){}

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

@ -187,4 +187,8 @@ public class WmsDocMovementMaster extends BaseBean {
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}
public int getBusiTypeVal() {
return this.busiType == null ? 0 : this.busiType;
}
}

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

@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean {
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
@Column(name="PACK_SPEC")
@ApiParam(value = "包装规格")
public String packSpec;
@Column(name="POCKET_NO")
@ApiParam(value = "容器编号")
public String pocketNo;
@Column(name="PRINT_STATUS")
@ApiParam(value = "打印状态", example = "1")
public Integer printStatus;
@Column(name="PACK_LEVEL")
@ApiParam(value = "包装层级", example = "1")
public Integer packLevel;
@Column(name="MEMO")
@ApiParam(value = "备注")
public String memo;
}

85
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,215 +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)
@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)
@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)
@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)
@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)
@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 = "单次拆包数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
@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)
@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(){

6
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;
@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean {
@ApiParam(value = "字段类型")
private String fieldType;
@Column(name = "ENUM_NAME")
@ApiParam(value = "字段枚举名称")
private String enumName;
@Column(name = "ENTITY_NAME")
@ApiParam(value = "实体名称")
private String entityName;

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;

7
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;
@ -21,6 +21,7 @@ import javax.persistence.*;
@Entity
@Table(name="WMS_SEARCHELEMENT", indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "FIELD_TYPE"),
@Index(columnList = "SEARCH_NAME"),
@Index(columnList = "USER_CODE")
})
@ -40,6 +41,10 @@ public class WmsSearchElement extends BaseBean {
@ApiParam(value = "标题名称")
private String titleName;
@Column(name = "FIELD_TYPE")
@ApiParam(value = "字段类型")
private String fieldType;
@Column(name = "CONDITION_EXPRE")
@ApiParam(value = "条件表达式:>,<,>=等")
private String conditionExpre;

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;
/**

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;
/**

39
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;
@ -171,11 +170,33 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(swebProcurementPlanOrder, packBean);
return packBean;
}
/**
* 物理包装封装
*
* @param wmsPackage
* @return
*/
public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(wmsPackage, packBean);
return packBean;
}
/**
* 库存移动单查询封装
*
* @param wmsDocMovementMaster
@ -231,7 +252,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
@ -635,6 +656,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result);
// 查询计划时间在指定范围的单号，查询这些单号的数据
if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
@ -1064,7 +1086,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
// DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -1365,6 +1387,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
getStringBuilderPack(wmsCSOrderDetails, result);
@ -2434,6 +2458,9 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result);
DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRouting, result);
@ -2739,8 +2766,8 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
getStringBuilderPack(searchElementFunction, 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