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

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

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent cc655f9741 1eaacd1b28
commit a64158fb94
268 changed files with 7780 additions and 466 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,6 +25,8 @@ public @interface DynamicField {
int sort() default 0;
// 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
int isWider() default 2;
// 是否可选作查询条件:默认1-可选，2-不可选
int isQuery() default 1;
// 是否勾选:默认1-勾选，2-非勾选
int isSelect() default 1;
// 是否必选:默认1-必选，2-非必选
@ -34,5 +36,11 @@ public @interface DynamicField {
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String enumName() default "";
String entityName() default "";
// 下拉列表显示列名称,多个列名需要根据逗号分隔
String listColumnName() default "";
// 下拉搜索列名称,多个列名需要根据逗号分隔
String searchColumnName() default "";
// 回显列名
String explicitColumnName() default "";
}

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

@ -64,19 +64,17 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
// @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ApiParam(value = "有效性",example = "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")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA
@ -135,13 +133,11 @@ public abstract class BaseBean implements Serializable {
@Transient
@ApiParam(value = "排序属性")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String orderByParam = "";
@Transient
@ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
public transient Integer ascOrDesc = 1;
@ -158,5 +154,4 @@ public abstract class BaseBean implements Serializable {
}
return result;
}
}

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

@ -17,7 +17,8 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_ACTION_MODULE {
WORK_ORDER_LANDED(10, "生产工单下达");
WORK_ORDER_LANDED(10, "生产工单下达"),
QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
private int value;
private String description;
@ -82,6 +83,72 @@ public class MesEnumUtil {
}
/**
* 排序校验模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_PROD_SEQ_FLAG {
PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
private int value;
private String code;
private String description;
CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String codeOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* JIS发运是否按主队列顺序扫描
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1595,10 +1662,11 @@ public class MesEnumUtil {
MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
MES_DATASOURCE(360, "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
MES_PLC(390,"PLC地址清单"),
MES_PROCESS(400,"工序信息"),
MES_KPSN_RULE(410,"关键件条码校验规则");
MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
MES_PLC(390, "PLC地址清单"),
MES_PROCESS(400, "工序信息"),
MES_KPSN_RULE(410, "关键件条码校验规则"),
MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
private int value;
private String description;
@ -2914,7 +2982,9 @@ public class MesEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单");
private int value;
private String description;
@ -4062,4 +4132,362 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 客户JIT生产队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_ACTUAL_STATUS {
CREATE(10, "创建"),
LANDED(20, "下达"),
CANCEL(30, "取消");
private int value;
private String description;
QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 客户JIT生产队列特殊标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
NORMAL(10, "正常"),
EMPTYING(20, "放空");
private int value;
private String description;
QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIS发运队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIS_STATUS {
CREATE(10, "创建"),
LANDED(20, "下达"),
SHIPMENT(30, "已发运");
private int value;
private String description;
QUEUE_JIS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 生产队列 队列类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_QUEUE_TYPE {
PRODUCT_QUEUE(10, "生产队列"),
PRELOAD_QUEUE(20, "预装队列");
private int value;
private String description;
QUEUE_ORDER_QUEUE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIS发运队列明细 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIS_DETAIL_STATUS {
CREATE(10, "创建"),
SHIPMENT(20, "已发运");
private int value;
private String description;
QUEUE_JIS_DETAIL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 关键件条码校验工步对应的物料分类的值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_TYPE_THREE {
MM(10, "MM"),
MS(20, "MS");
private int value;
private String description;
PART_TYPE_THREE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes生产队列是否锁定
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_IS_LOCK {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
QUEUE_ORDER_IS_LOCK(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 查询散件BOM关键物料号工步对应的物料分类的值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_TYPE_THREE_STATION_BOM {
MM(10, "MM"),
NLX(20, "NLX");
private int value;
private String description;
PART_TYPE_THREE_STATION_BOM(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 工位监听组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CELL_MONITOR_TYPE {
MONITOR(10, "监听组件"),
SHOW(20, "展示组件");
private int value;
private String description;
WORK_CELL_MONITOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 工位监听组件触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TRIGGER_TYPE {
BY_SN(10, "根据条码加载工步"),
BY_PART(20, "根据零件号加载工步");
private int value;
private String description;
WORK_MODULE_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
WORK_MODULE_PARAM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -204,8 +204,8 @@ public class MesPcnEnumUtil {
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
private int value;
private String code;
@ -2806,4 +2806,149 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* 工位监听组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CELL_MONITOR_TYPE {
MONITOR(10, "监听组件"),
SHOW(20, "展示组件");
private int value;
private String description;
WORK_CELL_MONITOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 工位监听组件触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TRIGGER_TYPE {
BY_SN(10, "根据条码加载工步"),
BY_PART(20, "根据零件号加载工步");
private int value;
private String description;
WORK_MODULE_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
WORK_MODULE_PARAM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 缓存类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CACHA_TYPE {
DATA_REVIEW(10, "数据复核");
private int value;
private String description;
CACHA_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 缓存队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CACHA_QUEUE_STATUS {
CREATE(10, "创建");
private int value;
private String description;
CACHA_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 配方类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_FORMULA_TYPE {
DEVICE_SEMAPHORE(10, "设备信号");
private int value;
private String description;
PART_FORMULA_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -423,4 +423,165 @@ public class PtlEnumUtil {
return tmp;
}
}
/**
* PCN同步PTL主数据同步类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_TYPE {
GET_PTL_DATA(1, "pcn获取Ptl数据"),
DATA_TO_PTL(2, "pcn推送数据至ptl");
private int value;
private String description;
SYNC_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PCN同步PTL主数据同步方式枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_PATTERN {
UPDATE(1, "新增或修改"),
INSERT(2, "新增");
private int value;
private String description;
SYNC_PATTERN(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
TRUE_OR_FALSE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* ptl-pcn定时任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PCN_TASK_STATUS {
OPEN(1, "开启"),
CLOSE(2, "关闭");
private int value;
private String description;
PTL_PCN_TASK_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

781
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
View File

File diff suppressed because it is too large Load Diff

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

@ -3155,10 +3155,21 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {return descOf(desc);}
}
@ -3857,7 +3868,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_TYPE {
SN(10, "SN");
SN(10, "SN"),
PACKAGE_NO(20, "PACKAGE_NO");
private int value;
private String description;
@ -4954,10 +4966,20 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {return descOf(desc);}
}
/**
@ -5030,4 +5052,102 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 同批次条码-查询范围
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUERY_RANGE_TYPE {
LOCATE(10, "库位"), AREA_OWNER(20, "责任区域");
private int value;
private String description;
QUERY_RANGE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 交易类型-单据回退类型
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_BACK_TYPE {
REC_QTY(10, "REC_QTY", "已收货数量"),
PICK_QTY(20, "PICK_QTY", "已拣货数量"),
MOVE_QTY(30, "MOVE_QTY", "已移库数量"),
OUT_QTY(40, "OUT_QTY", "已出库数量");
private int value;
private String code;
private String description;
ORDER_BACK_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static ORDER_BACK_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
Unescape Escape View File

@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.NoRepositoryBean;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -378,4 +379,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime);
}

33
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -1,23 +1,21 @@
package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import cn.estsh.i3plus.pojo.base.util.BeanMapUtils;
import cn.estsh.i3plus.pojo.base.util.StringCastUtils;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.NonUniqueResultException;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
import javax.persistence.*;
import javax.persistence.EntityManager;
import javax.persistence.Id;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@ -860,7 +858,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
public int findByHqlWhereCount(DdlPackBean packBean) {
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
+ " as model where 1=1 " + packBean.getWhereAppend());
Query query = entityManager.createQuery(queryString.toString(), Long.class);
for (String key : packBean.getHqlPreparedMap().keySet()) {
@ -1550,4 +1548,23 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
return num;
}
@Override
public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
LOGGER.info("PTL-PCN数据清除查询");
StringBuffer queryString = new StringBuffer();
queryString.append("select model from " + persistentClass.getSimpleName()
+ " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " ");
if (packBean != null) {
queryString.append(packBean.getWhereAppend());
}
Query query = entityManager.createQuery(queryString.toString());
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
}
return query.getResultList();
}
}

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

@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
}
@Transient
@ApiParam(value ="是否为数据有效字段")
private transient Integer isValidProperty;
@Transient
@ApiParam(value ="是否为弱删除字段")
private transient Integer isDeleteWeaklyProperty;
@Transient
@ApiParam(value ="元素值")
private transient Object propertyFormValue;

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

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否删除")
private Integer isObjectDel;
@Column(name = "IS_OBJECT_DEL_WEAK")
@ApiParam(value = "是否弱删除")
private Integer isObjectDelWeak;
@Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
@ApiParam(value = "元素弱删除属性id")
private Long elementDelWeakAttrId;
@Column(name = "IS_OBJECT_VALID")
@ApiParam(value = "是否有效")
private Integer isObjectValid;
@Column(name = "ELEMENT_VALID_ATTR_ID")
@ApiParam(value = "元素有效属性id")
private Long elementValidAttrId;
@Column(name = "IS_OBJECT_EXPORT")
@ApiParam(value = "是否导出")
private Integer isObjectExport;

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

@ -186,6 +186,8 @@ public class LacHqlPack {
public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck);
DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean);
DdlPreparedPack.getNumEqualPack(lacTaskCheck.getStepId(),"stepId",ddlPackBean);
DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
return ddlPackBean;
}
}

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

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,7 +14,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description :生产区域
@ -37,4 +41,19 @@ public class MesArea extends BaseBean implements Serializable {
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

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

@ -0,0 +1,45 @@
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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:09
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CACHA_QUEUE")
@Api("MES缓存队列")
public class MesCachaQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = 8272649623030195332L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CACHA_TYPE")
@ApiParam("缓存类型")
private String cachaType;
}

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

@ -0,0 +1,45 @@
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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:50
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_FORMULA")
@Api("MES_物料配方")
public class MesPartFormula extends BaseBean implements Serializable {
private static final long serialVersionUID = 3120650997069271308L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;
}

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

@ -0,0 +1,55 @@
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;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description :散件产品配置明细
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 17:52
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_SCATTER_CFG_BOM")
@Api("散件产品配置明细")
public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("散件产品代码")
private String partNo;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "QTY")
@ApiParam("用量")
private BigDecimal qty;
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
private Integer isKeyPart ;
}

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

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("流程工序关系")
public class MesRouteProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = 3477334942090180010L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工序工作单元对照")
public class MesRouteProcessCell extends BaseBean implements Serializable {
private static final long serialVersionUID = -703779336699805482L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("班次休息信息")
public class MesShiftRest extends BaseBean implements Serializable {
private static final long serialVersionUID = -8712815093203320523L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;

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

@ -22,8 +22,8 @@ import java.io.Serializable;
@Table(name = "MES_TIME")
@Api("工步参数")
public class MesTime extends BaseBean implements Serializable {
private static final long serialVersionUID = 1562011791394529076L;
@Column(name = "MODULE")
@ApiParam("组件")
private String module;

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

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_TORQUE_DETAIL")
@Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 2900363253333046861L;
@Column(name = "SN")
@ApiParam("过程条码")
private String serialNumber;

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_TYPE_CFG")
@Api("类型信息表")
public class MesTypeCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -1699612238800419597L;
@Column(name = "TYPE_CODE")
@ApiParam("类型代码")
private String typeCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_WC_CHECK")
@Api("开线检查")
public class MesWcCheck extends BaseBean implements Serializable {
private static final long serialVersionUID = 8057329890155185557L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -30,8 +30,8 @@ import java.io.Serializable;
})
@Api("开线检查记录")
public class MesWcCheckRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -2173902677953303765L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作单元")
public class MesWorkCell extends BaseBean implements Serializable {
private static final long serialVersionUID = -493313481197504121L;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
})
@Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -5634446206963213556L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -3659425774085368499L;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作单元参数配置")
public class MesWorkCellParamCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1739991089354361293L;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable {
private static final long serialVersionUID = 2881841596678871526L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作中心")
public class MesWorkCenter extends BaseBean implements Serializable {
private static final long serialVersionUID = -1119897685621371682L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;

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

@ -27,11 +27,11 @@ import java.io.Serializable;
@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
}
)
})
@Api("生产工单")
public class MesWorkOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 8065877030194822855L;
@Column(name = "ORDER_NO", nullable = false)
@ApiParam("工单号")
private String orderNo;

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("生产工单日志")
public class MesWorkOrderLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -7018645997937147427L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;

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

@ -17,12 +17,21 @@ import java.io.Serializable;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("pcn页面按钮控制model")
@Api("mes页面按钮控制model")
public class MesButtonFlagModel implements Serializable {
@ApiParam("修改按钮")
private boolean updateButton;
@ApiParam("按配置修改按钮")
private boolean updateButtonConfig;
@ApiParam("下达按钮")
private boolean transmitButton;
// @ApiParam("测试动态下达按钮")
// private boolean dynamicTransmitButtonTest;
@ApiParam("启动按钮")
private boolean startUpButton;
@ -38,5 +47,11 @@ public class MesButtonFlagModel implements Serializable {
@ApiParam("完成按钮")
private boolean completeButton;
@ApiParam("关闭按钮-提醒")
private boolean closeButtonNoticeFlag;
@ApiParam("维修任务按钮")
private boolean repairButton;
}

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

@ -0,0 +1,16 @@
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.MesProdScatterCfgBom;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 18:03
*/
@Repository
public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
}

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

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -72,12 +73,12 @@ public class MesBom extends BaseBean implements Serializable {
@Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effEndTime;
public double getQtyVal() {

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

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :MES_缓存队列
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 14:52
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CACHA_QUEUE")
@Api("MES缓存队列")
public class MesCachaQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = 6875307024103023380L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CACHA_TYPE")
@ApiParam("缓存类型")
private String cachaType;
}

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

@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable {
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("特殊批次")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")

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

@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable {
@Column(name = "CUST_PROD_LINE_NAME")
@ApiParam("客户产线名称")
private String custProdLineName;
@Column(name = "PG_CODE")
@ApiParam("生产组代码")
private String pgCode;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
}

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

@ -27,7 +27,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER")
@Api("客户产线代码")
@Api("客户信息")
public class MesCustomer extends BaseBean implements Serializable {
private static final long serialVersionUID = 6049359006918853570L;
@Column(name = "CUSTOMER_CODE")

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

@ -58,16 +58,15 @@ public class MesDatasource extends BaseBean implements Serializable {
@ApiParam("密码")
private String dsPassword;
@Column(name = "DS_DB_NAME")
@ApiParam("数据库名称")
private String dsDbName;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "DS_DB_NAMsE")
@ApiParam("数据库名称")
private String dsDbName;
@Transient
@ApiParam("设备名称")
private String equipmentName;
}

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

@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -41,4 +43,26 @@ public class MesDefect extends BaseBean implements Serializable {
@Column(name = "DEFECT_TYPE")
@ApiParam("缺陷类型")
private String defectType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
@Transient
@ApiParam("缺陷位置")
private String defectLocation;
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}
public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
this.defectCode = defectCode;
this.defectName = defectName;
this.defectType = defectType;
this.defectTypeName = defectTypeName;
}
}

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表")
public class MesDefectCause extends BaseBean implements Serializable {
private static final long serialVersionUID = -4078847071878784152L;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;

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

@ -8,12 +8,10 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @Description:
@ -34,6 +32,7 @@ import java.util.Date;
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6672562641463628050L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@ -78,6 +77,9 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("备注")
private String memo;
@Transient
private List<MesDefect> mesDefectList;
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}

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

