许心洁 5 years ago
commit 9f6c7867c4

BIN
.DS_Store vendored

Binary file not shown.

3
.gitignore vendored

@ -12,4 +12,5 @@ target
*.class
.md
*.log
*.properties
*.properties
.DS_Store

@ -51,10 +51,12 @@ public class AndonCellEventCause extends BaseBean implements Serializable {
@ApiParam(value = "事件原因代码")
private String ecCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "事件原因描述")
private String ecName;

@ -51,10 +51,12 @@ public class AndonCellEventMethod extends BaseBean implements Serializable {
@ApiParam(value = "处理方法代码")
private String emCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "处理方法描述")
private String emName;

@ -62,10 +62,12 @@ public class AndonCellGroupCfg extends BaseBean implements Serializable {
@ApiParam(value = "纵坐标")
private Float verticalAxis;
@AnnoOutputColumn(hidden = true)
@Column(name = "ABNORMAL_SRC")
@ApiParam(value = "异常图片")
private String abnormalSrc;
@AnnoOutputColumn(hidden = true)
@Column(name = "NORMAL_SRC")
@ApiParam(value = "正常图片")
private String normalSrc;

@ -290,6 +290,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
@ApiParam(value ="响应时长-分钟")
private Integer downtime;
@Transient
@ApiParam(value ="故障时长-分钟")
private Integer brokenTime;
@Transient
@ApiParam(value ="故障字符串")
private String faultStr;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;
@ -313,7 +321,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
* @param alarmCode
* @param andonCount
*/
public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) {
public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd,
String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
String alarmCode, Long andonCount,String callTime,String resetTime) {
this.workCenterCode = workCenterCode;
this.workCenterNameRdd = workCenterNameRdd;
this.workCellNameRdd = workCellNameRdd;
@ -324,6 +334,8 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
this.shiftNameRdd = shiftNameRdd;
this.alarmCode = alarmCode;
this.andonCount = andonCount;
this.callTime = callTime;
this.resetTime = resetTime;
}
/**

@ -36,7 +36,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯记录")
@Api("去去去去去去去去去安灯记录")
public class AndonManageRecord extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 4667499369694353351L;

@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable {
@ApiParam(value = "IP地址")
private String nodeIP;
@Column(name = "CHANNEL")
@ApiParam("通道")
private String channel;
@Column(name = "DEVICE")
@ApiParam("终端")
private String device;
@Column(name = "OPC_URL")
@ApiParam("OPCUA路径")
private String opcUrl;
@Column(name = "NAME_SPACE_INDEX")
@ApiParam("空间索引")
private Integer nameSpaceIndex = 2;
@Column(name = "CHANNEL_NAME")
@ApiParam(value = "通道名称")
private String channelName;
@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable {
@ApiParam(value = "标签类型")
private String tagType;
@Column(name = "DATA_TYPE")
@ApiParam("标签数据类型")
private String dataType;
@Column(name = "GROUP_NO")
@ApiParam(value = "分组号")
private String groupNo;

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-07 09:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_PLC_COLOR_CFG")
@Api(value="PLC三色灯控制")
public class AndonPlcColorCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3284234821448131212L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name="RED_PLC_CODE")
@ApiParam(value ="红灯PLC代码")
private String redPlcCode;
@Column(name="YELLOW_PLC_CODE")
@ApiParam(value ="黄灯PLC代码")
private String yellowPlcCode;
@Column(name="GREEN_PLC_CODE")
@ApiParam(value ="绿灯PLC代码")
private String greenPlcCode;
}

@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable {
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
@Column(name="FAULT_STR")
@ApiParam(value ="故障字符串")
private String faultStr;
}

@ -180,4 +180,8 @@ public class BaseManageQueue extends BaseBean implements Serializable {
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
public String alarmDetailCode;
@Column(name = "MEMO")
@ApiParam(value = "备注")
public String memo;
}

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable {
private String msgType;
@ApiModelProperty("消息数据")
private Map<String, Object> msgData;
private Map<String, Object> msgData = new HashMap<>();
@ApiModelProperty("流程状态集合")
private List<AndonRouteStatus> routeStatusList;

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:07
* @Modify:
**/
@Repository
public interface IAndonPlcColorCfgRepository extends BaseRepository<AndonPlcColorCfg, Long> {
}

@ -1100,4 +1100,17 @@ public class AndonHqlPack {
DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
/**
* PLC
* @param andonPlcColorCfg
* @return
*/
public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result);
getStringBuilderPack(andonPlcColorCfg, result);
return result;
}
}

@ -106,6 +106,7 @@ public class BaseThreadLocal {
public static final String INIT_INFO = "INIT_INFO"; //初始化数据
public static final String EMP_NAME = "USER_NAME"; //用户名
public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码
public static final String LANGUAGE_CODE = "LANGUAGE_CODE"; //语言代码
public static boolean isInit(){
Object data = getData(INIT_INFO);
@ -117,9 +118,10 @@ public class BaseThreadLocal {
}
//初始化用户数据
public static void initSessionUserThreadLocal(String empName, String organizeCode){
public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){
setData(BaseThreadLocal.EMP_NAME, empName);
setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode);
setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
setData(BaseThreadLocal.INIT_INFO, true);
}
@ -139,4 +141,12 @@ public class BaseThreadLocal {
}
return organizeCode;
}
//获取线程中的语言代码
public static String getThreadLanguageCode(){
String organizeCode = getDataStr(LANGUAGE_CODE);
if(organizeCode == null){
organizeCode = "CN/zh";
}
return organizeCode;
}
}

