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

Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
刘辉 6 years ago committed by nancy.li
parent febbea09c3 0d0178545c
commit e89df89f9a
195 changed files with 3705 additions and 997 deletions
Show Stats Download Patch File Download Diff File

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

@ -62,6 +62,10 @@ public class MesWorkCell extends BaseBean {
@AnnoOutputColumn(hidden = true)
private String name;
@Column(name = "WORK_CELL_TYPE")
@ApiParam("工位类型")
private String workCellType;
public String getName(){
return this.workCellName;
}

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

@ -11,21 +11,55 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class MesEnumUtil {
/**
* mes设备作业通知配置-通知类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_CFG_TYPE {
TASK_NOTIFY(10, "任务型通知");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_CFG_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;
}
}
/**
* mes设备作业任务明细-执行状态
* mes设备作业通知配置-通知方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
PENDING(10, "待处理"),
COMPLETE(20, "已完成"),
CANCEL(30, "取消");
EMAIL(10, "邮件"),
USERPHONE(10, "手机号");
private int value;
private String description;
MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) {
MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) {
this.value = value;
this.description = description;
}
@ -51,18 +85,19 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务明细-整体结果
* mes设备通知对象配置-对象类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_FINAL_RESULT {
public enum MES_EQU_NOTIFY_OBJECT_CFG_TYPE {
YES(10, "合格"),
NO(20, "不合格");
CHECK_NOTIFY_OBJECT(10, "点检通知对象"),
MAINTAIN_NOTIFY_OBJECT(20, "保养通知对象"),
REPAIR_NOTIFY_OBJECT(30, "维修通知对象");
private int value;
private String description;
MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) {
MES_EQU_NOTIFY_OBJECT_CFG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -88,18 +123,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务明细-维修标识
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
public enum MES_IS_REPEAT {
FALSE(10, "否"),
TRUE(20, "是");
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
private int value;
private String description;
MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) {
MES_IS_REPEAT(int value, String description) {
this.value = value;
this.description = description;
}
@ -112,6 +147,17 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_REPEAT getByValue(int value) {
for (MES_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -125,21 +171,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业状态
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_STATUS {
public enum MES_WORK_CELL_TYPE {
CREATE(10, "创建"),
LANDED(20, "下达"),
OPEN(30, "开启"),
CLOSE(40, "关闭"),
CANCEL(50, "取消");
NORMAL(1, "正常"),
REWORK(2, "返修");
private int value;
private String description;
MES_EQU_TASK_STATUS(int value, String description) {
MES_WORK_CELL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -152,6 +195,17 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_WORK_CELL_TYPE getByValue(int value) {
for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -165,19 +219,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务来源
* pcn 动作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_SOURCE {
public enum MES_ACTION_TYPE {
PLAN(10, "周期计划"),
CREATE(20, "手工创建"),
ANDON(30, "ANDON");
BIND(1, "绑定"),
UNTYING(2, "解绑");
private int value;
private String description;
MES_EQU_TASK_SOURCE(int value, String description) {
MES_ACTION_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -190,6 +243,17 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -203,18 +267,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业通知标识
* pcn 是否是关键件
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_FLAG {
public enum MES_IS_KEY {
FALSE(10, "未通知"),
TRUE(20, "已通知");
IS_KEY(1, "是"),
NO_KEY(2, "否");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_FLAG(int value, String description) {
MES_IS_KEY(int value, String description) {
this.value = value;
this.description = description;
}
@ -227,6 +291,116 @@ public class MesEnumUtil {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_KEY getByValue(int value) {
for (MES_IS_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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 MES_REPAIR_STATUS {
REPAIRED(1, "已维修"),
NO_REPAIR(2, "待维修");
private int value;
private String description;
MES_REPAIR_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_REPAIR_STATUS getByValue(int value) {
for (MES_REPAIR_STATUS mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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 MES_OPERATE_TYPE {
WORKSTATION_SCAN(1, "工位扫描"),
QUALITY_JUDGEMENT(2, "质量判定"),
MATERIAL_DISMANTLING(3, "物料拆解"),
REWORK(4, "返修作业"),
WORKSTATION_MONITORING(5, "工位监控");
private int value;
private String description;
MES_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -240,7 +414,7 @@ public class MesEnumUtil {
}
/**
* mes导入模块
* mes设备作业要求-作业类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_INSERT_EXCEL {
@ -289,10 +463,10 @@ public class MesEnumUtil {
}
/**
* mes设备-作业类型
* mes设备作业要求-作业类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_TYPE {
public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
CHECK(10, "点检"),
MAINTAIN(20, "保养"),
@ -301,7 +475,7 @@ public class MesEnumUtil {
private int value;
private String description;
MES_EQU_TASK_TYPE(int value, String description) {
MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -922,7 +1096,9 @@ public class MesEnumUtil {
public enum PASS_FAIL {
PASS(1, "合格"),
FAIL(2, "不合格");
FAIL(2, "不合格"),
SCRAP(3, "报废"),
DISMANTLED(4, "已拆解");
private int value;
private String description;
@ -1081,7 +1257,8 @@ public class MesEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单");
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");;
private int value;
private String description;
@ -1314,6 +1491,7 @@ public class MesEnumUtil {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
@ -1469,7 +1647,7 @@ public class MesEnumUtil {
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "运行信息"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");

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

@ -351,20 +351,20 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CENTER_RUNNING_STATUS {
RUNNING(1, "start", "开线"),
STOPPED(2, "stop", "停线");
RUNNING("Y", "start", "开线"),
STOPPED("N", "stop", "停线");
private int value;
private String value;
private String code;
private String description;
WORK_CENTER_RUNNING_STATUS(int value, String code, String description) {
WORK_CENTER_RUNNING_STATUS(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
public String getValue() {
return value;
}
@ -376,20 +376,20 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfCode(int val) {
public static String valueOfCode(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].code;
}
}
@ -855,7 +855,8 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单");
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
private int value;
private String description;
@ -1405,4 +1406,187 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_STATUS {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
;
private int value;
private String description;
PRODUCE_SN_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 PACKAGE_IS_SEALED {
UNSEALED(1, "未封箱"),
SEALED(2, "已封箱");
private int value;
private String description;
PACKAGE_IS_SEALED(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 PACKAGE_OP_TYPE {
PACK(10, "打包"),
UNPACK(20, "拆包");
private int value;
private String description;
PACKAGE_OP_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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_PRINT_STATUS {
UNPRINTED(10, "未打印"),
PRINTED(20, "打印");
private int value;
private String description;
PACKAGE_PRINT_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 STATION_BUSI_TYPE {
MESSAGE("message", "返回信息"),
STEP_LIST("stepList", "工步列表"),
STEP_CONTENT("stepContent", "工步内容"),
MODULE_CONTENT("moduleContent", "组件内容"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
private String value;
private String description;
STATION_BUSI_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Table(name = "MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

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

@ -27,14 +27,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOM")
@Table(name = "MES_BOM")
@Api("BOM清单")
public class MesBom extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("父零件号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("父零件名称")
private String partName;
@ -47,11 +47,11 @@ public class MesBom extends BaseBean {
@ApiParam(value = "数量", example = "0")
private Double qty;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@Column(name="ITEM_PART_NAME")
@Column(name = "ITEM_PART_NAME")
@ApiParam("子零件名称")
private String itemPartName;
@ -70,12 +70,12 @@ public class MesBom extends BaseBean {
@Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effEndTime;
public double getQtyVal() {

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

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CONFIG")
@Table(name = "MES_CONFIG")
@Api("mes配置表")
public class MesConfig extends BaseBean {
@Column(name="CFG_CODE")
@Column(name = "CFG_CODE")
@ApiParam("配置代码")
private String cfgCode;
@Column(name="CFG_NAME")
@Column(name = "CFG_NAME")
@ApiParam("配置名称")
private String cfgName;
@Column(name="CFG_TYPE")
@Column(name = "CFG_TYPE")
@ApiParam("配置类型")
private String cfgType;
@Column(name="CFG_KEY")
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
@Column(name="CFG_VALUE")
@Column(name = "CFG_VALUE")
@ApiParam("配置value")
private String cfgValue;
@Column(name="CFG_VAULE_DESC")
@Column(name = "CFG_VAULE_DESC")
@ApiParam("配置value描述")
private String cfgValueDesc;
}

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

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUST_PROD_LINE")
@Table(name = "MES_CUST_PROD_LINE")
@Api("客户产线代码")
public class MesCustProdLine extends BaseBean {
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="CUST_PROD_LINE_NAME")
@Column(name = "CUST_PROD_LINE_NAME")
@ApiParam("客户产线名称")
private String custProdLineName;
}

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

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER")
@Table(name = "MES_CUSTOMER")
@Api("客户信息")
public class MesCustomer extends BaseBean {
@Column(name="CUSTOMER_CODE")
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name="CUSTOMER_NAME")
@Column(name = "CUSTOMER_NAME")
@ApiParam("客户名称")
private String customerName;
@Column(name="BRIEF_TEXT")
@Column(name = "BRIEF_TEXT")
@ApiParam("客户简称")
private String briefText;
@Column(name="ADDRESS")
@Column(name = "ADDRESS")
@ApiParam("客户地址")
private String address;
@Column(name="CONTACT")
@Column(name = "CONTACT")
@ApiParam("客户联系人")
private String contact;
@Column(name="TELEPHONE")
@Column(name = "TELEPHONE")
@ApiParam("客户电话")
private String telephone;
}

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

@ -27,20 +27,20 @@ import javax.persistence.Table;
@Api("数据对象")
public class MesDataObject extends BaseBean {
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="DS_CODE")
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
}

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

@ -27,31 +27,31 @@ import javax.persistence.Table;
@Api("地址清单")
public class MesDatasource extends BaseBean {
@Column(name="DS_CODE")
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name="DS_NAME")
@Column(name = "DS_NAME")
@ApiParam("数据源名称")
private String dsName;
@Column(name="DS_TYPE")
@Column(name = "DS_TYPE")
@ApiParam("数据源类型")
private String dsType;
@Column(name="DS_HOST")
@Column(name = "DS_HOST")
@ApiParam("主机")
private String dsHost;
@Column(name="DS_PORT")
@Column(name = "DS_PORT")
@ApiParam("端口")
private Integer dsPort;
@Column(name="DS_USER")
@Column(name = "DS_USER")
@ApiParam("用户名")
private String dsUser;
@Column(name="DS_PASSWORD")
@Column(name = "DS_PASSWORD")
@ApiParam("密码")
private String dsPassword;
@ -59,7 +59,7 @@ public class MesDatasource extends BaseBean {
@ApiParam("数据库名称")
private String dsDbName;
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

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

@ -0,0 +1,42 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT")
@Api("缺陷表")
public class MesDefect extends BaseBean {
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DEFECT_TYPE")
@ApiParam("缺陷类型")
private String defectType;
}

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

@ -0,0 +1,42 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表")
public class MesDefectCause extends BaseBean {
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "DC_TYPE")
@ApiParam("缺陷原因类型")
private String dcType;
}

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

@ -0,0 +1,69 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 19:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_DEFECT_RECORD")
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean {
@Column(name="SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name="DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name="DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name="DEFECT_LOCATION")
@ApiParam("缺陷位置")
private Integer defectLocation;
@Column(name="REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="MEMO")
@ApiParam("备注")
private String memo;
}

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

@ -0,0 +1,86 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DISMANTLE_RECORD")
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean {
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private Integer dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private Integer okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private Integer missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private Integer scrapQty;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -23,27 +23,27 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ESOP")
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@ -55,35 +55,35 @@ public class MesESOP extends BaseBean {
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name="SOP_NAME")
@Column(name = "SOP_NAME")
@ApiParam("SOP名称")
private String sopName;
@Column(name="SOP_URL")
@Column(name = "SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
private String sopUrl;
@Column(name="GROUP_NAME")
@Column(name = "GROUP_NAME")
@ApiParam("GROUP_NAME")
private String groupName;
@Column(name="FILE_ORIGIN_NAME")
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
private String fileOriginName;
@Column(name="FILE_SIZE")
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name="FILE_TYPE_ID")
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name="FILE_TYPE_NAME")
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Column(name="SYNC_TAG")
@Column(name = "SYNC_TAG")
@ApiParam("SYNC_TAG")
private Integer syncTag=0;
private Integer syncTag = 0;
}

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

@ -28,68 +28,68 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_EQUIPMENT")
@Table(name = "MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean {
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name="EQUIPMENT_NAME")
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("设备状态")
private Integer status;
@Column(name="EQUIPMENT_TYPE")
@Column(name = "EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name="EQUIPMENT_CATEGORY")
@Column(name = "EQUIPMENT_CATEGORY")
@ApiParam("设备类别")
private String equipmentCategory;
@Column(name="EQUIPMENT_MODEL")
@Column(name = "EQUIPMENT_MODEL")
@ApiParam("型号")
private String equipmentModel;
@Column(name="EQUIPMENT_SPEC")
@Column(name = "EQUIPMENT_SPEC")
@ApiParam("规格")
private String equipmentSpec;
@Column(name="EQUIPMENT_MAKER")
@Column(name = "EQUIPMENT_MAKER")
@ApiParam("制造商")
private String equipmentMaker;
@Column(name="RELEASE_DATE")
@Column(name = "RELEASE_DATE")
@ApiParam("出厂日期")
private String releaseDate;
@Column(name="RECEIVE_DATE")
@Column(name = "RECEIVE_DATE")
@ApiParam("接收日期")
private String receiveDate;
@Column(name="ENABLE_DATE")
@Column(name = "ENABLE_DATE")
@ApiParam("启用日期")
private String enableDate;
@Column(name="CONNECT_TYPE")
@Column(name = "CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value ="名称")
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

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

@ -27,19 +27,19 @@ import javax.persistence.Table;
@Api("首检件配置")
public class MesFiCfg extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="FI_QTY")
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
}

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

@ -26,30 +26,30 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_KP_DATA")
@Table(name = "MES_KP_DATA")
@Api("生产区域")
public class MesKpData extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="KEY_DATA_CODE")
@Column(name = "KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name="KEY_DATA_NAME")
@Column(name = "KEY_DATA_NAME")
@ApiParam("关键数据名称")
private String keyDataName;
@Column(name="KEY_DATA_COUNT")
@Column(name = "KEY_DATA_COUNT")
@ApiParam("关键数据数量")
private Integer keyDataCount;
@Column(name="UPPER_LIMIT")
@Column(name = "UPPER_LIMIT")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name="LOWER_LIMIT")
@Column(name = "LOWER_LIMIT")
@ApiParam("数据下限")
private Double lowerLimit;

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

@ -24,50 +24,50 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_KPSN_RULE")
@Table(name = "MES_KPSN_RULE")
@Api("关键件条码校验规则")
public class MesKpsnRule extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="LENGTH")
@Column(name = "LENGTH")
@ApiParam("长度")
private Integer length;
@Column(name="FROM1")
@Column(name = "FROM1")
@ApiParam("起始1")
private Integer from1;
@Column(name="TO1")
@Column(name = "TO1")
@ApiParam("至1")
private Integer to1;
@Column(name="FIX1")
@Column(name = "FIX1")
@ApiParam("内容1")
private String fix1;
@Column(name="FROM2")
@Column(name = "FROM2")
@ApiParam("起始2")
private Integer from2;
@Column(name="TO2")
@Column(name = "TO2")
@ApiParam("至2")
private Integer to2;
@Column(name="FIX2")
@Column(name = "FIX2")
@ApiParam("内容2")
private String fix2;
@Column(name="TYPE")
@Column(name = "TYPE")
@ApiParam("类型")
private String type;
@Column(name="BIND_RULE")
@Column(name = "BIND_RULE")
@ApiParam("绑定规则")
private Integer bandRule;
@Column(name="SUPPLIER_CODE")
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;

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

@ -23,30 +23,30 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_LABEL_TEMPLATE")
@Api(value="打印模板",description = "打印模板")
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean {
private static final long serialVersionUID = 5371856566557305323L;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
@Column(name = "TEMPLATE_NAME")
@ApiParam(value = "模板名称")
private String templateName;
@Lob
@Column(name="TEMPLATE_CONTENT")
@ApiParam(value ="模板内容")
@Column(name = "TEMPLATE_CONTENT")
@ApiParam(value = "模板内容")
private String templateContent;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数拼接")
@ApiParam(value = "模板参数拼接")
@Transient
private String paramsPack;
@Transient
@ApiParam(value ="模板id对应的模板参数")
@ApiParam(value = "模板id对应的模板参数")
private List<MesLabelTemplateParam> labelTemplateParamList;
}

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

@ -24,31 +24,31 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_LABEL_TEMPLATE_PARAM")
@Api(value="打印模板参数",description = "打印模板参数")
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean {
private static final long serialVersionUID = 6476163540527157643L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name="TEMPLATE_PARAM")
@ApiParam(value ="模板参数")
@Column(name = "TEMPLATE_PARAM")
@ApiParam(value = "模板参数")
private String templateParam;
@Lob
@Column(name="TEMPLATE_PARAM_TEXT")
@ApiParam(value ="模板参数描述")
@Column(name = "TEMPLATE_PARAM_TEXT")
@ApiParam(value = "模板参数描述")
private String templateParamText;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数值")
@ApiParam(value = "模板参数值")
@Transient
private String templateParamValue;
}

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

@ -52,7 +52,15 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("主键标记")
private String fieldPk;
@Column(name="POJO_ATTR")
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

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

@ -25,34 +25,34 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PLC_CONFIGURE")
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
public class MesPLCConfigure extends BaseBean {
@Column(name="IP")
@Column(name = "IP")
@ApiParam("设备ip")
private String ipAddress;
@Column(name="CHANNEL_NAME")
@Column(name = "CHANNEL_NAME")
@ApiParam("通道名称")
private String channelName;
@Column(name="DEVICE_NAME")
@Column(name = "DEVICE_NAME")
@ApiParam("设备地址")
private String deviceName;
@Column(name="TAG_NAME")
@Column(name = "TAG_NAME")
@ApiParam("标签地址")
private String tagName;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -0,0 +1,97 @@
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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :包装规格
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACK_SPEC")
@Api("包装规格")
public class MesPackSpec extends BaseBean {
@Column(name = "SPEC_CODE")
@ApiParam("包装规格代码")
private String specCode;
@Column(name = "SPEC_NAME")
@ApiParam("包装规格名称")
private String specName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
@Column(name = "QTY2")
@ColumnDefault("0")
@ApiParam(value = "包装数量2", example = "0")
private Double qty2;
@Column(name = "QTY3")
@ColumnDefault("0")
@ApiParam(value = "包装数量3", example = "0")
private Double qty3;
@Column(name = "QTY4")
@ColumnDefault("0")
@ApiParam(value = "包装数量4", example = "0")
private Double qty4;
@Column(name = "IS_MIXED")
@ApiParam("是否混包")
private Integer isMixed;
@Column(name = "IS_MIXED2")
@ApiParam("是否混包2")
private Integer isMixed2;
@Column(name = "IS_MIXED3")
@ApiParam("是否混包3")
private Integer isMixed3;
@Column(name = "IS_MIXED4")
@ApiParam("是否混包4")
private Integer isMixed4;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public int getIsMixedVal() {
return this.isMixed == null ? 0 : this.isMixed;
}
public int getIsMixed2Val() {
return this.isMixed2 == null ? 0 : this.isMixed2;
}
public int getIsMixed3Val() {
return this.isMixed3 == null ? 0 : this.isMixed3;
}
public int getIsMixed4Val() {
return this.isMixed4 == null ? 0 : this.isMixed4;
}
}

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

@ -0,0 +1,92 @@
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 1:26 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Api("包装规格")
public class MesPackage extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编号")
private String packageNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "PACK_SPEC_QTY")
@ApiParam("包装规格数量")
private Double packSpecQty;
@Column(name = "NUIT")
@ApiParam("包装规格数量")
private String nuit;
@Column(name = "LOT_NO")
@ApiParam("批号")
private String lotNo;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;
@Column(name = "IS_SEALED")
@ApiParam("是否封箱")
private Integer isSealed;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10：未打印 20：已打印")
private Integer printStatus;
@Column(name = "PACK_LEVEL")
@ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
private Integer packLevel;
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
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;
}
}

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

@ -0,0 +1,59 @@
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 2:55 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Api("包装规格")
public class MesPackageDetail extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品条码")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("产品条码")
private String partNameRdd;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

55
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 3:23 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL")
@Api("包装履历表")
public class MesPackageTravel extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "OP_TYPE")
@ApiParam("操作类型")
private Integer opType;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

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

@ -26,52 +26,52 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PART")
@Table(name = "MES_PART")
@Api("物料信息")
public class MesPart extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name="BRIEF_TEXT")
@Column(name = "BRIEF_TEXT")
@ApiParam("零件简称")
private String briefText;
@Column(name="PART_SPEC")
@Column(name = "PART_SPEC")
@ApiParam("零件规格")
private String partSpec;
@Column(name="CATEGORY_CODE1")
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@Column(name="CATEGORY_CODE2")
@Column(name = "CATEGORY_CODE2")
@ApiParam("分类2")
private String categoryCode2;
@Column(name="CATEGORY_CODE3")
@Column(name = "CATEGORY_CODE3")
@ApiParam("分类3")
private String categoryCode3;
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name="PACK_SPEC_CODE")
@Column(name = "PACK_SPEC_CODE")
@ApiParam("包装规格代码")
private String packSpecCode;
@Column(name="DEFAULT_WORK_CENTER")
@Column(name = "DEFAULT_WORK_CENTER")
@ApiParam("默认工作中心")
private String defaultWorkCenter;
@Column(name="PRODUCE_CATEGORY")
@Column(name = "PRODUCE_CATEGORY")
@ApiParam("产品类型")
private String produceCategory;
private String produceCategory;
@Transient
@ApiParam("分类名称")

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PART_CATEGORY")
@Table(name = "MES_PART_CATEGORY")
@Api("零件种类")
public class MesPartCategory extends BaseBean {
@Column(name="CATEGORY_CODE")
@Column(name = "CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;
@Column(name="CATEGORY_NAME")
@Column(name = "CATEGORY_NAME")
@ApiParam("分类名称")
private String categoryName;
@Column(name="CATEGORY_TYPE")
@Column(name = "CATEGORY_TYPE")
@ApiParam("分类类型")
private String categoryType;
}

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

@ -24,42 +24,42 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN")
@Table(name = "MES_PCN")
@Api("PCN节点")
public class MesPcn extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN名称")
private String pcnName;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域")
private String areaCode;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="PCN_VERSION")
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
private String pcnVersion;
@Column(name="CONNECT_IP")
@Column(name = "CONNECT_IP")
@ApiParam("连接IP")
private String connectIp;
@Column(name="CONNECT_COUNT")
@Column(name = "CONNECT_COUNT")
@ApiParam("连接次数")
private Integer connectCount;
@Column(name="IS_CONNECT")
@Column(name = "IS_CONNECT")
@ApiParam("是否连接")
private Integer isConnect;
@Column(name="CONNECT_TIME")
@Column(name = "CONNECT_TIME")
@ApiParam("连接时间")
private String connectTime;

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

@ -24,30 +24,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_CONNECT_LOG")
@Table(name = "MES_PCN_CONNECT_LOG")
@Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN名称")
private String pcnName;
@Column(name="PCN_VERSION")
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
private String pcnVersion;
@Column(name="CONNECT_IP")
@Column(name = "CONNECT_IP")
@ApiParam("连接IP")
private String connectIp;
@Column(name="IS_CONNECT")
@Column(name = "IS_CONNECT")
@ApiParam("是否连接")
private Integer isConnect;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
private String Remark;
}

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

@ -25,53 +25,53 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYNC_CFG")
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="OBJECT_KEY")
@Column(name = "OBJECT_KEY")
@ApiParam("对象主键")
private String objectKey;
@Column(name="SYNC_FREQUENCY")
@Column(name = "SYNC_FREQUENCY")
@ApiParam("同步频率")
private Integer syncFrequency;
@Column(name="SYNC_TIME")
@Column(name = "SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="同步时间")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name="SYNC_PATTERN")//2.新增 1.修改
@Column(name = "SYNC_PATTERN")//2.新增 1.修改
@ApiParam("同步方式")
private Integer syncPattern;
@Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
private Integer syncType;
@Column(name="LAST_SYNC_TIME")
@Column(name = "LAST_SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="上一同步时间")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@Column(name="EXTRACT_GAP")
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
@Column(name = "EXTRACT_GAP")
@ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
@Column(name="EXTRACT_CONDITION")
@ApiParam(value="从数据库抽取的条件限制")
@Column(name = "EXTRACT_CONDITION")
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
public int getSyncFrequencyVal() {

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

@ -24,26 +24,26 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYNC_ERRORLOG")
@Table(name = "MES_PCN_SYNC_ERRORLOG")
@Api("MES_PCN同步异常日志")
public class MesPcnSyncErrorLog extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="ERROR_SPOT")
@Column(name = "ERROR_SPOT")
@ApiParam("异常位置")
private String errorSpot;
@Column(name="ERROR_CONTENT")
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;

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

@ -28,8 +28,8 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYS_USER_OFFLINE")
@Api(value="账号离线登陆表",description = "账号离线登陆表。")
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean {
@Column(name = "USER_ID")
@ -49,13 +49,13 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="部门ID" , example ="-1")
@Column(name = "ORGANIZE_ID")
@ApiParam(value = "部门ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="ORGANIZE_NAME")
@ApiParam(value ="部门名称" , access ="部门名称")
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
}

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

@ -25,59 +25,59 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK")
@Table(name = "MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean {
@Column(name="TASK_CODE")
@Column(name = "TASK_CODE")
@ApiParam("任务代码")
private String taskCode;
@Column(name="TASK_NAME")
@Column(name = "TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@Column(name = "TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@Column(name = "TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@Column(name="TASK_TYPE")
@Column(name = "TASK_TYPE")
@ApiParam("任务类型")
private Integer taskType;
@Column(name="TASK_MODULE")
@Column(name = "TASK_MODULE")
@ApiParam("任务模块")
private String taskModule;
@Column(name="TASK_CLASS")
@Column(name = "TASK_CLASS")
@ApiParam("任务类名")
private String taskClass;
@Column(name="TASK_PACKAGE")
@Column(name = "TASK_PACKAGE")
@ApiParam("任务包名")
private String taskPackage;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@Column(name = "TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@Column(name="TASK_CYCLE_DESCRIPTION")
@Column(name = "TASK_CYCLE_DESCRIPTION")
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_PARAM")
@Column(name = "TASK_PARAM")
@ApiParam("任务参数")
private String taskParam;

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

@ -25,23 +25,23 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK_LOG")
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean {
@Column(name="SYNC_TIME_START")
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
@Column(name="SYNC_TIME_END")
@Column(name = "SYNC_TIME_END")
@ApiParam("同步数据截止时间")
private String syncTimeEnd;
@Column(name="SYNC_STATUS")
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name="ERROR_CONTENT")
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private Long errorContent;

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

@ -26,101 +26,101 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PLAN_ORDER")
@Table(name = "MES_PLAN_ORDER")
@Api("生产主计划")
public class MesPlanOrder extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("生产计划单号")
private String orderNo;
@Column(name="PO_TYPE")
@Column(name = "PO_TYPE")
@ApiParam("计划类型")
private Integer planType;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PLAN_QTY")
@Column(name = "PLAN_QTY")
@ApiParam("计划数量")
private Double planQty;
@Column(name="DECOMPOSE_QTY")
@Column(name = "DECOMPOSE_QTY")
@ApiParam("分解数量")
private Double decomposeQty;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam("计划开始时间")
private String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam("计划结束时间")
private String endTime;
@Column(name="DELIVERY_DATE")
@Column(name = "DELIVERY_DATE")
@ApiParam("交货日期")
private String deliveryDate;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="CUST_ORDER_NO")
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name="SOURCE")
@Column(name = "SOURCE")
@ApiParam("计划来源")
private String source;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="区域")
@ApiParam(value = "区域")
public String areaCode;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeEnd;
public double getPlanQtyVal() {

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

@ -68,7 +68,7 @@ public class MesProcessBom extends BaseBean {
private Double qty;
@Column(name = "IS_REPEAT")
@ApiParam(value = "是否可重复")
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@Column(name = "IS_CHECK")
@ -83,6 +83,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;

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

@ -85,6 +85,14 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "结果")
private String result;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private String isKey;
@Column(name = "ACTION_TYPE")
@ApiParam(value = "动作类型")
private Integer actionType;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROD_CFG")
@Table(name = "MES_PROD_CFG")
@Api("产品配置")
public class MesProdCfg extends BaseBean {
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME")
@Column(name = "PROD_CFG_NAME")
@ApiParam("产品配置名称")
private String prodCfgName;
@Column(name="PROD_CFG_Type_CODE")
@Column(name = "PROD_CFG_Type_CODE")
@ApiParam("产品配置类型代码")
private String prodCfgTypeCode;
}

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

@ -0,0 +1,63 @@
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 3:25 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_PACK")
@Api("产品包装关系")
public class MesProdPack extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;
@Column(name = "PROD_LABEL_TEMPLATE")
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE3")
@ApiParam("包装标签模板3")
private String packLabelTemplate3;
@Column(name = "PACK_LABEL_TEMPLATE4")
@ApiParam("包装标签模板4")
private String packLabelTemplate4;
@Column(name = "PROD_CFG_TYPE")
@ApiParam("项目")
private String prodCfgType;
}

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

@ -0,0 +1,46 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CTGY_PICTURE")
@Api("产品类型图片表")
public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
}

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

@ -25,87 +25,91 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN")
@Table(name = "MES_PRODUCE_SN")
@Api("产品条码表")
public class MesProduceSn extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@Column(name = "SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@Column(name = "PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@Column(name = "NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@Column(name = "IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@Column(name = "OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@Column(name = "SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@Column(name = "CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@Column(name = "CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;
@ -121,6 +125,10 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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

@ -14,97 +14,97 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 产品条码履历实体类
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
* @Description : 产品条码履历实体类
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Table(name = "MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@Column(name = "SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@Column(name = "PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@Column(name = "NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@Column(name = "IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@Column(name = "OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@Column(name = "SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@Column(name = "CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@Column(name = "CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@Column(name = "PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;

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

@ -44,7 +44,7 @@ public class MesProductData extends BaseBean {
@ApiParam("工作单元名称")
private String workCellName;
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

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

@ -26,7 +26,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_DATA")
@Table(name = "MES_QC_CHECK_DATA")
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {

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

@ -25,7 +25,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_STANDARD")
@Table(name = "MES_QC_CHECK_STANDARD")
@Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean {

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

@ -25,46 +25,46 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QUEUE_ORDER")
@Table(name = "MES_QUEUE_ORDER")
@Api("生产队列主表")
public class MesQueueOrder extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name="VIN_CODE")
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name="CUST_FLAG_NO")
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME_RDD")
@Column(name = "PROD_CFG_NAME_RDD")
@ApiParam("产品配置名称")
private String prodCfgNameRdd;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("排序")
private Double seq;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_REPAIR")
@Table(name = "MES_REPAIR")
@Api("维修")
public class MesRepair extends BaseBean {
@Column(name="REPAIR_CODE")
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name="REPAIR_NAME")
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repariName;
@Column(name="REPAIR_TYPE")
@Column(name = "REPAIR_TYPE")
@ApiParam("维修类型")
private Integer repairType;
}

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

@ -0,0 +1,86 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "SIDE_LOCATION")
@ApiParam("产品面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因描述")
private String dcName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SCRAP")
@Table(name = "MES_SCRAP")
@Api("报废原因")
public class MesScrap extends BaseBean {
@Column(name="SCRAP_CODE")
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String scrapCode;
@Column(name="SCRAP_NAME")
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;

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

@ -0,0 +1,70 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String repairCode;
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "SCRAP_REASON")
@ApiParam("报废原因")
private String scrapReason;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -25,26 +25,26 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT")
@Table(name = "MES_SHIFT")
@Api("班次信息")
public class MesShift extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="SHIFT_CODE")
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name="SHIFT_NAME")
@Column(name = "SHIFT_NAME")
@ApiParam("班次名称")
private String shiftName;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@ApiParam("开班时间")
private String startTime;
@Column(name="WORK_TIMES")
@Column(name = "WORK_TIMES")
@ApiParam("作业时长")
private Double workTimes;
}

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

@ -24,14 +24,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT_GROUP")
@Table(name = "MES_SHIFT_GROUP")
@Api("班组")
public class MesShiftGroup extends BaseBean {
@Column(name="GROUP_CODE")
@Column(name = "GROUP_CODE")
@ApiParam("班组代码")
private String groupCode;
@Column(name="GROUP_NAME")
@Column(name = "GROUP_NAME")
@ApiParam("班组名称")
private String groupName;
}

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

@ -25,22 +25,22 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT_REST")
@Table(name = "MES_SHIFT_REST")
@Api("班次休息信息")
public class MesShiftRest extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="SHIFT_CODE")
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="REST_TIMES")
@Column(name = "REST_TIMES")
@ApiParam("休息时长")
private Double restTimes;
}

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

@ -87,7 +87,7 @@ public class MesStep extends BaseBean {
}
public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq){
String routeCode, String processCode, Integer stepSeq) {
this.stepCode = stepCode;
this.stepName = stepName;
this.stepText = stepText;

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

@ -25,71 +25,71 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_TORQUE_DETAIL")
@Table(name = "MES_TORQUE_DETAIL")
@Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean {
@Column(name="SN")
@Column(name = "SN")
@ApiParam("过程条码")
private String serialNumber;
@Column(name="UPPER_LIMIT")
@Column(name = "UPPER_LIMIT")
@ApiParam("最大值")
private Double upperLimit;
@Column(name="LOWER_LIMIT")
@Column(name = "LOWER_LIMIT")
@ApiParam("最小值")
private Double lowerLimit;
@Column(name="TORQUE_DETAIL_VALUE")
@Column(name = "TORQUE_DETAIL_VALUE")
@ApiParam("扭矩值")
private Double torqueValue;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="ok")
@Column(name = "ok")
@ApiParam("扭矩是否合格")
private String ok;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="p_set")
@Column(name = "p_set")
@ApiParam("螺丝枪PSET设置值")
private String deviceSetValue;
@Column(name="MAXANGLE")
@Column(name = "MAXANGLE")
@ApiParam("最大扭矩")
private String maxAngle;
@Column(name="MINANGLE")
@Column(name = "MINANGLE")
@ApiParam("最小扭矩")
private String minAngel;
@Column(name="FINALANGLE")
@Column(name = "FINALANGLE")
@ApiParam("最终扭矩")
private Integer finalAngle;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrderNo;
@Column(name="KEY_DATA_CODE")
@Column(name = "KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name="RESULT_MSG")
@Column(name = "RESULT_MSG")
@ApiParam("扭矩判定结果")
private String resultMsg;
}

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

@ -27,27 +27,27 @@ import javax.persistence.Table;
@Api("开线检查")
public class MesWcCheck extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name="CHECK_TYPE")
@Column(name = "CHECK_TYPE")
@ApiParam("检查类型")
private String checkType;
@Column(name="CHECK_OBJ")
@Column(name = "CHECK_OBJ")
@ApiParam("检查对象")
private String checkObj;
@Column(name="CHECK_ITEM")
@Column(name = "CHECK_ITEM")
@ApiParam("检查项")
private String checkItem;
@Column(name="STANDARD")
@Column(name = "STANDARD")
@ApiParam("检查标准")
private String standard;

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

@ -26,15 +26,15 @@ import javax.persistence.Table;
@Table(name = "MES_WC_EQUIPMENT")
@Api("工作单元设备关系表")
public class MesWcEquipment extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

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

@ -42,4 +42,8 @@ public class MesWorkCell extends BaseBean {
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
@Column(name = "WORK_CELL_TYPE")
@ApiParam("工位类型")
private String workCellType;
}

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

@ -55,7 +55,7 @@ public class MesWorkCellMonitorLog extends BaseBean {
@ApiParam("流程")
private String routeCOde;
@Column(name="MESSAGE")
@Column(name = "MESSAGE")
@ApiParam("异常信息")
private String message;
}

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

@ -47,8 +47,8 @@ public class MesWorkCenter extends BaseBean {
@ApiParam("生产区域代码")
private String areaCode;
@Column(name="RUNNING_STATUS")
@Column(name = "RUNNING_STATUS")
@ApiParam("运行状态")
private Integer runningStatus;
private String runningStatus;
}

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

@ -26,114 +26,114 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_WORK_ORDER")
@Table(name = "MES_WORK_ORDER")
@Api("生产工单")
public class MesWorkOrder extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="COMPLETE_QTY")
@Column(name = "COMPLETE_QTY")
@ApiParam("完成数量")
private Double completeQty;
@Column(name="REPAIR_QTY")
@Column(name = "REPAIR_QTY")
@ApiParam("返修数量")
private Double repairQty;
@Column(name="SCRAP_QTY")
@Column(name = "SCRAP_QTY")
@ApiParam("报废数量")
private Double scrapQty;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("工单序号")
private Double seq;
@Column(name="WO_STATUS")
@Column(name = "WO_STATUS")
@ApiParam("工单状态")
private Integer workOrderStatus;
@Column(name="WO_TYPE")
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer workOrderType;
@Column(name="NEXT_ORDER")
@Column(name = "NEXT_ORDER")
@ApiParam("下一工单")
private String nextOrder;
@Column(name="PLAN_ORDER_NO")
@Column(name = "PLAN_ORDER_NO")
@ApiParam("生产计划单号")
private String planOrderNo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="SCHEDULE_DATE")
@Column(name = "SCHEDULE_DATE")
@ApiParam("排产日期")
private String scheduleDate;
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="SHIFT_CODE")
@Column(name = "SHIFT_CODE")
@ApiParam("班次")
private String shiftCode;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@ApiParam("结束时间")
private String endTime;
@Column(name="WO_SOURCE")
@Column(name = "WO_SOURCE")
@ApiParam("工单来源")
private String workOrderSource;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name="SHIFT_GROUP")
@Column(name = "SHIFT_GROUP")
@ApiParam("班组")
private String shiftGroup;
@Column(name="APPROVAL_STATUS")
@Column(name = "APPROVAL_STATUS")
@ApiParam("审批状态")
private Integer approvalStatus;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="CUST_ORDER_NO")
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
@ -151,27 +151,27 @@ public class MesWorkOrder extends BaseBean {
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="工作中心名称")
@ApiParam(value = "工作中心名称")
public String workCenterName;
@Transient
@ApiParam(value="工作单元名称")
@ApiParam(value = "工作单元名称")
public String workCellName;
@Transient
@ApiParam(value="客户产线名称")
@ApiParam(value = "客户产线名称")
public String custProdLineName;
@Transient
@ApiParam(value="班次名称")
@ApiParam(value = "班次名称")
public String shiftName;
@Transient
@ApiParam(value="班组名称")
@ApiParam(value = "班组名称")
public String shiftGroupName;
@Transient
@ApiParam(value="产品配置名称")
@ApiParam(value = "产品配置名称")
public String prodCfgName;
@Transient
@ -180,23 +180,23 @@ public class MesWorkOrder extends BaseBean {
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59")
public String endTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59")
public String endTimeEnd;
@Transient

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

@ -25,161 +25,161 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_WORK_ORDER_LOG")
@Table(name = "MES_WORK_ORDER_LOG")
@Api("生产工单日志")
public class MesWorkOrderLog extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="COMPLETE_QTY")
@Column(name = "COMPLETE_QTY")
@ApiParam("完成数量")
private Double completeQty;
@Column(name="REPAIR_QTY")
@Column(name = "REPAIR_QTY")
@ApiParam("返修数量")
private Double repairQty;
@Column(name="SCRAP_QTY")
@Column(name = "SCRAP_QTY")
@ApiParam("报废数量")
private Double scrapQty;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("工单序号")
private Double seq;
@Column(name="WO_STATUS")
@Column(name = "WO_STATUS")
@ApiParam("工单状态")
private Integer workOrderStatus;
@Column(name="WO_TYPE")
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer workOrderType;
@Column(name="NEXT_ORDER")
@Column(name = "NEXT_ORDER")
@ApiParam("下一工单")
private String nextOrder;
@Column(name="PLAN_ORDER_NO")
@Column(name = "PLAN_ORDER_NO")
@ApiParam("生产计划单号")
private String planOrderNo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="SCHEDULE_DATE")
@Column(name = "SCHEDULE_DATE")
@ApiParam("排产日期")
private String scheduleDate;
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="SHIFT_CODE")
@Column(name = "SHIFT_CODE")
@ApiParam("班次")
private String shiftCode;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@ApiParam("结束时间")
private String endTime;
@Column(name="WO_SOURCE")
@Column(name = "WO_SOURCE")
@ApiParam("工单来源")
private String workOrderSource;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name="SHIFT_GROUP")
@Column(name = "SHIFT_GROUP")
@ApiParam("班组")
private String shiftGroup;
@Column(name="APPROVAL_STATUS")
@Column(name = "APPROVAL_STATUS")
@ApiParam("审批状态")
private Integer approvalStatus;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="CUST_ORDER_NO")
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="工作中心名称")
@ApiParam(value = "工作中心名称")
public String workCenterName;
@Transient
@ApiParam(value="工作单元名称")
@ApiParam(value = "工作单元名称")
public String workCellName;
@Transient
@ApiParam(value="客户产线名称")
@ApiParam(value = "客户产线名称")
public String custProdLineName;
@Transient
@ApiParam(value="班次名称")
@ApiParam(value = "班次名称")
public String shiftName;
@Transient
@ApiParam(value="班组名称")
@ApiParam(value = "班组名称")
public String shiftGroupName;
@Transient
@ApiParam(value="产品配置名称")
@ApiParam(value = "产品配置名称")
public String prodCfgName;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59")
public String endTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59")
public String endTimeEnd;
public double getQtyVal() {

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

@ -62,8 +62,8 @@ public class GenSerialNoModel {
private String currentNumber;
public GenSerialNoModel(String ruleCode){
this.ruleCode=ruleCode;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;
}
}

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

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\18 19:15
* @Modify:
**/
@Data
@Api("mes 物料BOM")
public class MesPartBomModel {
@ApiParam("物料编号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("数量")
private Integer qty;
public MesPartBomModel() {
}
public MesPartBomModel(String partNo, String partName, Integer qty) {
this.partNo = partNo;
this.partName = partName;
this.qty = qty;
}
}

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

@ -21,7 +21,7 @@ public class PlcCacheKeyModel {
private String tag;
public PlcCacheKeyModel( String device, String tag) {
public PlcCacheKeyModel(String device, String tag) {
this.device = device;
this.tag = tag;
}

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

@ -40,6 +40,7 @@ public class QueueOrderModel implements Serializable {
@Transient
@ApiParam("显示颜色")
private String color;
public QueueOrderModel() {
}

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

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
import java.util.List;
@ -15,6 +13,12 @@ import java.util.List;
**/
public class RequestModel {
private List<MesDefectRecord> mesDefectRecordList; // 不良/缺陷记录数据集
private List<MesRepairRecord> mesRepairRecordList; // 维修记录数据集
private List<MesDismantleRecord> dismantleRecordList; // 拆解记录数据集
private List<MesWorkOrder> workOrderList; // 工单数据集
private List<MesPart> partList; // 物料数据集
@ -46,6 +50,30 @@ public class RequestModel {
this.partList = partList;
}
public List<MesDefectRecord> getMesDefectRecordList() {
return mesDefectRecordList;
}
public void setMesDefectRecordList(List<MesDefectRecord> mesDefectRecordList) {
this.mesDefectRecordList = mesDefectRecordList;
}
public List<MesRepairRecord> getMesRepairRecordList() {
return mesRepairRecordList;
}
public void setMesRepairRecordList(List<MesRepairRecord> mesRepairRecordList) {
this.mesRepairRecordList = mesRepairRecordList;
}
public List<MesDismantleRecord> getDismantleRecordList() {
return dismantleRecordList;
}
public void setDismantleRecordList(List<MesDismantleRecord> dismantleRecordList) {
this.dismantleRecordList = dismantleRecordList;
}
public List<MesWorkOrder> getWorkOrderList() {
return workOrderList;
}

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

@ -27,7 +27,7 @@ public class StationResultBean<T> implements Serializable {
/**
* 对于相同业务类型的数据，区分不同数据类型。
* 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮，
* image-图片
* image-图片
*/
@ApiParam("数据类型")
private String dataType;
@ -36,7 +36,7 @@ public class StationResultBean<T> implements Serializable {
private String message;
@ApiParam("List结果集")
private List<T> resultList;
private List<T> resultList;
@ApiParam("结果对象")
private Object resultObj;

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

@ -16,7 +16,7 @@ import java.util.List;
* @Modify:
**/
@Data
@Api("过程条码打印信息模板")
@Api("打印信息模板")
public class StepPrintSnModel extends MesProduceSn {
@ApiParam("打印描述")
private String printDesc;
@ -30,7 +30,7 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("批次号")
private String batchNo;
@ApiParam("客户物料号")
@ApiParam("箱数量")
private String boxQty;
@ApiParam("订单号")
@ -38,4 +38,10 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("生产日期")
private String productionTime;
@ApiParam("包装编码")
private String packageNo;
@ApiParam("包装规格")
private String packageSpec;
}

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

@ -79,7 +79,7 @@ public class WcCheckModel {
wcCheckModel.setRoutesColumn(new HashMap<>());
wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
onlineSignalEqu=new MesWcCheckRecord();
onlineSignalEqu = new MesWcCheckRecord();
wcCheckModel.setNeed2ShowMap(new HashMap<>());
Map<String, String> dataColumnRelationMap = new HashMap<>();

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

@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject;
* @CreateDate: 2019/9/27 1:59 PM
* @Description:
**/
public interface MesDataObjectRepository extends BaseRepository<MesDataObject,Long> {
public interface MesDataObjectRepository extends BaseRepository<MesDataObject, Long> {
}

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

@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource;
* @CreateDate: 2019/9/27 1:58 PM
* @Description:
**/
public interface MesDatasourceRepository extends BaseRepository<MesDatasource,Long> {
public interface MesDatasourceRepository extends BaseRepository<MesDatasource, Long> {
}

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

@ -0,0 +1,14 @@
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.MesDefectCause;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:04
* @Modify:
**/
public interface MesDefectCauseRepository extends BaseRepository<MesDefectCause, Long> {
}

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

@ -0,0 +1,14 @@
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.MesDefectRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:05
* @Modify:
**/
public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
}

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

@ -0,0 +1,14 @@
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.MesDefect;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:04
* @Modify:
**/
public interface MesDefectRepository extends BaseRepository<MesDefect, Long> {
}

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

@ -0,0 +1,14 @@
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.MesDismantleRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:06
* @Modify:
**/
public interface MesDismantleRecordRepository extends BaseRepository<MesDismantleRecord, Long> {
}

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

@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam;
/**
* @Description : 打印模板
* @Reference :
* @Author : crish
* @Date : 2019-08-18 12:03:01.024
* @Modify :
* @Reference :
* @Author : crish
* @Date : 2019-08-18 12:03:01.024
* @Modify :
**/
public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
}

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

@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
/**
* @Description : 打印模板
* @Reference :
* @Author : crish
* @Date : 2019-08-18 12:03:01.024
* @Modify :
* @Reference :
* @Author : crish
* @Date : 2019-08-18 12:03:01.024
* @Modify :
**/
public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.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.MesPackSpec;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesPackSpecRepository extends BaseRepository<MesPackSpec, Long> {
}

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

@ -0,0 +1,14 @@
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.MesObjectCfg;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/19 10:33 上午
* @Description:
**/
public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
}

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

@ -0,0 +1,13 @@
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.MesPackage;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/19 10:39 上午
* @Description:
**/
public interface MesPackageRepository extends BaseRepository<MesPackage, Long> {
}

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

@ -0,0 +1,13 @@
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.MesPackageTravel;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/19 2:57 下午
* @Description:
**/
public interface MesPackageTravelRepository extends BaseRepository<MesPackageTravel, Long> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.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.MesProdPack;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesProdPackRepository extends BaseRepository<MesProdPack, Long> {
}

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

@ -0,0 +1,14 @@
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.MesProduceCtgyPicture;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:35
* @Modify:
**/
public interface MesProduceCtgyPictureRepository extends BaseRepository<MesProduceCtgyPicture, Long> {
}

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

@ -6,12 +6,12 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel;
import org.springframework.stereotype.Repository;
/**
* @Description : 条码履历Dao层接口
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:36
* @Modify:
**/
* @Description : 条码履历Dao层接口
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:36
* @Modify:
**/
@Repository
public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
}

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

@ -0,0 +1,14 @@
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.MesRepairRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:06
* @Modify:
**/
public interface MesRepairRecordRepository extends BaseRepository<MesRepairRecord, Long> {
}

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

@ -0,0 +1,14 @@
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.MesScrapRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:07
* @Modify:
**/
public interface MesScrapRecordRepository extends BaseRepository<MesScrapRecord, Long> {
}

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

@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment;
* @CreateDate: 2019/9/28 12:04 PM
* @Description:
**/
public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment,Long> {
public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment, Long> {
}

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

@ -82,6 +82,7 @@ public class MesHqlPack {
/**
* 获取工作中心下所有的投料数据
*
* @param mesCellFeed
* @param org
* @return
@ -96,6 +97,7 @@ public class MesHqlPack {
/**
* 获取原材料扫描信息的对应工序BOM
*
* @param mesProcessBom
* @param mesRawPartSn
* @return
@ -105,7 +107,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
return packBean;
}

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ACTION")
@Table(name = "MES_ACTION")
@Api("mes系统业务动作")
public class MesAction extends BaseBean {
@Column(name="ACTION_CODE")
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name="ACTION_NAME")
@Column(name = "ACTION_NAME")
@ApiParam("动作名称")
private String actionName;
@Column(name="ACTION_TYPE")
@Column(name = "ACTION_TYPE")
@ApiParam("动作类型")
private Integer actionType;

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ACTION_METHOD")
@Table(name = "MES_ACTION_METHOD")
@Api("系统业务动作方法")
public class MesActionMethod extends BaseBean {
@Column(name="ACTION_CODE")
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name="METHOD_CODE")
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;

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

@ -29,28 +29,28 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Table(name = "MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Transient
@ApiParam(value ="子集列表")
@ApiParam(value = "子集列表")
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value ="名称")
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;

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

@ -27,14 +27,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOM")
@Table(name = "MES_BOM")
@Api("BOM清单")
public class MesBom extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("父零件号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("父零件名称")
private String partName;
@ -47,11 +47,11 @@ public class MesBom extends BaseBean {
@ApiParam(value = "数量", example = "0")
private Double qty;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@Column(name="ITEM_PART_NAME")
@Column(name = "ITEM_PART_NAME")
@ApiParam("子零件名称")
private String itemPartName;

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

@ -25,35 +25,35 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BUTTON_STATUS")
@Table(name = "MES_BUTTON_STATUS")
@Api("按钮状态配置表")
public class MesButtonStatus extends BaseBean {
@Column(name="BUTTON_CODE")
@Column(name = "BUTTON_CODE")
@ApiParam("按钮代码")
private String buttonCode;
@Column(name="CLASS_NAME")
@Column(name = "CLASS_NAME")
@ApiParam("实体类名称")
private String ClassName;
@Column(name="STATUS_FIELD")
@Column(name = "STATUS_FIELD")
@ApiParam("状态字段")
private String statusField;
@Column(name="JUDGE_FLAG")
@Column(name = "JUDGE_FLAG")
@ApiParam("判断符合")
private String judgeFlag;
@Column(name="STATUS_VALUE")
@Column(name = "STATUS_VALUE")
@ApiParam("状态值")
private String statusValue;
@Column(name="LOGIC_FLAG")
@Column(name = "LOGIC_FLAG")
@ApiParam("逻辑符合")
private String logicFlag;
@Column(name="STATUS_DESC")
@Column(name = "STATUS_DESC")
@ApiParam("描述")
private String statusDesc;

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

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CONFIG")
@Table(name = "MES_CONFIG")
@Api("mes配置表")
public class MesConfig extends BaseBean {
@Column(name="CFG_CODE")
@Column(name = "CFG_CODE")
@ApiParam("配置代码")
private String cfgCode;
@Column(name="CFG_NAME")
@Column(name = "CFG_NAME")
@ApiParam("配置名称")
private String cfgName;
@Column(name="CFG_TYPE")
@Column(name = "CFG_TYPE")
@ApiParam("配置类型")
private String cfgType;
@Column(name="CFG_KEY")
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
@Column(name="CFG_VALUE")
@Column(name = "CFG_VALUE")
@ApiParam("配置value")
private String cfgValue;
@Column(name="CFG_VAULE_DESC")
@Column(name = "CFG_VAULE_DESC")
@ApiParam("配置value描述")
private String cfgValueDesc;
}

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

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUST_PROD_LINE")
@Table(name = "MES_CUST_PROD_LINE")
@Api("客户产线代码")
public class MesCustProdLine extends BaseBean {
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="CUST_PROD_LINE_NAME")
@Column(name = "CUST_PROD_LINE_NAME")
@ApiParam("客户产线名称")
private String custProdLineName;
}

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

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER")
@Table(name = "MES_CUSTOMER")
@Api("客户产线代码")
public class MesCustomer extends BaseBean {
@Column(name="CUSTOMER_CODE")
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name="CUSTOMER_NAME")
@Column(name = "CUSTOMER_NAME")
@ApiParam("客户名称")
private String customerName;
@Column(name="BRIEF_TEXT")
@Column(name = "BRIEF_TEXT")
@ApiParam("客户简称")
private String briefText;
@Column(name="ADDRESS")
@Column(name = "ADDRESS")
@ApiParam("客户地址")
private String address;
@Column(name="CONTACT")
@Column(name = "CONTACT")
@ApiParam("客户联系人")
private String contact;
@Column(name="TELEPHONE")
@Column(name = "TELEPHONE")
@ApiParam("客户电话")
private String telephone;
}

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

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER_PART")
@Table(name = "MES_CUSTOMER_PART")
@Api("客户零件关系")
public class MesCustomerPart extends BaseBean {
@Column(name="CUSTOMER_CODE")
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="CUSTOMER_PART_NO")
@Column(name = "CUSTOMER_PART_NO")
@ApiParam("客户零件号")
private String customerPartNo;

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

Write Preview
Loading…
Cancel
Save