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

yun-zuoyi
andly.pan 4 years ago
commit f2cca59ee5

3
.gitignore vendored

@ -13,4 +13,5 @@ target
.md
*.log
*.properties
.DS_Store
.DS_Store
pom.xml

@ -41,6 +41,10 @@ public class FurnacePlan extends BaseAPS {
@ApiParam(value ="容量限制")
private Double capacityLimit;
@Column(name="MIN_PRODUCT_BATCH")
@ApiParam(value ="最小加工批量")
private Integer minProductBatch;
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
}

@ -49,6 +49,10 @@ public class HeuristicRule extends BaseRule {
@FieldAnnotation(defaultValue = "true")
private Boolean insertIdle;
@Column(name="WAITING_TIME")
@ApiParam(value ="最大等待时间")
private String waitingTime;
@Column(name="BATCH_PERIOD")
@ApiParam(value ="组炉区间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)

@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS {
private static final long serialVersionUID = -1869359887027950540L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@ApiParam(value ="工作编码")
@FieldAnnotation(relation = "Work")
private Long workId;
@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS {
}
@JsonBackReference
public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
}

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
@ -160,14 +162,13 @@ public class Work extends BaseAPS {
@FieldAnnotation(property = false)
private Long mainPlanId;
// @Column(name="DYN_SPLIT_WORK_ID")
// @ApiParam(value ="动态拆分的工作ID")
// private Long dynSplitWorkId;
@Column(name="ORIGIN_WORK_ID")
@ApiParam(value ="动态拆分工作ID")
private Long originWorkId;
// 排程时,找插入位置的评估值
private transient double evaluateValue = 0;
private transient boolean hasOptimized = false;
public BaseOrder getOrder() {
@ -265,4 +266,7 @@ public class Work extends BaseAPS {
this.originWorkId = work != null ? work.getId() : 0;
BeanRelation.set(this, EWork.OriginWork, work);
}
@JsonBackReference
public List<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
}

@ -19,6 +19,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
/**
* @Description :
@ -77,6 +78,8 @@ public class WorkPlan extends BaseAPS {
@Column(name="PRODUCE_END")
@ApiParam(value ="生产结束时间")
@FieldAnnotation(modify = false)
@RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd",
"PostPlan.produceEnd"}, method = "calcReverse")
private Date produceEnd;
@Column(name="PRODUCE_TIME")

@ -95,6 +95,10 @@ public class WorkResource extends BaseAPS {
@Min(0)
private Double capacity;
@Column(name="MIN_PRODUCT_BATCH")
@ApiParam(value ="最小加工批量")
private Integer minProductBatch;
@Column(name="RES_CAPACITY_ID")
@ApiParam(value ="设备能力id")
@FieldAnnotation(property = false)

@ -15,4 +15,5 @@ public enum EWork {
SpecifyResource, // 指定资源
DynSplitWorks, // 动态拆分后的工作
OriginWork, // 动态拆分前的工作
EvaluateResult, // 资源评估结果
}

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool;
public class APSDoubleTool {
public static boolean isZero(Double value) {
return (value == null) || (value > -0.000001 && value < 0.000001);
return (value == null) || (value > -0.0000001 && value < 0.0000001);
}
}

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="InterMediateResult">
<Relation field="Work" name="Work" type="MULTI_TO_ONE">
</Relation>
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">

@ -22,4 +22,6 @@
</Relation>
<Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
</Relation>
<Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -444,6 +444,7 @@ public class ApsEnumUtil {
PRODUCE_TIME("PRODUCE_TIME", "生产时间"),
POST_SET_TIME("POST_SET_TIME", "后设置时间"),
WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"),
WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"),
RES_BALANCE("RES_BALANCE", "资源均衡度"),
SAME_MATERIAL("SAME_MATERIAL", "相同物料"),
SAME_ORDER("SAME_ORDER", "相同订单"),
@ -769,8 +770,11 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_TYPE {
// 工作不参与排程
FICTITIOUS("FICTITIOUS", "虚拟工作"),
// 动态虚拟工作为不计算生产时间。
DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"),
// 此工作参与排程
NORMAL("NORMAL", "普通工作");
private String value;

@ -1085,7 +1085,8 @@ public class ImppEnumUtil {
WORK_WECHAT(8, "企业微信配置"),
SMS(9, "短信配置"),
SSO(10, "单点登录配置"),
PASSWORD_EXPIRE(11, "密码过期策略");
PASSWORD_EXPIRE(11, "密码过期策略"),
DINGTALK_REDIRECT(12, "钉钉授权跳转");
private final int value;
private final String description;
@ -1645,7 +1646,8 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTH_LOGIN_STRATEGY {
ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"),
E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略");
E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略"),
NAME(30, "Name", "nameLoginStrategy", "用户名登录");
private final int value;
private final String code;

@ -3693,6 +3693,7 @@ public class MesPcnEnumUtil {
WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"),
WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"),
WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"),
WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"),
WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"),
WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件");

@ -1,5 +1,9 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import java.math.BigDecimal;
import java.net.URL;
import java.sql.*;
/**
* @author Wynne.Lu
* @date 2021/3/22 5:16
@ -8,8 +12,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
public class ScreenEnumUtil {
public enum DATA_OBJECT_SOURCE {
TABLE(10, "TABLE", "数据库表"),
VIEW(20, "VIEW", "数据库视图");
TABLE(1, "TABLE", "数据库表"),
VIEW(2, "VIEW", "数据库视图");
private Integer value;
private String code;
@ -42,6 +46,185 @@ public class ScreenEnumUtil {
}
return tmp;
}
public static Integer codeOfValue(String code) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static DATA_OBJECT_SOURCE valueOfEnum(Integer value) {
DATA_OBJECT_SOURCE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i];
}
}
return tmp;
}
}
public enum SCREEN_TYPE {
PC(10, "PC", "PC端"),
PDA(20, "PDA", "PDA手持端");
private Integer value;
private String code;
private String description;
SCREEN_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum ACTION_TYPE {
FRONT(10, "FRONT", "前端"),
BACKEND(20, "BACKEND", "后端");
private Integer value;
private String code;
private String description;
ACTION_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum NULLABLE {
YES(10, "YES", "允许为空"),
NO(20, "NO", "不允许为空");
private Integer value;
private String code;
private String description;
NULLABLE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 static NULLABLE valueOfEnum(Integer value) {
NULLABLE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i];
}
}
return tmp;
}
}
public enum INDEX_TYPE {
PRIMARY(10, "PRIMARY", "主键"),
NORMAL(20, "NORMAL", "普通索引"),
UNIQUE(30, "UNIQUE", "唯一键");
private Integer value;
private String code;
private String description;
INDEX_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum DEFAULT_FIELD_IN_DB {
@ -205,6 +388,16 @@ public class ScreenEnumUtil {
return tmp;
}
public static ACTION codeOfEnum(String code) {
ACTION tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equalsIgnoreCase(code)) {
tmp = values()[i];
}
}
return tmp;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -291,5 +484,238 @@ public class ScreenEnumUtil {
}
}
public enum MODEL_TYPE {
DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"),
INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型");
private Integer value;
private String code;
private String description;
MODEL_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum DATETIME_FORMAT {
DATETIME(10, "yyyy-MM-dd HH:mm:ss", "日期"),
DATE(20, "yyyy-MM-dd", "日期"),
TIME(30, "HH:mm:ss", "时间"),
TIME_NO_SECOND(40, "HH:mm", "时间(无秒)");
private Integer value;
private String code;
private String description;
DATETIME_FORMAT(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum MODEL_FIELD_DATASOURCE {
FROM_TEXT(10, "TEXT", "文本"),
FROM_NUMBER(20, "NUMBER", "数字"),
FROM_PASSWORD(30, "PASSWORD", "密码"),
FROM_DATETIME(40, "DATETIME", "时间"),
FROM_PICK_UP(50, "PICK_UP", "拾取"),
FROM_ENUM(60, "ENUM", "枚举"),
FROM_DICTIONARY(70, "DICTIONARY", "字典"),
FROM_API(80, "API", "API调用");
private Integer value;
private String code;
private String description;
MODEL_FIELD_DATASOURCE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum AUTH_TYPE {
ROW(10, "ROW", "行"),
COLUMN(20, "COLUMN", "列");
private Integer value;
private String code;
private String description;
AUTH_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
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 enum JDBC_TYPES {
BIT(Types.BIT, "BIT", Boolean.class),
TINYINT(Types.TINYINT, "TINYINT", Byte.class),
SMALLINT(Types.SMALLINT, "SMALLINT", Short.class),
INTEGER(Types.INTEGER, "INTEGER", Integer.class),
BIGINT(Types.BIGINT, "BIGINT", Long.class),
FLOAT(Types.FLOAT, "FLOAT", Double.class),
REAL(Types.REAL, "REAL", Float.class),
DOUBLE(Types.DOUBLE, "DOUBLE", Double.class),
NUMERIC(Types.NUMERIC, "NUMERIC", BigDecimal.class),
DECIMAL(Types.DECIMAL, "DECIMAL", BigDecimal.class),
CHAR(Types.CHAR, "CHAR", String.class),
VARCHAR(Types.VARCHAR, "VARCHAR", String.class),
LONGNVARCHAR(Types.LONGNVARCHAR, "LONGNVARCHAR", String.class),
DATE(Types.DATE, "DATE", Date.class),
TIME(Types.TIME, "TIME", Time.class),
TIMESTAMP(Types.TIMESTAMP, "TIMESTAMP", Timestamp.class),
BINARY(Types.BINARY, "BINARY", Byte[].class),
VARBINARY(Types.VARBINARY, "VARBINARY", Byte[].class),
LONGVARBINARY(Types.LONGVARBINARY, "LONGVARBINARY", Byte[].class),
STRUCT(Types.STRUCT, "STRUCT", Struct.class),
ARRAY(Types.ARRAY, "ARRAY", Array.class),
BLOB(Types.BLOB, "BLOB", Blob.class),
CLOB(Types.CLOB, "CLOB", Clob.class),
REF(Types.REF, "REF", Ref.class),
DATALINK(Types.DATALINK, "DATALINK", URL.class),
BOOLEAN(Types.BOOLEAN, "BOOLEAN", Boolean.class),
NCHAR(Types.NCHAR, "NCHAR", String.class),
NVARCHAR(Types.NVARCHAR, "NVARCHAR", String.class),
LONGVARCHAR(Types.LONGVARCHAR, "LONGVARCHAR", String.class),
NCLOB(Types.NCLOB, "NCLOB", NClob.class),
SQLXML(Types.SQLXML, "SQLXML", String.class);
private Integer value;
private String code;
private Class clazz;
JDBC_TYPES(Integer value, String code, Class clazz) {
this.value = value;
this.code = code;
this.clazz = clazz;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public Class getClazz() {
return clazz;
}
public static Integer valueOfCode(String code) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static JDBC_TYPES valueOfEnum(Integer value) {
JDBC_TYPES tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i];
}
}
return tmp;
}
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -13,6 +13,7 @@
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>

@ -137,6 +137,17 @@ public class BfElement extends BaseBean {
public boolean isOrganizeIsolation(){
return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue();
}
@Column(name = "ELEMENT_ORGANIZE_ISOLATION_ATTR_ID")
@ApiParam(value = "组织隔离属性id")
private Long elementOrganizeIsolationAttrId;
public Long getElementOrganizeIsolationAttrId() {
return elementOrganizeIsolationAttrId;
}
public void setElementOrganizeIsolationAttrId(Long elementOrganizeIsolationAttrId) {
this.elementOrganizeIsolationAttrId = elementOrganizeIsolationAttrId;
}
@Column(name = "IS_OBJECT_EXPORT")
@ApiParam(value = "是否导出")

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -34,10 +34,9 @@ public abstract class BaseMdmBean extends BaseBean {
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiParam("mdm数据版本")
@ApiParam("当前版本")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmVersion;
public Long mdmVersion;
public long getMdmVersionVal() {
return mdmVersion == null ? 0 : mdmVersion;

@ -24,7 +24,7 @@ import javax.persistence.Transient;
@ApiModel("MDM业务基础bean")
public class BaseMdmBusiExtdBean extends BaseMdmBean {
private static final long serialVersionUID = 4267453020130810967L;
private static final long serialVersionUID = 4267453020130811234L;
@Transient
@ApiParam("是否主数据")

@ -21,7 +21,7 @@ public class MdmHqlPack {
public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmBean.getIsMdmPublished(), "isMdmPublished", ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean);
return ddlPackBean;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -122,4 +122,9 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
//枚举MesPcnEnumUtil.IF_SYNC_STATUS
@Column(name = "SYNC_FLAG")
@ApiParam("同步标识(同步工具使用)")
private Integer syncFlag;
}

@ -107,4 +107,9 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("客户发运地")
private String custDelieryLocation;
//枚举MesPcnEnumUtil.IF_SYNC_STATUS
@Column(name = "SYNC_FLAG")
@ApiParam("同步标识(同步工具使用)")
private Integer syncFlag;
}

@ -63,4 +63,8 @@ public class MesContainer extends BaseBean {
@Column(name = "TIME_SECOND")
@ApiParam(value = "处理时间(秒)")
private String timeSecond;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus = 10;
}

@ -55,4 +55,8 @@ public class MesContainerType extends BaseBean {
@Column(name = "LIMIT_UOM")
@ApiParam(value = "期限单位")
private String limitUom;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus = 10;
}

@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 6727925715356900171L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
@ApiParam("工作中心代码")
private String workCenterCode;
//DB复核项10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
@Column(name = "DB_CHECK_ITEM")
@ApiParam("DB复核项")
private String dbCheckItem;
@Column(name = "ERROR_FILED_CODE")
@ApiParam("异常取值字段")
private String errorFiledCode;
@Column(name = "ERROR_DESC")
@ApiParam("异常描述")
private String errorDesc;
@Column(name = "ERROR_FILED_DESC")
@ApiParam("异常取值字段描述")
private String errorFiledDesc;
//10数字、20字符串
@Column(name = "ERROR_FILED_TYPE")
@ApiParam("异常取值字段类型")
private String errorFiledType;
@Column(name = "ERROR_FILED_VALUE")
@ApiParam("异常取值字段值")
private String errorFiledValue;
@Column(name = "PRODUCT_DATA_ID")
@ApiParam("生产记录表主键ID")
private Long productDataId;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码(第三方库表名)")
private String objectCode;
//是否停线1=是2=否
@Column(name = "IS_STOP_LINE")
@ApiParam("是否停线")
private Integer isStopLine;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
//审批状态10=待审批20=已审批
@Column(name = "STATUS")
@ApiParam("审批状态")
private Integer status;
@Transient
@ApiParam("按钮名称")

@ -40,33 +40,29 @@ public class MesDbDataCheck extends BaseBean implements Serializable {
@ApiParam("工作中心代码")
private String workCenterCode;
//DB复核项10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
@Column(name = "DB_CHECK_ITEM")
@ApiParam("DB复核项")
private Integer dbCheckItem;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
@ApiParam("对象代码(第三方库表名)")
private String objectCode;
//是否停线1=是2=否
@Column(name = "IS_STOP_LINE")
@ApiParam("是否停线")
private Integer isStopLine;
@Column(name = "KEY_DATA_FILED")
@ApiParam("质量关键字段")
private String keyDataFiled;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QC_FILED_CODE")
@ApiParam("缺陷类型字段")
@ApiParam("质检取值字段")
private String qcFiledCode;
@Column(name = "QC_FILED_DESC")
@ApiParam("质检取值字段描述")
private String qcFiledDesc;
@Column(name = "QC_FILED_TYPE")
@ApiParam("质检取值字段类型")
private String qcFiledType;
@Column(name = "QC_FILED_VALUE")
@ApiParam("缺陷类型合格值")
private String qcFiledValue;
@Column(name = "QC_FAIL_MAX_COUNT")
@ApiParam("缺陷连续不合格预警次数")
private String qcFailMaxCount;
}

@ -48,4 +48,8 @@ public class MesPartContainerCapacity extends BaseBean {
@Column(name = "CT_QTY")
@ApiParam(value = "容量")
private Integer ctQty;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus = 10;
}

@ -125,7 +125,7 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Column(name = "ON_SITE_FREQUENCY")
@ApiParam("巡检次数")
private Integer onSiteFrequency = 0;
private Integer onSiteFrequency = 1;
@Deprecated
@ApiParam(value = "检测结果")

@ -74,4 +74,8 @@ public class MesSpcKeyData extends BaseBean implements Serializable {
@Column(name = "KD_CONDITION")
@ApiParam("取值条件")
private String kdCondition;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
}

@ -19,7 +19,7 @@ public class MesQcOrderDetailRecordModel implements Serializable {
private String orderNo;
@ApiParam("判定结果")
private Integer checkResult = 0;
private String checkResult;
@ApiParam("检测值")
private String checkValue;

@ -94,6 +94,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("强制跳过工序")
private Boolean forceJumpProcess = false;
@ApiParam("自动执行状态机")
private Boolean triggerAutoFsm = false;
@ApiParam("强制执行工步代码")
private String forceSpecStepCode;

@ -97,6 +97,10 @@ public class StepResult<T> {
return new StepResult<>(true, data, "", nextTriggerEvent);
}
public static <T> StepResult<T> getNewFailureData(T data, String nextTriggerEvent) {
return new StepResult<>(false, data, "", nextTriggerEvent);
}
public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
return new StepResult<T>(true, data, msg);
}

@ -19,6 +19,9 @@ public class ProduceDispPassRateModel {
@ApiParam("统计时间")
private String statisticalTime;
@ApiParam("产品条码")
private String srialNumber;
//统计选项10=全部20=冻结30=报废)
@ApiParam("统计选项")
private Integer statisticalOption;
@ -44,6 +47,16 @@ public class ProduceDispPassRateModel {
this.ratio = ratio;
}
public ProduceDispPassRateModel(String statisticalTime, String srialNumber, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
this.statisticalTime = statisticalTime;
this.srialNumber = srialNumber;
this.statisticalOption = statisticalOption;
this.freezeQty = freezeQty;
this.scrapQty = scrapQty;
this.produceSumQty = produceSumQty;
this.ratio = ratio;
}
public ProduceDispPassRateModel() {
}
}

@ -341,7 +341,7 @@ public class MesPcnHqlPack {
return packBean;
}
public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
/*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
@ -362,7 +362,7 @@ public class MesPcnHqlPack {
DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
}
return packBean;
}
}*/
/**
*

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -23,6 +23,12 @@ public class SysLoginModel {
@ApiParam(value = "登录名")
private String loginName;
@ApiParam(value = "手机号")
private String phoneNumber;
@ApiParam(value = "钉钉临时授权码")
private String dingTalkTmpAuthCode;
@ApiParam(value = "登录密码")
private String loginPwd;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -16,7 +16,10 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -13,6 +14,8 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
@ -42,6 +45,7 @@ public class ScrAction extends BaseBean implements Serializable {
@Column(name = "ACTION_TYPE")
@ApiModelProperty("动作类型")
private String actionType;
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.ACTION_TYPE actionType;
}

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/11 12:29
* @desc
*/
@Entity
@Table(name = "SCR_DATA_AUTH")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("数据权限")
public class ScrDataAuth extends BaseBean implements Serializable {
private static final long serialVersionUID = 8099384243374450186L;
@Column(name = "MODEL_CODE")
@ApiModelProperty("model代码")
private String modelCode;
@Column(name = "MODEL_FIELD_CODE")
@ApiModelProperty("model字段代码")
private String modelFieldCode;
@Column(name = "MODEL_FIELD_CONDITION")
@ApiModelProperty("model字段条件")
private String modelFieldCondition;
@Column(name = "ACCESS_ROLES")
@ApiModelProperty("可以访问的角色")
private String accessRoles;
@Column(name = "DENIED_ROLES")
@ApiModelProperty("拒绝访问的角色")
private String deniedRoles;
@Column(name = "ACCESS_USERS")
@ApiModelProperty("可以访问的用户")
private String accessUsers;
@Column(name = "DENIED_USERS")
@ApiModelProperty("拒绝访问的用户")
private String deniedUsers;
@Column(name = "AUTH_TYPE")
@ApiModelProperty("权限类型 (行,列)")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.AUTH_TYPE authType;
}

@ -1,9 +1,9 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -14,13 +14,15 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/22 1:27
* @desc
* @desc
*/
@Entity
@Table(name = "SCR_DATA_OBJECT")
@ -42,21 +44,39 @@ public class ScrDataObject extends BaseBean implements Serializable {
@ApiModelProperty(value = "数据对象代码")
private String dataObjectCode;
@Column(name = "SOURCE_CODE")
@ApiModelProperty(value = "数据源编码")
private String sourceCode;
@Column(name = "DATA_OBJECT_SOURCE_CODE")
@ApiModelProperty(value = "数据名称")
private String dataObjectSourceCode;
@Column(name = "TABLE_NAME")
@ApiModelProperty(value = "表或视图名称")
private String tableName;
@Column(name = "DATA_TYPE")
@ApiModelProperty(value = "数据类型")
private String dataType;
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.DATA_OBJECT_SOURCE dataType;
@Column(name = "FIELD_CODE")
@ApiModelProperty(value = "字段代码")
private String fieldCode;
@Column(name = "FIELD_TYPE")
@ApiModelProperty(value = "字段类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.JDBC_TYPES fieldType;
@Column(name = "FIELD_SIZE")
@ApiModelProperty(value = "字段长度")
private Integer fieldSize;
@Column(name = "DISPLAY_NAME")
@ApiModelProperty(value = "字段名称")
private String displayName;
@Column(name = "DESCRIPTION")
@ApiModelProperty(value = "描述")
private String description;
@Column(name = "NULLABLE")
@ApiModelProperty("是否能为空")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.NULLABLE nullable;
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -12,32 +12,35 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/12 4:26
* @date 2021/3/22 1:27
* @desc
*/
@Entity
@Table(name = "SCR_MODEL_FIELD_CONSTRAINT")
@Table(name = "SCR_DATA_OBJECT_INDEX")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("model字段约束")
public class ScrModelFieldConstraint extends BaseBean implements Serializable {
private static final long serialVersionUID = 5020158684534641672L;
@ApiModel("数据对象约束管理")
public class ScrDataObjectIndex extends BaseBean implements Serializable {
private static final long serialVersionUID = 8995523223574903326L;
@Column(name = "MODEL_CODE")
@ApiModelProperty("model代码")
private String modelCode;
@Column(name = "DATA_OBJECT_CODE")
@ApiModelProperty("数据对象代码")
private String dataObjectCode;
@Column(name = "CONSTRAINT_TYPE")
@Column(name = "INDEX_TYPE")
@ApiModelProperty("约束类型")
private String constraintType;
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.INDEX_TYPE indexType;
@Column(name = "GROUP_NO")
@ApiModelProperty("组号")
@ -46,4 +49,5 @@ public class ScrModelFieldConstraint extends BaseBean implements Serializable {
@Column(name = "FIELD_CODE")
@ApiModelProperty("字段代码")
private String fieldCode;
}

@ -1,59 +0,0 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/22 5:21
* @desc
*/
@Entity
@Table(name = "SCR_DATA_OBJECT_PROPERTY")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("数据对象属性")
public class ScrDataObjectProperty extends BaseBean implements Serializable {
private static final long serialVersionUID = 6954106365899677132L;
@Column(name = "DATA_OBJECT_CODE")
@ApiModelProperty(value = "数据对象代码")
private String dataObjectCode;
@Column(name = "FIELD_CODE")
@ApiModelProperty(value = "字段代码")
private String fieldCode;
@Column(name = "DISPLAY_NAME")
@ApiModelProperty(value = "字段名称")
private String displayName;
@Column(name = "FIELD_TYPE")
@ApiModelProperty(value = "字段类型")
private String fieldType;
@Column(name = "IS_PRIMARY_KEY")
@ApiModelProperty(value = "是否主键")
private Integer isPrimaryKey;
@Column(name = "IS_NULLABLE")
@ApiModelProperty(value = "是否允许为空")
private Integer isNullable;
}

@ -1,8 +1,8 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -50,7 +50,8 @@ public class ScrDatasource extends BaseBean implements Serializable {
@Column(name = "SOURCE_TYPE")
@ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
private Integer sourceType;
@Enumerated(EnumType.STRING)
private CommonEnumUtil.DATA_SOURCE_TYPE sourceType;
@Column(name = "SOURCE_HOST")
@ApiModelProperty(value = "数据源连接地址")
@ -72,6 +73,22 @@ public class ScrDatasource extends BaseBean implements Serializable {
@ApiModelProperty(value = "数据库用户密码")
private String sourcePassword;
@Column(name = "IS_READ_ONLY")
@ApiModelProperty(value = "是否只读")
private Boolean isReadOnly;
@Column(name = "SOURCE_DRIVER")
@ApiModelProperty(value = "驱动")
private String sourceDriver;
@Column(name = "SOURCE_DRIVER_VERSION")
@ApiModelProperty(value = "驱动版本")
private String sourceDriverVersion;
@Column(name = "SOURCE_VERSION")
@ApiModelProperty(value = "数据库版本")
private String sourceVersion;
@Column(name = "SOURCE_DESCRIPTION")
@ApiModelProperty(value = "数据源描述")
private String sourceDescription;

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -12,6 +12,8 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
@ -35,8 +37,16 @@ public class ScrModel extends BaseBean implements Serializable {
@ApiModelProperty("model代码")
private String modelCode;
@Column(name = "MODEL_TYPE")
@ApiModelProperty("model的类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.MODEL_TYPE modelType;
@Column(name = "DATA_OBJECT_CODE")
@ApiModelProperty("数据对象代码")
private String dataObjectCode;
@Column(name = "DATA_COlUMN_AUTH")
@ApiModelProperty("数据列权限")
private String dataColumnAuth;
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -12,7 +13,10 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -43,6 +47,10 @@ public class ScrModelField extends BaseBean implements Serializable {
@ApiModelProperty("字段名称")
private String displayName;
@Column(name = "FIELD_NAME")
@ApiModelProperty("字段名称")
private String fieldName;
@Column(name = "IS_FUZZY_SEARCH")
@ApiModelProperty("是否支持模糊查询")
private Boolean isFuzzySearch;
@ -59,6 +67,10 @@ public class ScrModelField extends BaseBean implements Serializable {
@ApiModelProperty("是否支持排序")
private Boolean isAllowSort;
@Column(name = "IS_REQUIRED")
@ApiModelProperty("是否必填")
private Boolean isRequired;
@Column(name = "FORM_SEQ")
@ApiModelProperty("表单顺序")
private Integer formSeq;
@ -67,24 +79,33 @@ public class ScrModelField extends BaseBean implements Serializable {
@ApiModelProperty("表格顺序")
private Integer tableSeq;
@Column(name = "EXPORT_SEQ")
@ApiModelProperty("导出顺序")
private Integer exportSeq;
@Column(name = "VALIDATION")
@ApiModelProperty("校验")
private String validation;
@Column(name = "DICTIONARY")
@ApiModelProperty("字典")
private String dictionary;
private String regexValidation;
@Column(name = "IS_VIRTUAL")
@ApiModelProperty("是否是虚拟的")
private boolean isVirtual;
private Boolean isVirtual;
@Column(name = "FIELD_NAME")
@ApiModelProperty("字段名称")
private String fieldName;
@Column(name = "MODEL_FIELD_DATASOURCE")
@ApiModelProperty("字段数据来源")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource;
@Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
@ApiModelProperty("model字段来源属性")
private String modelFieldDatasourceProps;
@Column(name = "DATA_ROW_AUTH")
@ApiModelProperty("数据列权限")
private String dataRowAuth;
@Transient
private Object fieldValue;
@Column(name = "SPEL_VIRTUAL_VALUE")
@ApiModelProperty("SPEL表达式虚拟属性")
private String spelVirtualValue;
}

@ -0,0 +1,68 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/12 4:26
* @desc
*/
@Entity
@Table(name = "SCR_MODEL_FIELD_INDEX")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("model字段约束")
public class ScrModelFieldIndex extends BaseBean implements Serializable {
private static final long serialVersionUID = 5020158684534641672L;
@Column(name = "MODEL_CODE")
@ApiModelProperty("model代码")
private String modelCode;
@Column(name = "INDEX_TYPE")
@ApiModelProperty("约束类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.INDEX_TYPE indexType;
@Column(name = "GROUP_NO")
@ApiModelProperty("组号")
private Integer groupNo;
@Column(name = "FIELD_CODE")
@ApiModelProperty("字段代码")
private String fieldCode;
@Column(name = "IS_USER_CREATED")
@ApiModelProperty("是否是用户创建的")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.TRUE_OR_FALSE isUserCreated;
@Column(name = "PRIMARY_KEY_SWITCH")
@ApiModelProperty("model主键唯一检查开关")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch;
@Column(name = "UNIQUE_KEY_SWITCH")
@ApiModelProperty("model唯一键唯一检查开关")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch;
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -12,6 +13,8 @@ import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import java.io.Serializable;
@ -47,4 +50,14 @@ public class ScrScreen extends BaseBean implements Serializable {
@ApiModelProperty("布局代码")
private String layoutCode;
@Column(name = "SCREEN_TYPE")
@ApiModelProperty("页面类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.SCREEN_TYPE screenType;
@Column(name = "SCREEN_OWNING_SYSTEM")
@ApiModelProperty("界面所属系统")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.SOFT_TYPE screenOwningSystem;
}

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/4/26 00:12
* @desc
*/
@Data
@Builder
public class ScrDataObjectIndexModel implements Serializable {
private static final long serialVersionUID = -5784177094937410041L;
private ScrDatasource datasource;
private List<ScrDataObject> dataObjects;
private List<ScrDataObjectIndex> dataObjectIndices;
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/27 6:10
* @desc
*/
@Data
@Builder
@ApiModel("datasource基础信息")
public class ScrDatasourceInfoModel implements Serializable {
private static final long serialVersionUID = -5818708649412989886L;
@ApiModelProperty("数据库已知用户")
private String dbKnewUser;
@ApiModelProperty("数据库系统函数")
private String dbSysFunction;
@ApiModelProperty("数据库系统函数")
private String dbDateFunction;
@ApiModelProperty("数据库系统函数")
private String dbStringFunction;
@ApiModelProperty("数据库连接字符串")
private String dbConnectUrl;
@ApiModelProperty("数据库是否只读")
private boolean dbIsReadOnly;
@ApiModelProperty("数据库产品名称")
private String dbProductName;
@ApiModelProperty("数据库版本")
private String dbVersion;
@ApiModelProperty("数据库驱动")
private String dbDriver;
@ApiModelProperty("数据库驱动版本")
private String dbDriverVersion;
}

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrAction;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldIndex;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/4/9 13:41
* @desc
*/
@Data
@Builder
@AllArgsConstructor
@ApiModel("modelmodelFields与数据对象数据源的关系")
public class ScrExecuteModel implements Serializable {
private static final long serialVersionUID = -7305897999888994870L;
@ApiModelProperty("动作")
private ScrAction action;
@ApiModelProperty("模型")
private ScrModel model;
@ApiModelProperty("数据源")
private ScrDatasource datasource;
@ApiModelProperty("model对应的数据对象")
private List<ScrDataObject> dataObjects;
@ApiModelProperty("model对应的数据对象索引")
private List<ScrDataObjectIndex> dataObjectIndices;
@ApiModelProperty("model字段")
private List<ScrModelField> modelFields;
@ApiModelProperty("model字段索引")
private List<ScrModelFieldIndex> modelFieldIndices;
@ApiModelProperty("model虚拟字段")
private List<ScrModelFieldVirtual> modelFieldVirtuals;
private List<ScrModelField> insertCondition;
private List<ScrModelField> queryCondition;
private List<ScrModelField> updateCondition;
private List<ScrModelField> deleteCondition;
}

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -12,11 +14,14 @@ import java.util.List;
* @desc
*/
@Data
@ApiModel("布局model")
public class ScrLayoutModel implements Serializable {
private static final long serialVersionUID = -2767386371499251918L;
@ApiModelProperty("布局")
private ScrLayout layout;
@ApiModelProperty("布局中的行列关系")
private List<ScrRowColumnModel> rowColumnModels;
}

@ -1,8 +1,8 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -15,23 +15,32 @@ import java.util.Map;
* @desc
*/
@Data
@ApiModel("Panel与组件关系的创建model")
public class ScrPanelComponentCreateModel implements Serializable {
private static final long serialVersionUID = -5832175256726333348L;
@ApiModelProperty("panel代码")
private String panelCode;
@ApiModelProperty("布局代码")
private String layoutCode;
private String rowCode;
@ApiModelProperty("行序号")
private Integer rowSeq;
private String columnCode;
@ApiModelProperty("列序号")
private Integer columnSeq;
@ApiModelProperty("组件参数信息")
private Map<String, Object> baseComponent;
@ApiModelProperty("model代码")
private String modelCode;
@ApiModelProperty("该组件的事件动作集合")
private List<String> eventActions;
@ApiModelProperty("组件使用到的model字段集合")
private List<ScrModelField> modelFields;
}

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -14,17 +16,23 @@ import java.util.List;
* @desc
*/
@Data
@ApiModel("Panel和组件的查询model")
public class ScrPanelComponentQueryModel implements Serializable {
private static final long serialVersionUID = 4133777603151273736L;
@ApiModelProperty("行代码")
private String rowCode;
@ApiModelProperty("列代码")
private String columnCode;
@ApiModelProperty("组件")
private ScrComponent component;
@ApiModelProperty("动作事件")
private ScrEventAction eventAction;
@ApiModelProperty("组件与model字段的关系")
private List<ScrComponentModelField> modelFields;
}

@ -1,20 +0,0 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/3/28 2:23
* @desc
*/
public class ScrPanelLayoutModel {
private ScrPanel panel;
private ScrLayout layout;
private List<ScrRowColumnModel> rowColumnModels;
}

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/5/14 09:58
* @desc
*/
@Data
@ApiModel("请求model")
public class ScrRequestModel implements Serializable {
private static final long serialVersionUID = -4119744678742689856L;
@ApiModelProperty("工厂代码")
private String organizeCode;
@ApiModelProperty("用户名")
private String userName;
@ApiModelProperty("页面代码")
private String screenCode;
@ApiModelProperty("容器代码")
private String panelCode;
@ApiModelProperty("模型")
private String modelCode;
@ApiModelProperty("动作")
private String actionCode;
@ApiModelProperty("分页")
private Pager pager;
@ApiModelProperty("下载文件Id")
private Long downloadFileId;
@ApiModelProperty("跳转参数")
private String redirectUrl;
@ApiModelProperty("跳转参数")
private String enumName;
@ApiModelProperty("目标系统")
private CommonEnumUtil.SOFT_TYPE targetSystem;
@ApiModelProperty("包名")
private String packageName;
@ApiModelProperty("类名")
private String className;
@ApiModelProperty("方法名")
private String methodName;
@ApiModelProperty("上传文件")
private MultipartFile file;
@ApiModelProperty("模型字段")
private List<ScrModelField> modelFields;
}

@ -2,8 +2,11 @@ package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -12,9 +15,13 @@ import java.util.List;
* @desc
*/
@Data
public class ScrRowColumnModel {
@ApiModel("行列Model")
public class ScrRowColumnModel implements Serializable {
private static final long serialVersionUID = 7450630220924238356L;
@ApiModelProperty("行")
private ScrLayoutRow row;
@ApiModelProperty("行中的列")
private List<ScrLayoutColumn> columns;
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -10,17 +12,23 @@ import java.io.Serializable;
* @desc
*/
@Data
@ApiModel("Screen与Panel的创建Model")
public class ScrScreenPanelCreateModel implements Serializable {
private static final long serialVersionUID = -5832175256726333348L;
@ApiModelProperty("screen代码")
private String screenCode;
@ApiModelProperty("布局代码")
private String layoutCode;
@ApiModelProperty("行代码")
private String rowCode;
@ApiModelProperty("列代码")
private String columnCode;
@ApiModelProperty("panel代码")
private String panelCode;
}

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-22 17:17
* @Modify:
**/
@Data
@ApiModel("数据表或视图的列model")
public class ScrSqlColumnModel implements Serializable {
private static final long serialVersionUID = -8437573966195980847L;
// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp
// isAutoIncrement false isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel test_num_not_null getColumnName test_num_not_null getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel test_unique getColumnName test_unique getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel test_comment getColumnName test_comment getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 500 getColumnLabel test_string_1000 getColumnName test_string_1000 getSchemaName getPrecision 500 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 4 getColumnLabel test_double getColumnName test_double getSchemaName getPrecision 4 getScale 2 getTableName interceptor getColumnType 8 getColumnTypeName DOUBLE getColumnClassName java.lang.Double
// 是否自增
@ApiParam(value = "是否自增")
private Integer isAutoIncrement;
// 是否允许为空
@ApiParam(value = "是否允许为空")
private Integer isNullable;
// 是否是对象
@ApiParam(value = "是否是对象")
private Integer isSigned;
// 字段名称
@ApiParam(value = "字段名称")
private String columnName;
// 字段长度
@ApiParam(value = "字段长度")
private Integer precision;
// 字段精确长度
@ApiParam(value = "字段精确长度")
private Integer scale;
// 暂用来区分存储过程出入参数信息
// 暂用来区分存储过程出入参数信息
@AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
@ApiParam(value = "原始列类型")
private Integer originPropertyType;
public String getOriginPropertyTypeTxt() {
return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
: BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
}
// 字段类型编号
@ApiParam(value = "字段类型编号")
private Integer columnType;
// 字段类型名称
@ApiParam(value = "字段类型名称")
private String columnTypeName;
// 字段Java 类型
@ApiParam(value = "字段Java 类型")
private String columnClassName;
// 字段Java 类型
@ApiParam(value = "枚举:BlockFormEnumUtil.PROPERTY_TYPE")
private Integer columnClassType;
// 属性是否主键
@ApiParam(value = "枚举: CommonEnumUtil.TRUE_OR_FALSE")
private Integer columnPrimaryKey;
@ApiParam(value = "属性值")
private Object value;
@ApiParam(value = "属性默认值")
private Object defaultValue;
public ScrSqlColumnModel() {
}
public ScrSqlColumnModel(String columnName, CommonEnumUtil.PROPERTY_TYPE type) {
this.columnName = columnName;
this.columnClassType = type.getValue();
this.columnTypeName = type.getDescription();
}
}

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.screen.model;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-22 16:40
* @Modify:
**/
@Data
public class ScrSqlDdlModel implements Serializable {
private static final long serialVersionUID = -1294648161172538340L;
private String tableCat;
private String tableSchem;
private String tableName;
private Integer tableType;
private String tableTypeName;
private String remarks;
private String typeCat;
private String typeName;
private String selfReferencingColName;
private String refGeneration;
List<ScrSqlColumnModel> columnlist;
}

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @author Wynne.Lu
* @date 2021/4/9 14:59
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("通用界面查询Model")
public class ScrSqlDmlModel implements Serializable {
private static final long serialVersionUID = -177686438571101429L;
@ApiModelProperty("工厂")
private String organizeCode;
@ApiModelProperty("操作人")
private String userName;
@ApiModelProperty("表名或视图名")
private String table;
@ApiModelProperty("字段")
private List<String> fields;
@ApiModelProperty("查询参数")
private Map<String, Object> searchParams;
@ApiModelProperty("插入参数")
private Map<String, Object> insertParams;
@ApiModelProperty("批量查询参数")
private List<Map<String, Object>> insertBatchParams;
@ApiModelProperty("更新参数")
private Map<String, Object> updateParams;
@ApiModelProperty("批量更新参数")
private List<Map<String, Object>> updateBatchParams;
@ApiModelProperty("分页参数")
private Pager pager;
@ApiModelProperty("排序")
private String orderBy;
@ApiModelProperty("数据源")
private ScrDatasource datasource;
@ApiModelProperty("主键")
private Map<String, Object> primaryKeys;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/27 6:10
* @desc
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("table列类型")
public class ScrTableColumnModel extends ScrTableModel implements Serializable {
private static final long serialVersionUID = -1798799352034473523L;
@ApiModelProperty("列名")
private String columnName;
@ApiModelProperty("列类型Id")
private Integer columnDataType;
@ApiModelProperty("列类型名称")
private String columnTypeName;
@ApiModelProperty("列大小")
private Integer columnSize;
@ApiModelProperty("列小数位数")
private Integer columnDecimalDigits;
@ApiModelProperty("基数")
private Integer columnNumPrecRadix;
@ApiModelProperty(value = "是否允许为null", notes = "0 不允许为空 1 允许为空 2 未知")
private Integer columnNullable;
@ApiModelProperty("列描述")
private String columnRemarks;
@ApiModelProperty("列默认值")
private String columnDefault;
@ApiModelProperty("列在表中位置")
private Integer columnOrdinalPosition;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/27 6:10
* @desc
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("table索引类型 包含主键索引")
public class ScrTableIndexModel extends ScrTableModel implements Serializable {
private static final long serialVersionUID = -6849703973729507400L;
@ApiModelProperty("索引是否唯一键")
private Boolean indexUnique;
@ApiModelProperty("索引类别(可能为空)")
private String indexQualifier;
@ApiModelProperty("索引名称")
private String indexName;
@ApiModelProperty("索引类型")
private Short indexType;
@ApiModelProperty("索引列顺序号")
private Short indexOrdinalPosition;
@ApiModelProperty("索引列名")
private String indexColumnName;
@ApiModelProperty(value = "索引升降序", notes = "A升序 B降序")
private String indexAscDesc;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/27 6:10
* @desc
*/
@Data
@Builder
@ApiModel("table类型")
public class ScrTableModel implements Serializable {
private static final long serialVersionUID = 6273278236124833259L;
@ApiModelProperty("库名")
private String tableCatalog;
@ApiModelProperty("Schema")
private String tableSchem;
@ApiModelProperty("表名")
private String tableName;
@ApiModelProperty("类型:TABLE|VIEW")
private String tableType;
public ScrTableModel() {
}
public ScrTableModel(String tableCatalog, String tableSchem, String tableName, String tableType) {
this.tableCatalog = tableCatalog;
this.tableSchem = tableSchem;
this.tableName = tableName;
this.tableType = tableType;
}
}

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.screen.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/3/27 6:10
* @desc
*/
@Data
@ApiModel("table主键索引")
@EqualsAndHashCode(callSuper = true)
public class ScrTablePrimaryIndexModel extends ScrTableModel implements Serializable {
private static final long serialVersionUID = 3555705756354710415L;
@ApiModelProperty("列名")
private String columnName;
@ApiModelProperty("主键顺序")
private Short keySeq;
@ApiModelProperty("主键名称")
private String pkName;
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataAuth;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-5-28 3:39
* @Modify:
**/
public interface ScrDataAuthRepository extends BaseRepository<ScrDataAuth, Long> {
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
/**
* @Description :
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
* @CreateDate : 20-5-28 3:39
* @Modify:
**/
public interface ScrDataObjectPropertyRepository extends BaseRepository<ScrDataObjectProperty, Long> {
public interface ScrDataObjectIndexRepository extends BaseRepository<ScrDataObjectIndex, Long> {
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldIndex;
/**
* @Description :
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint;
* @CreateDate : 20-5-28 3:39
* @Modify:
**/
public interface ScrModelFieldConstraintRepository extends BaseRepository<ScrModelFieldConstraint, Long> {
public interface ScrModelFieldIndexRepository extends BaseRepository<ScrModelFieldIndex, Long> {
}

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual;
/**

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam("备注")
private String remark;
@Column(name = "REASON")
@ApiParam("原因")
public String reason;
@Column(name = "DEPARTMENT")
@ApiParam(value = "部门")
private String department;
@Column(name = "RECEIVER")
@ApiParam("领用人")
private String receiver;
@Column(name = "PROD_DFG_TYPE_CODE")
@ApiParam("项目号")
private String prodCfgTypeCode;
@Transient
private List<WmsDocMovementDetails> movementDetailsList;

@ -186,4 +186,8 @@ public class WmsPartExtend extends BaseBean {
public Integer getQcPassCount() {
return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
}
public Integer getQcSkipCycle() {
return this.qcSkipCycle == null ? 0 :this.qcSkipCycle.intValue();
}
}

@ -34,7 +34,8 @@ import javax.persistence.Table;
@Index(columnList = "BATCH_NO"),
@Index(columnList = "STOCK_SN"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SERIAL_SN")
@Index(columnList = "SERIAL_SN"),
@Index(columnList = "ORGANIZE_CODE")
})
@DynamicInsert
@DynamicUpdate

@ -54,7 +54,6 @@ import java.util.List;
@Inheritance(strategy = InheritanceType.JOINED)
@Api(value = "库存条码信息", description = "库存条码信息")
public class WmsStockSn extends BaseBean {
private static final long serialVersionUID = 4869307400585363697L;
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
@ -237,10 +236,10 @@ public class WmsStockSn extends BaseBean {
// @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion;
@ApiParam("托盘(容器)类型编号")
@Column(name = "CT_CODE")
@ApiParam("容器编号")
@Column(name = "CT_NO")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String ctCode;
private String ctNo;
@ApiParam(value = "仓库名称")
@Transient
@ -960,6 +959,10 @@ public class WmsStockSn extends BaseBean {
this.zoneNo = zoneNo;
this.vendorNo = vendorNo;
}
public WmsStockSn(String partNo, Double qty) {
this.partNo = partNo;
this.qty = qty;

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -90,4 +92,95 @@ public class WmsTransSn extends BaseBean {
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
private Integer snStatus;
@Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "交易数量")
public Double transQty;
@Column(name = "SRC_PART_NO")
@ApiParam("源物料编码")
public String srcPartNo;
@Column(name = "NEW_PART_NO")
@ApiParam("新物料编码")
public String newPartNo;
@Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "源数量")
public Double srcQty;
@Column(name = "NEW_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "新数量")
public Double newQty;
@Column(name = "SRC_SN_STATUS")
@ApiParam(value = "源条码状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
public Integer srcSnStatus;
@Column(name = "NEW_SN_STATUS")
@ApiParam(value = "目的条码状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
public Integer newSnStatus;
@Column(name = "SRC_QC_STATUS")
@ApiParam(value = "源质量状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
public Integer srcQcStatus;
@Column(name = "NEW_QC_STATUS")
@ApiParam(value = "目的质量状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
public Integer descQcStatus;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "NEW_WH_NO")
@ApiParam("新仓库代码")
public String newWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name = "NEW_ZONE_NO")
@ApiParam("新存储区代码")
public String newZoneNo;
@Column(name = "NEW_LOCATE_NO")
@ApiParam("新库位代码")
public String newLocateNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name = "SRC_ORGANIZE_CODE")
@ApiParam("源工厂代码")
public String srcOrganizeCode;
@Column(name = "NEW_ORGANIZE_CODE")
@ApiParam("新工厂代码")
public String newOrganizeCode;
@Column(name = "SRC_IS_DELETED")
@ApiParam("旧软删标识")
public Integer srcIsDeleted;
@Column(name = "NEW_IS_DELETED")
@ApiParam("新软删标识")
public Integer newIsDeleted;
@Column(name = "SRC_IS_VALID")
@ApiParam("旧有效标识")
public Integer srcIsValid;
@Column(name = "NEW_IS_VALID")
@ApiParam("新有效标识")
public Integer newIsValid;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0.0.1</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -16,6 +16,7 @@
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0.0.1</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save