@ -114,7 +114,7 @@ public class Pager {
}
public int getCurrentPage() {
return currentPage;
return currentPage < 1 ? 1 : currentPage;
}
public void setCurrentPage(int currentPage) {

@ -80,10 +80,11 @@ public class AndonEnumUtil {
/**
*
* --
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ROUTE_STATUS_INTERFACE_NO {
DEFAULT_ALARM_CALL("DEFAULT_ALARM_CALL", "默认呼叫无界面"),
EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"),
QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
@ -457,7 +458,8 @@ public class AndonEnumUtil {
ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"),
ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"),
AC_CODE("{J}","acCode","事件描述代码"),
AC_NAME("{K}","acNameRdd","事件描述名称");
AC_NAME("{K}","acNameRdd","事件描述名称"),
MEMO("{M}","MEMO","备注");
private String value;
private String code;
@ -902,6 +904,7 @@ public class AndonEnumUtil {
/**
*
* =10 =20 =30, 线=40, =50, =60, =70 =80
* 20201027 90 =, 10 =
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
@ -912,7 +915,9 @@ public class AndonEnumUtil {
DETAIL_TYPE("50", "安灯子类型"),
AC_CODE("60", "原因代码"),
PROD_INFO("70", "产品信息"),
LINE_INFO("80", "产量信息");
LINE_INFO("80", "产量信息"),
PRIORITY_LEVEL("90", "优先级"),
FAULT_STR("100", "故障字符串");
private String value;
private String description;
@ -1061,7 +1066,8 @@ public class AndonEnumUtil {
public enum ALARM_PRIORITY{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级");
THIRD(30,"三级"),
FOUR(40,"四级");
private int value;
private String description;

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Objects;
/**
* @Description :
* @Reference :
@ -17,7 +19,8 @@ public class BlockFormEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FORM_TABLE_TYPE {
TABLE(1, "TABLE", "表"),
VIEW(2, "VIEW", "视图");
VIEW(2, "VIEW", "视图"),
PROCEDURE(3, "PROCEDURE", "存储过程");
private int value;
private String code;
@ -2300,7 +2303,6 @@ public class BlockFormEnumUtil {
}
}
/**
*
*/
@ -2347,4 +2349,124 @@ public class BlockFormEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROCEDURE_COL_TYPE {
IN_PARAM(1, "入参"),
INOUT_PARAM(2, "出入参"),
// ?(3, "按钮"),
OUT_PARAM(4, "出参"),
RETURN_PARAM(5, "返回值");
private int value;
private String description;
private PROCEDURE_COL_TYPE (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROCEDURE_COL_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
*
* TABLE_COL10-
* PROCEDURE_IN_PARAM20-
* PROCEDURE_INOUT_PARAM30-sqlserver
* PROCEDURE_OUT_PARAM40-
* PROCEDURE_RETURN50-mysqlsqlserver
*
*/
public enum ORIGIN_PROPERTY_TYPE {
NORMAL_PROPERTY(10, "正常属性"),
PROCEDURE_IN_PARAM(20, "入参"),
PROCEDURE_INOUT_PARAM(30, "出入参"),
PROCEDURE_OUT_PARAM(40, "出参"),
PROCEDURE_RETURN(50, "返回值");
private final int value;
private final String description;
private ORIGIN_PROPERTY_TYPE (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static ORIGIN_PROPERTY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) {
ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY;
switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){
case IN_PARAM:
result = PROCEDURE_IN_PARAM;
break;
case INOUT_PARAM:
result = PROCEDURE_INOUT_PARAM;
break;
case OUT_PARAM:
result = PROCEDURE_OUT_PARAM;
break;
case RETURN_PARAM:
result = PROCEDURE_RETURN;
break;
}
return result;
}
}
}

@ -98,6 +98,15 @@ public class BlockSoftSwitchEnumUtil {
}
return tmp;
}
public static SUIT_MODE valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
@ -219,10 +228,11 @@ public class BlockSoftSwitchEnumUtil {
SCHEDULE(2,"定时调度"),
RABBITMQ(3,"MQ 调用"),
HTTP(4,"接口调用"),
CLOUD(5,"Cloud调用"),
CLOUD(5,"微服务调用"),
REST(6,"REST调用"),
WEB_SERVICE(7,"WebService"),
SOCKET(8,"socket");
SOCKET(8,"socket"),
RETRY(9,"重试");
private int value;
private String description;
@ -830,7 +840,8 @@ public class BlockSoftSwitchEnumUtil {
public enum SUIT_PROCESS_STATUS {
UNPROCESSED(10, "未处理"),
PROCESSING(20, "处理中"),
PROCESS(30, "已处理");
PROCESS(30, "已处理"),
PROCESS_FAIL(40, "处理失败");
private int value;
private String description;
@ -878,7 +889,8 @@ public class BlockSoftSwitchEnumUtil {
REQUEST_ORGIN_PARAM(20, "请求原始参数"),
ORIGINAL_MESSAGE(30, "原始报文"),
CONVERTED_MESSAGE(40, "转换报文"),
SUIT_SEND_MESSAGE(50, "适配发送报文");
SUIT_SEND_MESSAGE(50, "适配发送报文"),
PROCESS_RESULT(60, "处理结果");
private int value;
private String description;
@ -919,6 +931,52 @@ public class BlockSoftSwitchEnumUtil {
}
/**
* ftp
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FTP_CONNECTION_MODE {
LOCAL_ACTIVE_MODE(10, "本地主动模式"),
LOCAL_PASSIVE_MODE(20, "本地被动模式"),
// REMOTE_ACTIVE_MODE(30, "远程主动模式"),
REMOTE_PASSIVE_MODE(40, "远程被动模式");
private final int value;
private final String description;
FTP_CONNECTION_MODE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static FTP_CONNECTION_MODE valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -957,7 +1015,6 @@ public class BlockSoftSwitchEnumUtil {
}
public static BS_SCRIPT_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
@ -1003,7 +1060,6 @@ public class BlockSoftSwitchEnumUtil {
}
public static BS_SCRIPT_LANGUAGE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
@ -1050,9 +1106,98 @@ public class BlockSoftSwitchEnumUtil {
}
public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BS_SUIT_RETRY_METHOD {
RESET_MESSAGE_STATE(10, "重置报文状态"),
RE_EXECUTE(20, "重新执行");
private int value;
private String description;
private BS_SUIT_RETRY_METHOD (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static BS_SUIT_RETRY_METHOD valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BS_SUIT_RETRY_STATUS {
NOT_RETRY(10, "未重试"),
RETRY(20, "已重试");
private int value;
private String description;
private BS_SUIT_RETRY_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;
}
public static BS_SUIT_RETRY_STATUS valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}

@ -245,12 +245,12 @@ public class CommonEnumUtil {
return tmp;
}
public static int descOf(boolean desc) {
return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
public static int boolOfOfVal(boolean boolVal) {
return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
}
public static int descOf(int desc) {
return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
public static int intOfVal(int boolIntVal) {
return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
}
public static TRUE_OR_FALSE valueOfEnum(int value){
@ -494,6 +494,10 @@ public class CommonEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1812,7 +1816,8 @@ public class CommonEnumUtil {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
private int value;
private String code;
@ -1904,6 +1909,13 @@ public class CommonEnumUtil {
return tmp;
}
public String getSchemaPattern(String schema) {
if(this.equals(SOURCE_SAP_HANA)){
return schema;
}
return defaultSchemaPattern;
}
public String getJDBCUrl(String database,String host,Integer port){
if(this.getValue() == SOURCE_MARIA_DB.getValue()){
return getJDBCUrlMySQL(database,host,port);
@ -1913,6 +1925,8 @@ public class CommonEnumUtil {
return getJDBCUrlPostgreSQL(database,host,port);
}else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
return getJDBCUrlSQLServer(database,host,port);
}else if(this.getValue() == SOURCE_SAP_HANA.getValue()){
return getJDBCUrlSapHana(database,host,port);
}
return null;
}
@ -1940,6 +1954,8 @@ public class CommonEnumUtil {
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}else if(databaseProductName.indexOf(":sap:") != -1){
return SOURCE_SAP_HANA;
}
}
return null;
@ -1961,6 +1977,10 @@ public class CommonEnumUtil {
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
private String getJDBCUrlSapHana(String database,String host,Integer port){
return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
}
private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
StringBuffer sb = new StringBuffer();
sb.append("jdbc:sqlserver://").append(host);

@ -263,6 +263,7 @@ public class WmsEnumUtil {
this.description = description;
}
public int getValue() {
return value;
}
@ -864,7 +865,9 @@ public class WmsEnumUtil {
OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"),
WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库");
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库");
private int value;
private String code;
@ -1452,7 +1455,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_STRATEGY_TYPE {
PART_COVERAGE(110, "物料分类覆盖"),
MATERIAL_PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存"),
MATERIAL_COVERAGE(140, "物料覆盖");
@ -4032,7 +4035,7 @@ public class WmsEnumUtil {
public enum INVENTORY_DIFFERENCE_TYPE {
INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘"),
INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
@ -4287,7 +4290,8 @@ public class WmsEnumUtil {
REPORT(10, "REPORT", "生产报工"),
BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"),
REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"),
PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包");
PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"),
SHIP_CHECK(50, "SHIP_CHECK", "发运校验");
private int value;
private String code;
@ -5062,6 +5066,58 @@ public class WmsEnumUtil {
/**
*
* 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_PLAN_STATUS {
CREATE(10, "CREATE", "创建"),
PLANNED(20, "PLANNED", "处理中"),
CLOSE(30, "CLOSE", "已关闭");
private int value;
private String code;
private String description;
WORK_ORDER_PLAN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
*
* 2
*/
@ -7423,7 +7479,8 @@ public class WmsEnumUtil {
PICK(40, "REPAIR", "挑选"),
REPAIR(50, "REPAIR", "返修"),
BIND(60, "BIND", "绑定"),
OUTSTOCK(70, "OUTSTOCK", "出库");
OUTSTOCK(70, "OUTSTOCK", "出库"),
RE_PACKING(80, "RE_PACKING", "重绑");
private int value;
private String code;
private String description;
@ -8949,7 +9006,8 @@ public class WmsEnumUtil {
FINISH(10, "已完成(绿色)"),
OVER_TIME(20, "已超时(红色)"),
UNRECEIVED(30, "未收货(蓝色)"),
VARIANT(40, "有差异(黄色)");
VARIANT(40, "有差异(黄色)"),
NORMAL(50, "正常(白色)");
private int value;
private String description;
@ -9141,4 +9199,98 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_STATUS_FLAG {
NORMAL(1, "NORMAL", "合格"),
ABNORMAL(2, "ABNORMAL", "超时");
private int value;
private String code;
private String description;
QC_STATUS_FLAG(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* PLC
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_BUSI_TYPE {
DR(10, "DR", "DR"),
DF(20, "DF", "DF"),
IP(30, "IP", "IP");
private int value;
private String code;
private String description;
PLC_BUSI_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -371,6 +371,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
boolean isExitByProperty(String[] propertyNames, Object[] values);
boolean isExitByPropertyDemo(String[] propertyNames, Object[] values);
boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values);
boolean isExitByHqlWhere(String hqlWhere);

@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int listCount() {
try{
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class)
.getSingleResult();
return count == null ? 0 : count.intValue();
}catch(NoResultException e){
@ -651,6 +651,34 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
}
public int findByPropertyCountDemo(String[] propertyNames, Object[] values) {
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 ");
for (int i = 0; i < propertyNames.length; i++) {
if(values[i] != null) {
queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
}
}
Query queryObject = entityManager.createQuery(queryString.toString(),Long.class);
for (int i = 0; i < propertyNames.length; i++) {
if(values[i] != null) {
queryObject.setParameter(propertyNames[i], values[i]);
}
}
try{
Long count = (Long) queryObject.getSingleResult();
return count == null ? 0 : count.intValue();
}catch(NoResultException e){
return 0;
}
}
@Override
public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
if(pager != null){
@ -1439,6 +1467,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) {
return findByPropertyCountDemo(propertyNames, values) > 0;
}
@Override
public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) {
return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0;
}
@ -1524,7 +1557,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
StringBuffer sb = new StringBuffer("select max(CAST(model." + sumPropertyName + " as integer)) from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb, paramName, paramValue);
if(StringUtils.isNotBlank(groupByName)){
sb.append(" group by model." + groupByName);

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
@ -236,7 +237,7 @@ public class DdlPreparedPack {
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%");
}
}
@ -249,28 +250,43 @@ public class DdlPreparedPack {
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val);
}
}
/**
* Stringequal
* Stringequal,
*
* @param columnName
* @param packBean
*/
public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
getStringEqualAndAllowBlankPack(val, columnName, packBean);
}
}
/**
* Stringequal
* Stringequal,
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
}
/**
* 使
* @see #getStringLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
* @see #getStringLikerPackOr(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
* @see #getStringLeftLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
* @see #getStringRightLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
* @param columnName
* @param packBean
*/
@Deprecated
public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val);
@ -484,6 +500,18 @@ public class DdlPreparedPack {
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
/**
* double
*
* @param columnName
@ -496,6 +524,18 @@ public class DdlPreparedPack {
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* double
*
* @param columnName
@ -508,6 +548,18 @@ public class DdlPreparedPack {
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
}
}
/**
* longintequal()
*
* @param columnName
@ -612,6 +664,25 @@ public class DdlPreparedPack {
}
}
/**
* not in List
*
* @param data
* @param columnName
* @param sufColumnName
* @param packBean
*/
public static void getNotInPackList(List<?> data, String columnName, String sufColumnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
String destColumnName = columnName;
if (!StringUtil.isEmpty(sufColumnName)) {
destColumnName = destColumnName + "_" + System.currentTimeMillis();
}
packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data);
}
}
/**
* in String
*
@ -638,6 +709,33 @@ public class DdlPreparedPack {
}
}
/**
* or
*
* @param data
* @param columnNames
* @param columnNamesKey
* @param packBean
*/
public static void getMultOrPackString(String data, List<String> columnNames, String columnNamesKey, DdlPackBean packBean) {
StringBuffer sbf = new StringBuffer(" and ( ");
if (StringUtil.isEmpty(columnNamesKey)) {
columnNamesKey = "mult_column_name";
}
for (int i = 0; i < columnNames.size(); i++) {
String columnName = columnNames.get(i);
sbf.append(" model." + columnName + "=:m_" + columnNamesKey);
if (i == columnNames.size() - 1) {
continue;
}
sbf.append(" or ");
}
sbf.append(" )");
packBean.addColumnQuery(columnNamesKey, sbf.toString(), data);
}
/**
* in String
*

@ -12,11 +12,11 @@ import java.util.regex.Pattern;
public class StringUtil {
public static boolean isEmpty(Object obj){
if(obj ==null || obj.toString().trim().equals("")){
return true;
}
return false;
}
@ -33,4 +33,13 @@ public class StringUtil {
}
return fieldNames;
}
public static boolean isEmptyAndNull(Object obj){
if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){
return true;
}
return false;
}
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -61,6 +62,7 @@ public class BfDataObject extends BaseBean {
@ApiParam(value ="表状态(是否同步)")
private Integer objectStatus;
@AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TABLE_TYPE.class)
@Column(name="OBJECT_TYPE")
@ApiParam(value ="数据类型")
private Integer objectType;

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -8,6 +10,7 @@ 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;
@ -52,6 +55,18 @@ public class BfDataObjectProperty extends BaseBean {
@ApiParam(value ="数据对象列名称")
private String objectColumnName;
// 暂用来区分存储过程出入参数信息
@AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
@ColumnDefault("10")
@Column(name="ORIGIN_PROPERTY_TYPE")
@ApiParam(value ="原始列类型")
private Integer originPropertyType;
public String getOriginPropertyTypeTxt() {
return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
: BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
}
@Column(name="OBJECT_COLUMN_TYPE")
@ApiParam(value ="数据对象类型")
private Integer objectColumnType;
@ -69,7 +84,7 @@ public class BfDataObjectProperty extends BaseBean {
private Integer isNullable;
public Integer getIsNullableVal(){
return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable;
}
// 字段长度

@ -72,18 +72,34 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否新增")
private Integer isObjectAdd;
public boolean isObjectAdd(){
return isObjectAdd != null && isObjectAdd == BlockFormEnumUtil.ELEMENT_ADD_STATUS.ON.getValue();
}
@Column(name = "IS_OBJECT_EDIT")
@ApiParam(value = "是否编辑")
private Integer isObjectEdit;
public boolean isObjectEdit(){
return isObjectEdit != null && isObjectEdit == BlockFormEnumUtil.ELEMENT_EDIT_STATUS.ON.getValue();
}
@Column(name = "IS_OBJECT_DEL")
@ApiParam(value = "是否删除")
private Integer isObjectDel;
public boolean isObjectDel(){
return isObjectDel != null && isObjectDel == BlockFormEnumUtil.ELEMENT_DEL_STATUS.ON.getValue();
}
@Column(name = "IS_OBJECT_DEL_WEAK")
@ApiParam(value = "是否弱删除")
private Integer isObjectDelWeak;
public boolean isObjectDelWeak(){
return isObjectDelWeak != null && isObjectDelWeak == BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.ON.getValue();
}
public Integer getIsObjectDelWeakVal(){
return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue();
}
@ -100,6 +116,10 @@ public class BfElement extends BaseBean {
return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue();
}
public boolean isObjectValid(){
return isObjectValid != null && isObjectValid == BlockFormEnumUtil.ELEMENT_VALID_STATUS.ON.getValue();
}
@Column(name = "ELEMENT_VALID_ATTR_ID")
@ApiParam(value = "元素有效属性id")
private Long elementValidAttrId;
@ -112,6 +132,10 @@ public class BfElement extends BaseBean {
return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue();
}
public boolean isOrganizeIsolation(){
return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue();
}
@Column(name = "IS_OBJECT_EXPORT")
@ApiParam(value = "是否导出")
private Integer isObjectExport;

@ -30,6 +30,8 @@ import javax.persistence.Table;
@Api(value = "表单拾取属性", description = "表单拾取属性")
public class BfElementPickUpProperty extends BaseBean {
private static final long serialVersionUID = -1071243642582327905L;
@Column(name = "PICK_UP_PROPERTY_ID")
@ApiParam(value = "拾取属性id", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -49,6 +51,18 @@ public class BfElementProperty extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectPropertyId;
// 暂用来区分存储过程出入参数信息
@AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
@ColumnDefault("10")
@Column(name="ORIGIN_PROPERTY_TYPE")
@ApiParam(value ="原始列类型")
private Integer originPropertyType;
public String getOriginPropertyTypeTxt() {
return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
: BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
}
@Column(name="PROPERTY_TYPE")
@ApiParam(value ="属性类型")
private Integer propertyType;

@ -42,6 +42,12 @@
</properties>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.hardswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-11-12 17:03
* @Modify:
**/
@Data
public class OpcUAParam {
//opc.tcp://127.0.0.1:49320
@ApiParam("ua服务地址")
private String serverUrl;
/**
*
* OPC UA
*/
@ApiParam("命名空间索引")
private Integer namespaceIndex;
/**
*
* ..
*/
@ApiParam("标记地址")
private String tagAddress;
/**
*
*/
@ApiParam("标记值")
private String tagValue;
/**
*
*/
@ApiParam("标记值类型")
// @AnnoOutputColumn(refClass = OpcUAEnumUtil.OPC_UA_TAG_VALUE_TYPE.class)
private String tagValueType;
public String getTagValueTypeVal(){
return tagValueType == null ? "10" : tagValueType;
}
/**
*
*/
@ApiParam("用户名")
private String userName;
/**
*
*/
@ApiParam("用户密码")
private String password;
/**
*
*/
@ApiParam("请求间隔")
private Double requestInterval = 500.0;
}

@ -0,0 +1,53 @@
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.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/9/23 18:47
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_ALARM_RECORD", indexes = {
@Index(columnList = "WORK_CENTER_CODE")
})
@Api("设备自动报警记录表")
public class MesEquAlarmRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1675134362612851879L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "ALARM_LEVEL")
@ApiParam("报警等级")
private Integer alarmLevel;
@Column(name = "ALARM_START_TIME")
@ApiParam("报警开始时间")
private String alarmStartTime;
@Column(name = "ALARM_STOP_TIME")
@ApiParam("报警开始时间")
private String alarmStopTime;
}