@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description:
@ -60,11 +58,11 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private Integer dismantleQty;
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
@ -76,17 +74,24 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
@Column(name = "OK_QTY")
@ApiParam("合格数")
private Integer okQty;
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private Integer missQty;
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private Integer scrapQty;
private BigDecimal scrapQty;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
}

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesEsop extends BaseBean implements Serializable {
private static final long serialVersionUID = -2025246159538929513L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("系统业务事件")
public class MesEvent extends BaseBean implements Serializable {
private static final long serialVersionUID = -2941486161983912085L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;

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

@ -34,6 +34,7 @@ import java.io.Serializable;
@Api("系统业务事件动作")
public class MesEventAction extends BaseBean implements Serializable {
private static final long serialVersionUID = 1188871471049646861L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_FI_CFG")
@Api("首检件配置")
public class MesFiCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 6919161447256638470L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_FILE")
@Api("文件表")
public class MesFile extends BaseBean implements Serializable {
private static final long serialVersionUID = 5057339077996828057L;
@Column(name = "FILE_NAME")
@ApiParam("文件名称")
private String fileName;

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

@ -15,10 +15,10 @@ import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-05-21
* @Description :物料关键数据
* @Reference :
* @Author : crish
* @CreateDate : 2019-05-15
* @Modify:
**/
@Data
@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("物料关键数据关系")
public class MesKpData extends BaseBean implements Serializable {
private static final long serialVersionUID = 8243089140216459544L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@ -54,6 +55,30 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("数据下限")
private Double lowerLimit;
@Column(name = "TERMINAL_ID")
@ApiParam("工位")
private Integer terminalId;
@Column(name = "TORQUE_GROUP")
@ApiParam("扭矩组")
private String torqueGroup;
@Column(name = "TORQUE_GROUP_SEQ")
@ApiParam("扭矩组顺序")
private Integer torqueGroupSeq;
@Column(name = "TORQUE")
@ApiParam("扭矩项")
private String torque;
@Column(name = "TORQUE_SEQ")
@ApiParam("扭矩项顺序")
private Integer torqueSeq;
@Column(name = "JOB_ID")
@ApiParam("JOB_ID")
private Integer jobId;
@Transient
@ApiParam("扭矩值")
private Double torqueValue;
@ -62,6 +87,19 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("是否在范围之内")
private Boolean ok;
@Transient
@ApiParam("应采个数")
private Integer shouldNum;
@Transient
@ApiParam("实采个数")
private Integer actualNum;
@Transient
@ApiParam("记录颜色")
private String color;
public double getKeyDataCountVal() {
return this.keyDataCount == null ? 0 : this.keyDataCount;
}

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

@ -27,8 +27,8 @@ import java.util.List;
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean implements Serializable {
private static final long serialVersionUID = 5371856566557305323L;
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 6476163540527157643L;
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("系统业务方法")
public class MesMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = -3254086662292709833L;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_MONITOR_TASK")
@Api("监听任务")
public class MesMonitorTask extends BaseBean implements Serializable {
private static final long serialVersionUID = 4606062283853607814L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_MONITOR_TASK_DETAIL")
@Api("监听任务明细")
public class MesMonitorTaskDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -8703163858851139587L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;

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

@ -19,7 +19,6 @@ import java.io.Serializable;
* @CreateDate: 2019/8/22 5:59 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@ -28,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_NUMBER_RULE")
@Api("条码生成规则")
public class MesNumberRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -7547623897602721464L;
@Column(name = "RULE_CODE")
@ApiParam("规则代码")
private String ruleCode;

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable;
/**
@ -27,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_NUMBER_SERIALNO")
@Api("编码序号")
public class MesNumberSerialno extends BaseBean implements Serializable {
private static final long serialVersionUID = -6004402998083665263L;
@Column(name = "CURRENT_NUMBER_PREFIX")
@ApiParam("当前编号前缀")
private String currentNumberPrefix;
@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
@Column(name = "CURRENT_NUMBER")
@ApiParam("当前编号")
private String currentNumber;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
}

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_OBJECT_CFG")
@Api("对象结构")
public class MesObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 55753384888695913L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@ -55,11 +55,11 @@ public class MesObjectCfg extends BaseBean implements Serializable {
private String pojoAttr;
@Column(name = "IS_SAVE")
@ApiParam("是否存储")
@ApiParam("是否保存 1存 2不存")
private Integer isSave;
@Transient
@ApiParam("是否存储")
@ApiParam("是否存储名")
private String isSaveName;
}

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

@ -31,6 +31,7 @@ import java.io.Serializable;
@Deprecated
public class MesPLCConfigure extends BaseBean implements Serializable {
private static final long serialVersionUID = 2609782937477343108L;
@Column(name = "IP")
@ApiParam("设备ip")
private String ipAddress;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("包装规格")
public class MesPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 5275923991324889995L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编号")
private String packageNo;
@ -101,4 +102,18 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("打印状态文字")
private String printStrStatus;
@Transient
@ApiParam("打印缓存id")
private String printId;
public MesPackage() {
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.packSpecQty = packSpecQty;
}
}

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

@ -28,8 +28,8 @@ import java.io.Serializable;
})
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 6980459490465566975L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编码")
private String packageNo;
@ -39,11 +39,11 @@ public class MesPackageDetail extends BaseBean implements Serializable {
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
@ApiParam("物料编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("产品条码")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "PACKAGE_NO2")

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表")
public class MesPackageTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -6425620221708201986L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;

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

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("物料信息")
public class MesPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -7731182105899332283L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@ -75,10 +76,6 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Column(name = "PROCESS_MATCH_TYPE")
@ApiParam("过程编码匹配类型")
private Integer processMatchType;
@ -91,6 +88,14 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("产品编码匹配类型")
private Integer productMatchType;
@Column(name = "产品生产类型")
@ApiParam("产品类型名称")
private String pptCode;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Transient
@ApiParam("过程编码匹配类型名称")
private String processMatchTypeName;
@ -102,4 +107,8 @@ public class MesPart extends BaseBean implements Serializable {
@Transient
@ApiParam("产品编码匹配类型")
private String productMatchTypeName;
@Transient
@ApiParam("分类名称")
private String categoryName;
}

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("零件种类")
public class MesPartCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = 106841156414035968L;
@Column(name = "CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;

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

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:45
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_FORMULA")
@Api("MES_物料配方")
public class MesPartFormula extends BaseBean implements Serializable {
private static final long serialVersionUID = 4905294092563287950L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;
}

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

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/3/5 11:54
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_PRODUCE_TYPE")
@Api("产品生产类型")
public class MesPartProduceType extends BaseBean implements Serializable {
private static final long serialVersionUID = 9191695513960958568L;
@Column(name = "PPT_CODE")
@ApiParam("产品生产类型")
private String pptCode;
@Column(name = "PPT_NAME")
@ApiParam("产品生产类型名称")
private String pptName;
}

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

@ -30,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_PATTERN_JIS")
@Api("JIS发运模式")
public class MesPatternJis extends BaseBean implements Serializable {
private static final long serialVersionUID = 216398440591829755L;
@Column(name = "PATTERN_NO")
@ApiParam("模式编号")
private String patternNo;
@ -45,7 +45,7 @@ public class MesPatternJis extends BaseBean implements Serializable {
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理队列数")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("PCN节点")
public class MesPcn extends BaseBean implements Serializable {
private static final long serialVersionUID = -9150091413555406397L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean implements Serializable {
private static final long serialVersionUID = 2756240593256441951L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

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

@ -30,7 +30,6 @@ import java.io.Serializable;
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 7270930330576127126L;
@Column(name = "PCN_CODE")
@ -58,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
private String syncTime;
@Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2、新增 1、修改")
@ApiParam("同步方式 2.新增 1.修改")
private Integer syncPattern;
@Column(name = "SYNC_TYPE")

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("MES_PCN同步异常日志")
public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -6031591772505958774L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

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

@ -0,0 +1,72 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : 账号离线登陆表
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-01 11:02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean implements Serializable {
private static final long serialVersionUID = 7617353154826718154L;
@Column(name = "USER_ID")
@ApiParam(value = "人员ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号", access = "用户编号")
private String userCode;
@Column(name = "USER_NAME")
@ApiParam(value = "用户名称", access = "账号名称")
private String userName;
@Column(name = "LOGIN_NAME")
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
private Integer userType;
@Lob
@Column(name="LOGIN_INFO")
@ApiParam(value ="登陆信息" , access ="登陆信息")
private String loginInfo;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
private String menuList;
@Lob
@Column(name="MODULE_LIST")
@ApiParam(value ="模块" , access ="模块")
private String moduleList;
}

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

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean implements Serializable {
private static final long serialVersionUID = 4129717677965409395L;
@Column(name = "TASK_CODE")
@ApiParam("任务代码")
private String taskCode;

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

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :mes-pcn定时任务工作清单同步记录
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-27
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -784806389462540310L;
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
@Column(name = "SYNC_TIME_END")
@ApiParam("同步数据截止时间")
private String syncTimeEnd;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private Long errorContent;
public int getSyncStatusVal() {
return this.syncStatus == null ? 0 : this.syncStatus;
}
}

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

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("生产主计划")
public class MesPlanOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 6773005820598583458L;
@Column(name = "ORDER_NO", nullable = false)
@ApiParam("生产计划单号")
private String orderNo;

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

@ -14,6 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -30,8 +31,8 @@ import java.io.Serializable;
@Table(name = "MES_PLC")
@Api("PLC配置表")
public class MesPlc extends BaseBean implements Serializable {
private static final long serialVersionUID = -7172265186837551268L;
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@ -104,7 +105,27 @@ public class MesPlc extends BaseBean implements Serializable {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OPC_URL")
@ApiParam("OPCUA路径")
private String opcUrl;
@Column(name = "NAME_SPACE_INDEX")
@ApiParam("空间索引")
private Integer nameSpaceIndex = 2;
@Column(name = "USER_NAME")
@ApiParam("用户名")
private String userName;
@Column(name = "PASSWORD")
@ApiParam("密码")
private String password;
@Transient
@ApiParam("设备名称")
private String equipmentName;
@Transient
@ApiParam("OPC值")
private List opcValue;
}

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工序")
public class MesProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = -615476712907856558L;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;

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

@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.io.Serializable;
@ -36,6 +35,7 @@ import java.io.Serializable;
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6984193022328810942L;
// 联合唯一索引必须加:, nullable = false
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam(value = "产品条码")
@ -79,11 +79,11 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
private String supplierCode;
@Column(name = "LOT_NO")
@ApiParam
@ApiParam("关联批次")
private String lotNo;
@Column(name = "IS_FEED")
@ApiParam
@ApiParam("是否投料配置")
private Integer isFeed;
@Column(name = "VERSION")
@ -100,7 +100,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@Column(name = "ACTION_TYPE")
@ApiParam(value = "动作类型")
private String actionType;
private Integer actionType;
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;

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

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("产品配置")
public class MesProdCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -1301835558902463754L;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;

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

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("产品配置明细")
public class MesProdCfgDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -5678006170645940563L;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;

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

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_PROD_PACK")
@Api("产品包装关系")
public class MesProdPack extends BaseBean implements Serializable {
private static final long serialVersionUID = -5748484568201154400L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

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

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("产品类流程配置表")
public class MesProdRouteCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3903152693262813917L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@ -44,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable {
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型 10-扫描类型 20-监控类型")
private Integer routeType;
@Column(name = "PPT_CODE")
@ApiParam("产品生产类型")
private String pptCode;
}

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

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 17:58
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_SCATTER_CFG_BOM")
@Api("散件产品配置明细")
public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("散件产品代码")
private String partNo;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "QTY")
@ApiParam("用量")
private BigDecimal qty;
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
private Integer isKeyPart ;
}

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

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/3/11 8:59 上午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_SCATTER_DETAIL")
@Api("MES_散件产品配置关系")
public class MesProdScatterDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -3602480079910597288L;
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("散件产品代码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("散件产品名称")
private String partName;
}

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

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作")
public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = -992595557921651448L;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;

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

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCE_CTGY_PICTURE")
@Api("产品类型图片表")
public class MesProduceCtgyPicture extends BaseBean implements Serializable {
private static final long serialVersionUID = 4199856772441042802L;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;
@ -43,7 +43,21 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
@ApiParam("文件id")
private Long fileId;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Transient
@ApiParam("文件原名称")
private String fileOriginName;
@Transient
@ApiParam("文件名称")
private String fileName;
@Transient
@ApiParam("文件URL")
private String fileUrl;
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-03-06 9:34 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_GROUP")
@Api("MES_生产组")
public class MesProduceGroup extends BaseBean implements Serializable {
private static final long serialVersionUID = -6926189371427937743L;
@Column(name = "PG_CODE")
@ApiParam("生产组代码")
private String pgCode;
@Column(name = "PG_NAME")
@ApiParam("生产组名称")
private String pgName;
}

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

@ -0,0 +1,40 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-03-06 9:22 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_GROUP_CFG")
@Api("MES_生产组配置")
public class MesProduceGroupCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 82611799819312505L;
@Column(name = "PG_CODE")
@ApiParam("生产组代码")
private String pgCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
}

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

@ -33,8 +33,8 @@ import java.math.BigDecimal;
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean implements Serializable {
private static final long serialVersionUID = -1630924042562178494L;
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码")
private String serialNumber;
@ -72,11 +72,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
private Integer printStatus;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
@ApiParam("工位")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ -120,7 +120,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
private String custCode;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
@ApiParam("条码类型 10=正常 20=首检件")
private Integer snType;
@Column(name = "TRAY_NO")

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

@ -33,6 +33,7 @@ import java.io.Serializable;
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -1807953720033107108L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description :生产数据
@ -112,7 +113,7 @@ public class MesProductData extends BaseBean implements Serializable {
@Lob
@Column(name = "LINE_DATA")
@ApiParam("生产数据")
private String lineData;
private List lineData;
@Lob
@Transient

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

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCT_ENCODE_CFG")
@Api("产品编码配置")
public class MesProductEncodeCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 5608141802461306170L;
@Column(name = "CODE_TYPE")
@ApiParam("编码类型")
private Integer codeType;

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

@ -31,8 +31,8 @@ import java.util.List;
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean implements Serializable {
private static final long serialVersionUID = -8044433561607606170L;
@Column(name = "CHECK_ID")
@ApiParam("检测id")
private String checkId;
@ -116,4 +116,12 @@ public class MesQcCheckData extends BaseBean implements Serializable {
@Transient
@ApiParam("工作单元名称")
private String workCellName;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("过程质量检测数据")
private List<MesQcCheckStandard> mesQcCheckStandardList;
}

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

@ -13,6 +13,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -29,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_QC_CHECK_STANDARD")
@Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean implements Serializable {
private static final long serialVersionUID = 3977375527789854590L;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@ -63,6 +64,18 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("频率")
private String checkFrequency;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("检测结果")
private String checkResult;
@Transient
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
@ -71,4 +84,29 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("检测类型名称")
private String checkTypeName;
@Transient
@ApiParam("检测项类型名称")
private String checkItemTypeName;
@Transient
private List<MesQcCheckStandard> childQcList;
public MesQcCheckStandard() {
}
public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
, String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
this.checkItemType = checkItemType;
this.checkItemTypeName = checkItemTypeName;
}
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_GROUP_COUNT")
@Api("MES_队列分组计数")
public class MesQueueGroupCount extends BaseBean implements Serializable {
private static final long serialVersionUID = -7799006330177462162L;
@Column(name = "QGR_CODE")
@ApiParam("分组规则代码")
private String qgrCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "QTY")
@ApiParam("分组数量")
private Integer qty;
@Column(name = "CNT_QTY")
@ApiParam("累计数")
private Integer cntQty;
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :MES_QUEUE_GROUP_COUNT
* @Reference :
* @Author : joke
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_GROUP_RULE")
@Api("MES_队列分组规则")
public class MesQueueGroupRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -6857842499743356177L;
@Column(name = "QGR_CODE")
@ApiParam("分组规则代码")
private String qgrCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "QTY")
@ApiParam("分组数量")
private Integer qty;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -29,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_QUEUE_JIS")
@Api("JIS发运队列")
public class MesQueueJis extends BaseBean implements Serializable {
private static final long serialVersionUID = -2712958514118946868L;
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@ -63,4 +64,16 @@ public class MesQueueJis extends BaseBean implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
@Transient
@ApiParam("颜色")
private String color;
}

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

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_QUEUE_JIS_DETAIL")
@Api("JIS发运队列明细")
public class MesQueueJisDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -3242843412307565585L;
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@ -52,11 +52,19 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
private Integer status;
@Column(name = "FINAL_STATUS")
@ApiParam("发运整体状态")
@ApiParam("明细整体状态")
private Integer finalStatus;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
}

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

@ -0,0 +1,108 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
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;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL")
@Api("MES_客户JIT生产队列")
public class MesQueueJitActual extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308810110L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "SEQ")
@ApiParam("排序号")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SPECIAL_FLAG")
@ApiParam("特殊标识")
private Integer specialFlag;
@Column(name = "CUST_POINT_DATE")
@ApiParam("客户需求时间")
private String custPointDate;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "PG_CODE")
@ApiParam("生产组代码")
private String pgCode;
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;
@Transient
@ApiParam("客户需求结束时间")
private String custPointEndDate;
@Transient
@ApiParam("产品配置名称")
private String prodCfgName;
@Transient
@ApiParam("状态名称")
private String statusName;
@Transient
@ApiParam("特殊标识名称")
private String specialFlagName;
@Transient
@ApiParam(value = "下达按钮编号")
public String buttonCode;
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save