@ -88,7 +88,7 @@ public class MesHqlPack {
public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
return packBean;
}

@ -6,6 +6,7 @@ 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;
@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable {
@ApiParam("不良处理类型")
private String defectActionType;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;

@ -5,6 +5,7 @@ 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;
@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("产品数量")
private Double qty;
@ -102,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
}

@ -5,6 +5,7 @@ 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;
@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@ApiParam("包装批次")
private String lotNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;

@ -5,6 +5,7 @@ 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;
@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable {
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("拉动数量")
private Double qty;

@ -3,8 +3,11 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,8 +29,10 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@NoArgsConstructor
@AllArgsConstructor
@Api("生产报工表")
public class IfProductOffLine extends BaseBean implements Serializable {
public class IfProductOffLine extends BaseBean implements Serializable {
private static final long serialVersionUID = -4960147948435537306L;
@Column(name = "PART_NO")
@ -42,7 +47,8 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@ApiParam("包装条码")
private String packageNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@ -66,7 +72,8 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("原材料用量")
private Double itemQty;
@ -145,4 +152,20 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name = "BASE_MODULE")
@ApiParam("BaseModule零件号")
private String baseModule;
@Column(name = "QUEUE_GROUP_FLAG")
@ApiParam("分组标识")
private String queueGroupFlag;
public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
this.partNo = partNo;
this.packageNo = packageNo;
this.qty = qty;
this.workCenterCode = workCenterCode;
this.qcStatus = qcStatus;
}
}

@ -5,6 +5,7 @@ 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;
@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty = 0D;

@ -6,6 +6,7 @@ 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;
@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String productSn;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("原材料物料用量")
private Double itemQty;
@ -146,4 +149,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@Column(name = "VERSION")
@ApiParam("版本号")
private String version;
@Column(name = "SPECIAL_FLAG")
@ApiParam("特殊标识")
private Integer specialFlag;
}

@ -5,6 +5,7 @@ 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;
@ -46,7 +47,8 @@ public class IfRawPartData extends BaseBean implements Serializable {
@ApiParam("原料条码")
private String serialNumber;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:49
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG")
@Api("MES_看板自定义参数配置")
public class MesBoardCustomParamCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 3932883827194753734L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_VALUE")
@ApiParam("参数值")
private String paramValue;
}

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:47
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_CUSTOMER_DATA")
@Api("MES_看板客户相关信息")
public class MesBoardCustomerData extends BaseBean implements Serializable {
private static final long serialVersionUID = 3871945569470777555L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "COMPLAIN_PLAN_QTY")
@ApiParam("客户抱怨目标数量")
private Integer complainPlanQty;
@Column(name = "COMPLAIN_ACTUAL_QTY")
@ApiParam("客户抱怨实际数量")
private Integer complainActualQty;
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable {
@Column(name = "ROLL_SPEED")
@ApiParam("滚动速度")
private Integer rollSpeed;
@Transient
@ApiParam("跑马灯字体颜色")
private String fontColor;
}

@ -6,6 +6,7 @@ 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;
@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
@ApiParam("设备名称")
private String equName;
@Column(name = "X_AXES")
@Column(name = "X_AXES", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "横坐标")
private Double xAxes = 0d;
@Column(name = "Y_AXES")
@Column(name = "Y_AXES", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "纵坐标")
private Double yAxes = 0d;

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_IMAGE")
@Api("MES_看板图片")
public class MesBoardImage extends BaseBean implements Serializable {
private static final long serialVersionUID = -3757764185082659130L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IMAGE_URL")
@ApiParam("图片路径")
private String imageUrl;
}

@ -0,0 +1,78 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE")
@Api("看板产线配置")
public class MesBoardLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 5212593630787939081L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "PLAN_OEE")
@ApiParam("目标OEE")
private Double planOee;
@Column(name = "PLAN_TAKT")
@ApiParam("计划节拍")
private Integer planTakt;
@Column(name = "PASS_PERCENT_MAX")
@ApiParam("良品率上限")
private Double passPercentMax;
@Column(name = "PASS_PERCENT_MIN")
@ApiParam("良品率下限")
private Double passPercentMin;
@Column(name = "CAR_RUN_TIME")
@ApiParam("小车运行时间(分)")
private Integer carRunTime;
@Column(name = "TEST_CAR_SUM")
@ApiParam("调试车数")
private Integer testCarSum;
@Column(name = "PLAN_FIRST_PASS_YIELD")
@ApiParam("一次良品率目标值")
private Double planFirstPassYield;
@Column(name = "PLAN_PASS_YIELD")
@ApiParam("最终良品率目标值")
private Double planPassYield;
}

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_COORDS_MATRIX")
@Api("MES_看板产线坐标")
public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = -7823702941907604215L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "X_AXIS")
@ApiParam("X坐标")
private String xAxis;
@Column(name = "Y_AXIS")
@ApiParam("Y坐标")
private String yAxis;
}

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_MATRIX")
@Api("MES_看板产线矩阵")
public class MesBoardLineMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = 4414374274261870347L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "PICTURE_URL")
@ApiParam("产线图片路径")
private String pictureUrl;
@Column(name = "USER_FIRST")
@ApiParam("用户编号1")
private String userFirst;
@Column(name = "USER_SECOND")
@ApiParam("用户编号2")
private String userSecond;
@Column(name = "USER_THIRD")
@ApiParam("用户编号3")
private String userThird;
@Column(name = "USER_FORTH")
@ApiParam("用户编号4")
private String userForth;
@Column(name = "USER_FIFTH")
@ApiParam("用户编号5")
private String userFifth;
@Column(name = "USER_SIXTH")
@ApiParam("用户编号6")
private String userSixth;
}

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_STAFF_MATRIX")
@Api("MES_看板产线员工能力矩阵")
public class MesBoardLineStaffMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = 1889056360071546259L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位代码")
private String workCellCode;
@Column(name = "USER_CODE")
@ApiParam("员工编号")
private String userCode;
@Column(name = "X_AXIS")
@ApiParam("X坐标")
private Double xAxis;
@Column(name = "Y_AXIS")
@ApiParam("Y坐标")
private Double yAxis;
}

@ -0,0 +1,118 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : adair
* @CreateDate : 2020-10-19 17:19
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOARD_MAFACT_ASSESSMENT")
@Api("MES_看板麦格纳评定项")
public class MesBoardMafactAssessment extends BaseBean implements Serializable {
private static final long serialVersionUID = 7260899228359202210L;
@Column(name="BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name="ENG_ADV_QUALITY")
@ApiParam("ENG_ADV_QUALITY")
private String engAdvQuality;
@Column(name="MANAGEMENT")
@ApiParam("MANAGEMENT")
private String manageMent;
@Column(name="MAT_LOG_SUP")
@ApiParam("MAT_LOG_SUP")
private String matLogSup;
@Column(name="MFG_EXC")
@ApiParam("MFG_EXC")
private String mfgExc;
@Column(name="QUALITY")
@ApiParam("QUALITY")
private String quality;
@Column(name = "EHS")
@ApiParam("EHS")
private String ehs;
@Column(name = "COST")
@ApiParam("COST")
private String cost;
@Column(name = "HR")
@ApiParam("HR")
private String hr;
@Column(name = "JAN")
@ApiParam("JAN")
private String jan;
@Column(name = "FEB")
@ApiParam("FEB")
private String feb;
@Column(name = "MAR")
@ApiParam("MAR")
private String mar;
@Column(name = "APR")
@ApiParam("APR")
private String apr;
@Column(name = "MAY")
@ApiParam("MAY")
private String may;
@Column(name = "JUN")
@ApiParam("JUN")
private String jun;
@Column(name = "JUL")
@ApiParam("JUL")
private String jul;
@Column(name = "AUG")
@ApiParam("AUG")
private String aug;
@Column(name = "SEP")
@ApiParam("SEP")
private String sep;
@Column(name = "OCT")
@ApiParam("OCT")
private String oct;
@Column(name = "NOV")
@ApiParam("NOV")
private String nov;
@Column(name = "DEC")
@ApiParam("DEC")
private String dec;
}

@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable {
@Column(name = "PICTURE_URL")
@ApiParam("图片路径")
private String pictureUrl;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

@ -5,6 +5,7 @@ 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;
@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
@ApiParam("时段产能")
private Integer hourCapacity;
@Column(name = "STOP_TIME")
@Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("停机时间")
private Double stopTime;

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:47
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_SUBMENU")
@Api("MES_看板子菜单")
public class MesBoardSubmenu extends BaseBean implements Serializable {
private static final long serialVersionUID = 6544735793917822548L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "ITEM_NAME")
@ApiParam("子项名称")
private String itemName;
@Column(name = "ICON")
@ApiParam("ICO图标")
private String icon;
@Column(name = "SEQ")
@ApiParam("顺序号")
private Integer seq;
/**
* 10- 20-
*/
@Column(name = "SHOW_TYPE")
@ApiParam("展示类型")
private Integer showType;
@Column(name = "PICTURE_URL")
@ApiParam("图片路径")
private String pictureUrl;
@Column(name = "VIDEO_URL")
@ApiParam("视频路径")
private String videoUrl;
}

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_SWITCH_CFG")
@Api("MES_看板切换配置")
public class MesBoardSwitchCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -9101785840595985385L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "SWITCH_INTERVAL")
@ApiParam("屏切换频次")
private Integer switchInterval;
@Column(name = "LINE_SWITCH_INTERVAL")
@ApiParam("产线切换频次")
private Integer lineSwitchInterval;
}

@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "X_AXES")
@Column(name = "X_AXES", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("横坐标")
private Double xAxes = 0d;
@Column(name = "Y_AXES")
@Column(name = "Y_AXES", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("纵坐标")
private Double yAxes = 0d;

@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -88,6 +85,28 @@ public class MesBom extends BaseBean implements Serializable {
@ApiParam("BOM代码")
private String bomCode;
@Transient
@ApiParam(value = "过程条码")
public String serialNumber;
@Transient
@ApiParam(value = "已拆解数量")
public Double scrapQty = 0d;
@Transient
@ApiParam("合格数")
private Double okQty = 0d;
@Transient
@ApiParam("缺失数")
private Double missQty = 0d;
@Transient
@ApiParam("报废数")
private Double wasteQty = 0d;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -6,6 +6,7 @@ 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;
@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable {
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("原材料数量")
private Double rawQty;

@ -6,6 +6,7 @@ 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;
@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("原材料数量")
private Double rawQty;

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/9/11 14:29
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CHECK_DATA_CFG", indexes = {
@Index(columnList = "CHECK_CFG_NO")
})
@Api("检测数据源配置")
public class MesCheckDataCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -5608847087804566577L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("字段代码")
private String fieldCode;
@Column(name = "CHECK_CFG_NO")
@ApiParam("检测值配置编号")
private String checkCfgNo;
}

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description: MES-MES_QUALITY_STANDARD
* @CreateDate: 2020/9/27
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CONTROL_PLAN")
@Api("中航控制计划主表")
public class MesControlPlan extends BaseBean implements Serializable {
private static final long serialVersionUID = 1454433409471781390L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_NAME")
@ApiParam("客户名称")
private String custName;
@Column(name = "VERSION")
@ApiParam("版本号")
private Integer version;
@Column(name = "AUDIT_TYPE")
@ApiParam("审核状态")
private Integer auditType;
@Column(name = "IS_ENABLE")
@ApiParam("是否启用")
private Integer isEnable;
}

@ -45,4 +45,16 @@ public class MesCustProdLine extends BaseBean implements Serializable {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "CUST_PROD_LINE_FLAG")
@ApiParam("客户产线标识")
private String custProdLineFlag;
@Column(name = "DOCK_NO")
@ApiParam("dock")
private String dockNo;
}

@ -6,6 +6,7 @@ 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;
@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
@ApiParam("客户物料颜色")
private String customerPartColor;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("用量")
private Double qty;

@ -56,7 +56,7 @@ public class MesDataWarning extends BaseBean implements Serializable {
private Integer informMode;
@Lob
@Column(name = "INFORM_USER")
@Column(name = "INFORM_USER",columnDefinition = "TEXT")
@ApiParam("通知对象")
private String informUser;

@ -0,0 +1,84 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description: MES-DB
* @CreateDate: 2020/9/14
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DB_CHECK_RECORD")
@Api("中航复核异常记录表")
public class MesDbCheckRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 6727925715356900171L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
//DB复核项10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
@Column(name = "DB_CHECK_ITEM")
@ApiParam("DB复核项")
private String dbCheckItem;
@Column(name = "ERROR_FILED_CODE")
@ApiParam("异常取值字段")
private String errorFiledCode;
@Column(name = "ERROR_DESC")
@ApiParam("异常描述")
private String errorDesc;
@Column(name = "PRODUCT_DATA_ID")
@ApiParam("生产记录表主键ID")
private Long productDataId;
//是否停线1=是2=否
@Column(name = "IS_STOP_LINE")
@ApiParam("是否停线")
private Integer isStopLine;
//审批状态10=待审批20=已审批
@Column(name = "STATUS")
@ApiParam("审批状态")
private Integer status;
@Transient
@ApiParam("按钮名称")
private String btnName;
@Transient
@ApiParam("按钮颜色")
private String btnColor;
@Transient
@ApiParam("按钮类别")
private String btnType;
}

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description: MES-DB
* @CreateDate: 2020/9/14
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DB_DATA_CHECK")
@Api("中航DB数据检查配置表")
public class MesDbDataCheck extends BaseBean implements Serializable {
private static final long serialVersionUID = 6889751438239451959L;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
//DB复核项10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
@Column(name = "DB_CHECK_ITEM")
@ApiParam("DB复核项")
private Integer dbCheckItem;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
//是否停线1=是2=否
@Column(name = "IS_STOP_LINE")
@ApiParam("是否停线")
private Integer isStopLine;
@Column(name = "KEY_DATA_FILED")
@ApiParam("质量关键字段")
private String keyDataFiled;
@Column(name = "QC_FILED_CODE")
@ApiParam("缺陷类型字段")
private String qcFiledCode;
@Column(name = "QC_FILED_VALUE")
@ApiParam("缺陷类型合格值")
private String qcFiledValue;
@Column(name = "QC_FAIL_MAX_COUNT")
@ApiParam("缺陷连续不合格预警次数")
private String qcFailMaxCount;
}

@ -5,6 +5,7 @@ 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;
@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("不良处理类型")
private String defectActionType;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@ -95,6 +97,14 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("后移数量")
private Integer backwardNum;
@Transient
@ApiParam("质量状态")
private Integer qcStatus;
@Transient
@ApiParam("缺陷类型名称")
private String defectActionTypeName;
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}

@ -5,6 +5,7 @@ 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;
@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("产品数量")
private Double qty;

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/16 2:42 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_ALARM_LOG", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "WORK_CENTER_CODE")
})
@Api("设备自动报警日志")
public class MesEquAlarmLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -494552645021304934L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "MESSAGE")
@ApiParam("异常信息")
private String message;
}

@ -43,9 +43,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
@ApiParam("作业类型")
private Integer taskType;
@Column(name = "TASK_CYCLE")
@ApiParam("周期(天)")
private Integer taskCycle;
@Column(name = "PLAN_CFG_CODE")
@ApiParam("计划配置代码")
private String planCfgCode;
@Column(name = "LAST_TIME")
@ApiParam("上一执行时间")

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Wynne.Lu
* @CreateDate : 2020-10-15
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_PLAN_CFG")
@Api("设备周期作业计划配置")
public class MesEquTaskPlanCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 7734079474434307857L;
@Column(name = "PLAN_CFG_CODE")
@ApiParam("计划配置代码")
private String planCfgCode;
@Column(name = "BACKGROUND_COLOR")
@ApiParam("显示背景色")
private String backgroundColor;
@Column(name = "COLOR")
@ApiParam("字体颜色")
private String color;
@Column(name = "CYCLE")
@ApiParam("周期(天)")
private Integer taskCycle;
@Column(name = "DISPLAY_TEXT")
@ApiParam("显示文字")
private String displayText;
}

@ -55,6 +55,14 @@ public class MesEquTaskStandard extends BaseBean implements Serializable {
@ApiParam("操作指导")
private String actionGuide;
@Column(name = "ACTION_GUIDE_URL")
@ApiParam("操作指导文件路径")
private String actionGuideUrl;
@Column(name = "FILE_ID")
@ApiParam("操作指导文件id")
private Long fileId;
@Transient
@ApiParam(value = "生产线")
private String workCenterCode;

@ -59,6 +59,10 @@ public class MesEquTaskStandardRecord extends BaseBean implements Serializable {
@ApiParam("操作指导")
private String actionGuide;
@Column(name = "ACTION_GUIDE_URL")
@ApiParam("操作指导")
private String actionGuideUrl;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/4/18 21:05
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EXCEPTION_ALERT_CFG")
@Api("MES_异常提醒配置")
public class MesExceptionAlertCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -2733956307324895221L;
@Column(name = "SRC_MENU_CODE")
@ApiParam("来源模块代码")
private String srcMenuCode;
@Column(name = "SRC_MENU_NAME")
@ApiParam("来源模块名称")
private String srcMenuName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "USER_CODE_GROUP")
@ApiParam("提醒人员集合")
private String userCodeGroup;
}

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/4/18 21:05
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EXCEPTION_WINDOW_RECORD")
@Api("MES_弹窗异常提醒记录")
public class MesExceptionWindowRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -2733956307324895345L;
@Column(name = "SRC_MENU_CODE")
@ApiParam("来源模块代码")
private String srcMenuCode;
@Column(name = "USER_CODE")
@ApiParam("提醒人员")
private String userCode;
@Column(name = "MESSAGE_TYPE")
@ApiParam("消息类型")
private Integer messageType;
@Column(name = "MESSAGE_HEAD")
@ApiParam("提示表头")
private String messageHead;
@Column(name = "MESSAGE_CONTENT")
@ApiParam("提示内容")
private String messageContent;
@Column(name = "STATUS")
@ApiParam("处理状态")
private Integer status;
}

@ -6,6 +6,7 @@ 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;
@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable {
@ApiParam("客户代码")
private String custCode;
@Column(name = "FI_QTY")
@Column(name = "FI_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("首检数量")
private Double fiQty;

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_GENERATE_QC_ORDER")
@Api("待生成检验单")
public class MesGenerateQcOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 14873669015484197L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@Column(name = "IS_GENERATED")
@ApiParam("是否生成了末检单")
private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Column(name = "GENERATE_TIME")
@ApiParam("生成时间")
private String generateTime;
}

@ -5,6 +5,7 @@ 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;
@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable {
@ApiParam("关键数据名称")
private String keyDataName;
@Column(name = "UPPER_LIMIT")
@Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name = "LOWER_LIMIT")
@Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数据下限")
private Double lowerLimit;

@ -5,6 +5,7 @@ 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;
@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("关键数据数量")
private Integer keyDataCount;
@Column(name = "UPPER_LIMIT")
@Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name = "LOWER_LIMIT")
@Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数据下限")
private Double lowerLimit;

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/10/27 13:29
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LINE_FAULT_RECORD")
@Api("产线故障记录表")
public class MesLineFaultRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 6108659377329720059L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "EQU_NAME")
@ApiParam("设备名称")
private String equName;
@Column(name = "FAULT_TIME")
@ApiParam("故障时长(分)")
private Double faultTime;
}

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/9/29 17:25
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LINE_OPERATION")
@Api(value = "产线 开线或停线")
public class MesLineOperation extends BaseBean implements Serializable {
private static final long serialVersionUID = -710375930652577157L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "OBJECT_TYPE")
@ApiParam("对象类型")
private Integer objectType;
/**
* MesDataSource dsCode plcCode
*/
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OP_TYPE")
@ApiParam("操作类型 开线、停线")
private Integer opType;
/**
* db jdbc example:update a set b=:b
*/
@Column(name = "DB_OP_CMD")
@ApiParam("db操作指令")
private String dbOpCmd;
/**
* plc
*/
@Column(name = "PLC_OP_VALUE")
@ApiParam("plc更新值")
private String plcOpValue;
}

@ -6,6 +6,7 @@ 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;
@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable {
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty = 0d;

@ -29,7 +29,7 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LOOP_QC_GENERATE_DETAIL")
@Api("MES_巡检项生成明细")
public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "RELATION_ORDER_NO")
@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
@ApiParam("检测项")
private String checkItem;
@Column(name = "LASR_TIME")
@Column(name = "CHECK_ORDER_TYPE")
@ApiParam("任务单类型")
private String checkOrderType;
@Column(name = "LAST_TIME")
@ApiParam("末次时间")
private String lasrTime;
private String lastTime;
@ApiParam(value = "物料号")
@Transient

@ -6,6 +6,7 @@ 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;
@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable {
@ApiParam("模具代码")
private String mouldCode;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty = 0d;

@ -5,6 +5,7 @@ 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;
@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable {
@ApiParam("结束时段")
private String endTime;
@Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)")
@Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("总生产时间")
private Double totalRunTime;
@Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)")
@Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("总停机时间")
private Double totalStopTime;
@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable {
@ApiParam("实际节拍")
private Integer actualTakt;
@Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)")
@Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("时间开动率")
private Double timeRate;
@Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)")
@Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("性能开动率")
private Double taktRate;
@Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)")
@Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("良品率")
private Double qualifiedRate;
@Column(name = "OEE", columnDefinition = "decimal(18,4)")
@Column(name = "OEE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("OEE")
private Double oee;
@Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)")
@Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("OEE目标值")
private Double targetOee;
@Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)")
@Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("OEE警戒值")
private Double minOee;

@ -5,6 +5,7 @@ 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;
@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable {
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;

@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable {
@ApiParam("包装规格名称")
private String specName;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty = 0d;
@Column(name = "QTY2")
@Column(name = "QTY2", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "包装数量2", example = "0")
private Double qty2;
@Column(name = "QTY3")
@Column(name = "QTY3", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "包装数量3", example = "0")
private Double qty3;
@Column(name = "QTY4")
@Column(name = "QTY4", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "包装数量4", example = "0")
private Double qty4;

@ -6,6 +6,7 @@ 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;
@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "PACK_SPEC_QTY")
@Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("包装规格数量")
private Double packSpecQty;
@ -140,6 +143,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("库位代码")
private String locationCode;
@Column(name = "ERP_WORK_CENTER_CODE")
@ApiParam("erp工作中心")
private String erpWorkCenterCode;
@Transient
@ApiParam("目标库位代码")
private String destLocationCode;
@ -152,9 +159,29 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("明细总数")
private Integer detailTotal = 0;
@Transient
@ApiParam("托包规数量")
private Double qty2;
@Transient
@ApiParam("过程条码")
private String serialNumber;
public MesPackage() {
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public double getQty2Val() {
return this.qty2 == null ? 0.0d : this.qty2;
}
public double getPackSpecQtyVal() {
return this.packSpecQty == null ? 0.0d : this.packSpecQty;
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;

@ -6,6 +6,7 @@ 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;
@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable {
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty = 0d;

@ -6,6 +6,7 @@ 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;
@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("零件规格")
private String partSpec;
@Column(name = "PART_SPEC_QTY")
@Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("标准包规数量")
private Double partSpecQty;
@ -76,7 +78,7 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("默认工作中心")
private String defaultWorkCenter;
@Column(name = "PRODUCE_CTGY_CODE")
@Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@ -104,6 +106,10 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("颜色代码")
private String colorCode;
@Column(name = "COLOR_NAME")
@ApiParam("颜色名称")
private String colorName;
@Column(name = "SHELVES_AMOUNT")
@ApiParam("挂架数")
private Integer shelvesAmount;
@ -124,6 +130,11 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("是否小尺寸物料")
private Integer isSmallSize = 1;
@Column(name = "QTY2", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "包装数量")
private Double qty2;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@ -147,4 +158,8 @@ public class MesPart extends BaseBean implements Serializable {
@Transient
@ApiParam("拉动数量")
private Double pullQty;
@Transient
@ApiParam("BOM用量")
private Double bomQty = 0d;
}

@ -53,6 +53,14 @@ public class MesPartCheck extends BaseBean implements Serializable {
@ApiParam("记录数量表达式")
private String recordNumSpelExpress;
@Column(name = "DATA_TYPE")
@ApiParam("数据查询类型")
private Integer dataType = 1;
@Column(name = "LIMIT_TIMES")
@ApiParam("限定检测次数")
private Integer limitTimes;
@Column(name = "RECORD_NUM_DESC")
@ApiParam("校验表达式描述")
private String recordNumDesc;

@ -6,6 +6,7 @@ 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;
@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable {
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;

@ -5,6 +5,7 @@ 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;
@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable {
@ApiParam("关联物料号")
private String itemPartNo;
@Column(name = "ITEM_QTY")
@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("用量")
private Double itemQty;

@ -3,8 +3,10 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -24,6 +26,8 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_STOCK_SCHEDULE")
@Api("MES_库存排程配置")
@ -75,6 +79,26 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STOCK_QTY")
@ApiParam("排程实时库存")
private Integer stockQty;
@Column(name = "MIN_GEN_LOT")
@ApiParam("最小下达批次")
private Integer minGenLot;
@Transient
@ApiParam("已下达箱数")
private Integer alreadyLandedNum;
@Transient
@ApiParam("当前库存")
private Integer currentStock;
@Transient
@ApiParam("物料名称")
private String partName;

@ -80,6 +80,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Column(name = "IGNORE_FIELDS")
@ApiParam(value = "同步的时候部分字段不同步")
private String ignoreFields;
@Transient
@ApiParam("同步方式")
private String syncPatternName;

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/4/18 21:05
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYSTEM_CFG")
@Api("MES_PCN_系统配置")
public class MesPcnSystemCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -2733956307324811596L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name = "SYS_NAME")
@ApiParam("系统名称")
private String sysName;
@Column(name = "COMPANY")
@ApiParam("公司名称")
private String company;
@Column(name = "SYS_LOG")
@ApiParam("系统LOG")
private String sysLog;
@Column(name = "MAIN_LOG")
@ApiParam("主页LOG")
private String mainLog;
@Column(name = "COPYRIGHT")
@ApiParam("版权信息")
private String copyright;
@Transient
@ApiParam("LOG存放地址")
private String logUrl;
}

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

Loading…
Cancel
Save