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

合并冲突

Browse Source
yun-zuoyi
陈思洁 6 years ago
parent d269576dbf 2e86ff81d0
commit b1dd7d3915
49 changed files with 1225 additions and 96 deletions
Show Stats Download Patch File Download Diff File

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

@ -103,6 +103,12 @@ public class AndonManageQueue extends BaseBean {
@AnnoOutputColumn(hidden = true)
public String callTime;
@Column(name="CLOSE_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="撤销时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String closeTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@ -129,6 +135,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "呼叫人")
private String callUser;
@Column(name = "CLOSE_USER")
@ApiParam(value = "撤销人")
private String closeUser;
@Transient
@ApiParam(value = "呼叫人名字")
private String callUserName;
@ -203,6 +213,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "事件方法描述")
private String emNameRdd;
@Column(name = "CLOSE_CAUSE")
@ApiParam(value = "撤销原因")
private String closeCause;
@Column(name = "EM_DESC")
@ApiParam(value = "事件具体方法")
private String emDesc;

62
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -3,10 +3,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.*;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
/**
@ -17,6 +20,65 @@ import org.apache.commons.lang3.StringUtils;
* @Modify:
**/
public class AndonHqlPack {
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
/**
* 工作单元呼叫原因配置查询条件封装
* @param andonCellAlarmCause
* @return
*/
public static DdlPackBean getAndonCellAlarmCause(AndonCellAlarmCause andonCellAlarmCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
/**
* 工作单元事件方法配置查询条件封装
* @param andonEventMethod
* @return
*/
public static DdlPackBean getAndonCellEventMethod(AndonCellEventMethod andonEventMethod) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
return packBean;
}
/**
* 工作单元事件原因查询封装
* @param andonEventCause
* @return
*/
public static DdlPackBean getAndonCellEventCause(AndonCellEventCause andonEventCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
return packBean;
}
/**
* 工作单元事件现象查询条件封装
* @param andonEventPhenoMenon
* @return
*/
public static DdlPackBean getAndonCellEventPhenomenon(AndonCellEventPhenomenon andonEventPhenoMenon) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
/**
* genju 安灯队列参数查询安灯队列
* @param andonManageQueue

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

@ -1,7 +1,5 @@
package cn.estsh.i3plus.pojo.base.annotation;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

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

@ -12,6 +12,80 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes工作单元参数类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
MES_WORK_CELL_PARAM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes工作单元参数模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_PARAM_MODEL {
PUBLIC(10, "公用"),
JIT(20, "JIT生产"),
WORK_ORDER(30, "工单生产"),
OTHER(99, "其他");
private int value;
private String description;
MES_WORK_CELL_PARAM_MODEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes条码生成规则最大值后是否循环
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -897,5 +971,39 @@ public class MesEnumUtil {
}
}
/**
* 条码生成业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMPANY_TYPE {
PREFIX("prefix", "前缀"),
PART_NO("partNo", "物料号"),
CUST_PART_NO("custPartNo", "客户物料号"),
CUST_CODE("custCode", "客户代码"),
PROD_LOCATION("prodLocation", "产地"),
YEAR("year", "年"),
MOTH("month", "月"),
DAY("day", "日"),
HOUR("hour", "小时"),
MINUTE("minute", "分钟"),
SECOND("second", "秒"),
SERIAL("serialNo", "序列号");
private String value;
private String description;
COMPANY_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -10,6 +10,81 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @Modify:
**/
public class MesPcnEnumUtil {
/**
* mes-pcn定时任务状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS{
OPEN(1,"OPEN"),
CLOSE(2,"CLOSE");
private int value;
private String description;
MES_PCN_TASK_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes-pcn定时任务同步结果状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_SYNC_STATUS{
SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
ERROR(2,"mes主服务定时任务工作清单同步失败");
private int value;
private String description;
MES_PCN_TASK_SYNC_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;
}
}
/**
* PCN同步MES主数据同步方式枚举
* 10.
@ -119,4 +194,42 @@ public class MesPcnEnumUtil {
}
}
/**
* MesProduceSn实体对应的printStatus值 条码表条码打印状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_PRINT_STATUS {
CREATE(10, "创建"),
ONLINE(20, "上线打印"),
OFFLINE(30, "下线打印");
private int value;
private String description;
PRODUCE_SN_PRINT_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -82,4 +82,73 @@ public class SoftSwitchEnumUtil {
}
}
/**
* 认证方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum VERIFICATION_METHOD{
LOGIN(1,"登录");
private int value;
private String description;
VERIFICATION_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;
}
}
/**
* 认证类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum KEY_TYPE{
ACCOUNT_PASSWORD(1,"账号密码");
private int value;
private String description;
KEY_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;
}
}
//keyTypeId
}

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

@ -1139,8 +1139,7 @@ public class WmsEnumUtil {
CREATE(10, "创建"),
BE_HANDLE(20, "待处理"),
FINISH(30, "已处理"),
HANDLE_ERROR(40, "处理出错"),
TEST(50, "调试");
HANDLE_ERROR(40, "处理出错");
private int value;
private String description;

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

@ -531,4 +531,5 @@ public class DdlPreparedPack {
}
return name;
}
}

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

@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean {
@Column(name = "PREFIX")
@ApiParam("前缀")
private Integer prefix;
private String prefix;
@Column(name = "NUMBER_RULE")
@ApiParam("编码规则")

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

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes-pcn定时任务工作清单
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-26
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean {
@Column(name="TASK_CODE")
@ApiParam("任务代码")
private String taskCode;
@Column(name="TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@Column(name="TASK_TYPE")
@ApiParam("任务类型")
private Integer taskType;
@Column(name="TASK_MODULE")
@ApiParam("任务模块")
private String taskModule;
@Column(name="TASK_CLASS")
@ApiParam("任务类名")
private String taskClass;
@Column(name="TASK_PACKAGE")
@ApiParam("任务包名")
private String taskPackage;
@Column(name="PCN_NAME")
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@Column(name="TASK_CYCLE_DESCRIPTION")
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

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

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes-pcn定时任务工作清单同步记录
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-27
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean {
@Column(name="SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
@Column(name="SYNC_TIME_END")
@ApiParam("同步数据截止时间")
private String syncTimeEnd;
@Column(name="SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name="ERROR_CONTENT")
@ApiParam("异常内容")
private Long errorContent;
public int getSyncStatusVal() {
return this.syncStatus == null ? 0 : this.syncStatus;
}
}

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

@ -62,4 +62,8 @@ public class MesProdRouteOptParam extends BaseBean {
public int getStepSeq() {
return this.stepSeq == null ? 0 : this.stepSeq;
}
public void setStepSeq(int stepSeq) {
this.stepSeq = stepSeq;
}
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :工作单元参数
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
}

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

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description: 打印条码工步， 打印信息模板
* @Reference:
* @Author: Crish
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("过程条码打印信息模板")
public class StepPrintSnModel extends MesProduceSn {
@ApiParam("打印描述")
private String printDesc;
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTaskLog;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-27
* @Modify:
**/
@Repository
public interface MesPcnTaskLogRepository extends BaseRepository<MesPcnTaskLog, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTask;
import org.springframework.stereotype.Repository;
/**
* @Description :mes-pcn定时任务清单
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-26
* @Modify:
**/
@Repository
public interface MesPcnTaskRepository extends BaseRepository<MesPcnTask, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Repository
public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
}

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

@ -0,0 +1,91 @@
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;
/**
* @Description :mes-pcn定时任务工作清单
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-26
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean {
@Column(name="TASK_CODE")
@ApiParam("任务代码")
private String taskCode;
@Column(name="TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@Column(name="TASK_TYPE")
@ApiParam("任务类型")
private Integer taskType;
@Column(name="TASK_MODULE")
@ApiParam("任务模块")
private String taskModule;
@Column(name="TASK_CLASS")
@ApiParam("任务类名")
private String taskClass;
@Column(name="TASK_PACKAGE")
@ApiParam("任务包名")
private String taskPackage;
@Column(name="PCN_NAME")
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@Column(name="TASK_CYCLE_DESCRIPTION")
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

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

@ -73,6 +73,10 @@ public class MesProdRouteOptParam extends BaseBean {
return this.stepSeq == null ? 0 : this.stepSeq;
}
public void setStepSeq(int stepSeq) {
this.stepSeq = stepSeq;
}
public int getParamTypeVal() {
return this.paramType == null ? 0 : this.paramType;
}

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

@ -0,0 +1,46 @@
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;
/**
* @Description :工作单元参数
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
}

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

@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/19 7:00 PM
* @Description:
* @Description: mes文件下载的model -> Esop
**/
@Data

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

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/23 11:42 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("生成条码模型")
public class GenSerialNoModel extends BaseBean {
@ApiParam("规则代码")
private String ruleCode;
@ApiParam("规则描述")
private String ruleDesc;
@ApiParam("物料号")
private String partNo;
@ApiParam("客户物料号")
private String custPartNo;
@ApiParam("客户代码")
private String custCode;
@ApiParam("产地")
private String prodLocation;
@ApiParam("前缀")
private Integer prefix;
@ApiParam("编码规则")
private String numberRule;
@ApiParam("序号长度")
private Integer serialnoLength;
@ApiParam("增量")
private Integer serialnoIncrement;
@ApiParam("最大值后循环")
private Integer isCycle;
@ApiParam("当前编号前缀")
private String currentNumberPrefix;
@ApiParam("当前序号")
private Integer currentSerialno;
@ApiParam("当前编号")
private String currentNumber;
}

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

@ -16,7 +16,4 @@ import java.util.List;
@Repository
public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
List<MesMethod> findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted);
List<MesMethod> findByOrganizeCodeAndIsDeleted(String organizeCode, int value);
}

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

@ -1,16 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import org.springframework.stereotype.Repository;
/**
* @Description :条码生成规则
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-23
* @Modify:
* @Author: Wynne.Lu
* @CreateDate: 2019/8/23 1:22 PM
* @Description:
**/
@Repository
public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/23 1:23 PM
* @Description:
**/
@Repository
public interface MesNumberSerialnoRepository extends BaseRepository<MesNumberSerialno, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPcnTask;
import org.springframework.stereotype.Repository;
/**
* @Description :mes-pcn定时任务清单
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-26
* @Modify:
**/
@Repository
public interface MesPcnTaskRepository extends BaseRepository<MesPcnTask, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Repository
public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
}

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

@ -234,6 +234,14 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getAllBaseDataByNormalPro(String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* MES区域信息查询条件封装
*
@ -445,6 +453,19 @@ public class MesHqlPack {
* @param mesESOP
* @return
*/
public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
DdlPackBean packBean = getAllBaseDataByNormalPro(org);
DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
return packBean;
}
public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) {
@ -486,14 +507,17 @@ public class MesHqlPack {
}
public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
return packBean;
}
@ -546,10 +570,10 @@ public class MesHqlPack {
}
public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
}
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
return packBean;
}
@ -834,9 +858,19 @@ public class MesHqlPack {
/**
* MES 产品配置信息查询条件封装
*
* @param prodCfg
* @param
* @return
*/
public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
DdlPackBean packBean = getAllBaseDataByNormalPro(org);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean);
return packBean;
}
public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {
@ -1045,6 +1079,27 @@ public class MesHqlPack {
}
/**
* MES工作单元参数查询条件封装
*
* @param workCellParam
* @return
*/
public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode);
if (StringUtils.isNotEmpty(workCellParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean);
}
if (null != workCellParam.getParamType()) {
DdlPreparedPack.getNumEqualPack(workCellParam.getParamType(), "paramType", packBean);
}
if (null != workCellParam.getParamModel()) {
DdlPreparedPack.getNumEqualPack(workCellParam.getParamModel(), "paramModel", packBean);
}
return packBean;
}
/**
* MES工作单元队列查询条件封装
*
* @param workCellPoint
@ -1103,4 +1158,26 @@ public class MesHqlPack {
packBean.setOrderByStr(numberRule.orderBy());
return packBean;
}
/**
* mes-pcn定时任务清单
* @param mesPcnTask
* @param organizeCode
* @return
*/
public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
}
if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
}
if (null != mesPcnTask.getTaskStatus()) {
DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
}

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

@ -48,7 +48,7 @@ public class SuitCoreModel {
private String suitCaseStatusCode;
/**
* 安全证书
* 适配认证
*/
private BsSslKey sslKey;
@ -88,7 +88,7 @@ public class SuitCoreModel {
/**
*
* @param requestSource 请求来源
* @param sslKey 安全证书对象
* @param sslKey 适配认证对象
* @param bsSuitCase 适配器信息
*/
public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) {

71
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java → modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -43,19 +45,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
public String message;
@ApiParam("列表信息")
public List<String> informations;
public List<String> getInformations(){
if(informations == null){
informations= new ArrayList<>();
}
return informations;
}
public void setInformation(List<String> list){
if(list == null){
list = new ArrayList<>();
}
informations = list;
}
public List<WmsMessageStyleModel> informations;
@ApiParam("可选项")
public List<WmsOptionModel> options;
@ -88,50 +78,42 @@ public class WmsActionResponseBean<Obj> implements Serializable {
*/
@ApiParam(value = "是否需要选择单号")
public Boolean toSelected = false;
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
*/
@ApiParam(value = "按钮是否禁用")
public Boolean isBtnDisabled = true;
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
*/
@ApiParam(value = "按钮是否禁用")
public Boolean isDetailsBtnDisabled = true;
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
* 与 toSelected 属性配合使用，
* 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
*/
@ApiParam(value = "按钮是否禁用")
public Boolean isCommitBtnDisabled = true;
@ApiParam(value = "关键字段列名")
public String keyColumn;
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
*/
@ApiParam(value = "输入框是否禁用")
public Boolean isInputBtnDisabled = false;
/**
* 与 toSelected 属性配合使用，
* 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
*/
@ApiParam(value = "关键字段列名")
public String keyColumn;
@ApiParam(value = "是否完成流程操作")
public Boolean isComplete = false;
@ApiParam(value = "交易类型信息")
public WmsTransType wmsTransType;
@ApiParam(value = "是否自动开窗")
public Boolean isAutoOpenWindow = false;
@ApiParam(value = "正则校验")
private String regularCheck;
@ApiParam(value = "正则校验失败提示")
private String regularCheckFailMsg;
@ApiParam(value = "搜索KEY")
public String searchKey;
@ApiParam(value = "分组KEY")
public String groupKey;
public WmsActionResponseBean(Boolean codeStatus, String message) {
this.codeStatus = codeStatus;
this.message = message;
}
public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus, Map<String, Obj> barCode) {
public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus, Map<String, Obj> barCode) {
this.percent = percent;
this.message = message;
this.informations = informations;
@ -140,7 +122,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
this.barCode = barCode;
}
public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus) {
this.percent = percent;
this.message = message;
this.informations = informations;
@ -148,8 +130,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
this.codeStatus = codeStatus;
}
public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) {
this.isBtnDisabled = isBtnDisabled;
public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) {
this.percent = percent;
this.message = message;
this.informations = informations;

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

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 消息样式实体类
* @Reference
* @Author dragon
* @CreateDate 2019/8/26 10:36
* @Modify
*/
@Data
public class WmsMessageStyleModel implements Serializable {
private static final long serialVersionUID = -810847996371452831L;
@ApiParam("任务状态")
public Integer taskStatus;
@ApiParam("单据明细状态")
public Integer odStatus;
@ApiParam("消息")
public String message;
@ApiParam("前景色")
public String foregroundColor;
@ApiParam("背景色")
public String backgroundColor;
@ApiParam("是否粗体")
public boolean isBold;
@ApiParam("是否斜体")
public boolean isItalics;
@ApiParam("字号")
public Integer fontSize;
public WmsMessageStyleModel() {
}
public WmsMessageStyleModel(String message) {
this.message = message;
}
public WmsMessageStyleModel(String message, double transQty, double actQty) {
this.message = message;
if (actQty == 0) {//未处理
this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
} else if (actQty > 0) {
this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
} else if (actQty == transQty) {
this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
}
}
}

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

@ -53,6 +53,9 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "供应商编号")
private String vendorNo;
@ApiParam(value = "样式")
private WmsMessageStyleModel wmsMessageStyleModel;
public WmsTaskInfoModel() {
}

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

@ -48,6 +48,12 @@ public class SessionUser implements Serializable {
@ApiParam("用户对象信息")
private SysUserInfo userInfo;
@ApiParam("列表默认分页数量配置")
private Integer[] pageSizeArray;
@ApiParam("列表默认分页数量")
private Integer pageDefaultSize;
public SessionUser() {
}

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

@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean {
@Column(name = "NOTICE_CHANNEL")
@ApiParam(value = "通知渠道")
private String noticeChannel;
public int getTaskPlanStatusVal() {
if(taskPlanStatus != null){
return taskPlanStatus.intValue();
}
return taskPlanStatus;
}
}

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

@ -64,7 +64,7 @@ public class BsParamAdapter extends BaseBean {
private String transferParamName;
@Column(name = "TRANSFER_PARAM_VAL_TYPE_ID")
@ApiParam(value = "转换参数类型")
@ApiParam(value = "转换参数值类型")
private Integer transferParamValTypeId;
}

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

@ -17,7 +17,7 @@ import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 安全证书
* @Description : 适配认证
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
@ -29,9 +29,13 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SSL_KEY")
@Api(value = "安全证书", description = "安全证书")
@Api(value = "适配认证", description = "适配认证")
public class BsSslKey extends BaseBean {
@Column(name = "KEY_NAME")
@ApiParam(value = "证书名称")
private String keyName;
@Column(name = "VERIFICATION_METHOD_ID")
@ApiParam(value = "认证方式(枚举)")
private Integer verificationMethodId;
@ -40,13 +44,9 @@ public class BsSslKey extends BaseBean {
@ApiParam(value = "认证url")
private String verificationUrl;
@Column(name = "KEY_TYPE")
@Column(name = "KEY_TYPE_ID")
@ApiParam(value = "证书类型枚举")
private Integer keyType;
@Column(name = "KEY_NAME")
@ApiParam(value = "证书名称")
private String keyName;
private Integer keyTypeId;
@Column(name = "KEY_FILE_ID")
@ApiParam(value = "证书文件id")

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

@ -16,7 +16,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 安全证书参数
* @Description : 适配认证参数
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
@ -28,7 +28,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SSL_KEY_PARAM")
@Api(value = "安全证书参数", description = "安全证书参数")
@Api(value = "适配认证参数", description = "适配认证参数")
@XStreamAlias("BsSslKeyParam")
public class BsSslKeyParam extends BaseBean {
@ -45,4 +45,8 @@ public class BsSslKeyParam extends BaseBean {
@ApiParam(value = "参数值")
private String paramValue;
@Column(name = "PARAM_DESCRIPTION")
@ApiParam(value = "参数描述")
private String paramDescription;
}

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

@ -95,9 +95,13 @@ public class BsSuitCase extends BaseBean {
private Integer failNum;
@Column(name = "SUIT_CASE_DESCRIPTION")
@ApiParam(value = "适配类型描述")
@ApiParam(value = "适配器描述")
private String suitCaseDescription;
@Column(name = "SUIT_CASE_STATUS")
@ApiParam(value = "适配器状态")
private Integer suitCaseStatus;
@Transient
@ApiParam(value = "适配器参数")
List<BsSuitCaseParam> bsSuitCaseParamList;

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

@ -59,6 +59,10 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "适配方式id枚举")
private Integer suitMethodId;
@Column(name = "SUIT_METHOD_NAME_RDD")
@ApiParam(value = "适配方式名称枚举")
private Integer suitMethodNameRdd;
@Column(name = "SUIT_TYPE_ID")
@ApiParam(value = "适配类型id")
@JsonSerialize(using = ToStringSerializer.class)

2
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java → modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
Unescape Escape View File

@ -25,7 +25,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "SUIT_RECORD_PARAM")
@Api(value = "适配记录参数", description = "适配记录参数")
public class SuitRecordParam extends BaseBean {
public class BsSuitRecordParam extends BaseBean {
@Column(name = "SUIT_RECORD_ID")
@ApiParam(value = "适配记录id")

14
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
/**
* @Description : 安全证书参数
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-08-21 17:47
* @Modify:
**/
public interface BsSslKeyParamRepository extends BaseRepository<BsSslKeyParam, Long> {
}

2
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java
Unescape Escape View File

@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
import org.springframework.stereotype.Repository;
/**
* @Description : 安全证书
* @Description : 适配认证
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21

4
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java → modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecordParam;
import org.springframework.stereotype.Repository;
/**
@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
* @Modify:
*/
@Repository
public interface SuitRecordParamRepository extends BaseRepository<SuitRecordParam,Long> {
public interface BsSuitRecordParamRepository extends BaseRepository<BsSuitRecordParam,Long> {
}

68
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -177,7 +177,7 @@ public class SoftSwitchHqlPack {
}
/**
* 安全证书查询条件分页
* 适配认证查询条件分页
* @param bsSslKey 查询条件
* @return
*/
@ -185,7 +185,7 @@ public class SoftSwitchHqlPack {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
ddlPackBean.setOrderByStr(bsSslKey.orderBy());
@ -193,7 +193,7 @@ public class SoftSwitchHqlPack {
}
/**
* 安全证书唯一校验
* 适配认证唯一校验
* @param bsSslKey
* @return
*/
@ -206,4 +206,66 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
/**
* 适配认证参数按条件查询
* @param bsSslKeyParam 查询条件
* @return
*/
public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
ddlPackBean.setOrderByStr(bsSslKeyParam.orderBy());
return ddlPackBean;
}
/**
* 适配认证参数唯一校验
* @param bsSslKeyParam
* @return
*/
public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
return ddlPackBean;
}
/**
* 数据源查询条件封装
* @param bsDataSource
* @return
*/
public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean);
ddlPackBean.setOrderByStr(bsDataSource.orderBy());
return ddlPackBean;
}
/**
* 数据源唯一校验
* @param bsDataSource
* @return
*/
public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
return ddlPackBean;
}
}

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

@ -61,6 +61,14 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "长度检查", example = "0")
private Integer lenCheck;
@Column(name = "REGULAR_CHECK")
@ApiParam(value = "正则校验")
private String regularCheck;
@Column(name = "REGULAR_CHECK_FAIL_MSG")
@ApiParam(value = "正则校验失败提示")
private String regularCheckFailMsg;
@Column(name = "AS_ID")
@ApiParam(value = "作业步骤", example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@ -100,6 +108,16 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "是否可提交", example = "2")
private Integer isCommitAble;
@Column(name = "IS_AUTO_OPEN_WINDOW")
@ApiParam(value = "是否自动开窗", example = "2")
private Integer isAutoOpenWindow;
@ApiParam(value = "搜索KEY")
public String searchKey;
@ApiParam(value = "分组KEY")
public String groupKey;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}
@ -112,10 +130,6 @@ public class WmsActionGroupDetails extends BaseBean {
return this.okSeq == null ? 0 : this.okSeq;
}
public int getPreShowVal() {
return this.preShow == null ? 0 : this.preShow;
}
public long getShowAmIdVal() {
return this.showAmId == null ? 0 : this.showAmId;
}
@ -124,6 +138,10 @@ public class WmsActionGroupDetails extends BaseBean {
return this.isCommitAble == null ? 0 : this.isCommitAble;
}
public int getIsAutoOpenWindowVal() {
return this.isAutoOpenWindow == null ? 0 : this.isAutoOpenWindow;
}
public int getValueTypeVal() {
return this.valueType == null ? 0 : this.valueType;
}

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

@ -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;
/**
* @Description : 库位表
@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "零件数", example = "-1")
private Double partQty;
// 导入用
@ApiParam(value = "工厂")
@Transient
private String factory;
@Column(name = "ENCRYPTION_NO")
@ApiParam(value = "加密编码")
private String encryptionNo;

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

@ -177,7 +177,8 @@ public class WmsMoveDetails extends BaseBean {
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
String createUser,String createDatetime){
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
@ -199,5 +200,7 @@ public class WmsMoveDetails extends BaseBean {
this.vendorNo = vendorNo;
this.custNo = custNo;
this.busiTypeCode = busiTypeCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

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

@ -142,7 +142,7 @@ public class WmsMoveMaster extends BaseBean {
public WmsMoveMaster(){};
public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode) {
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
this.id = id;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
@ -160,5 +160,6 @@ public class WmsMoveMaster extends BaseBean {
this.rejectQty = rejectQty;
this.fixId = fixId;
this.busiTypeCode = busiTypeCode;
this.refSrc = refSrc;
}
}

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

@ -209,7 +209,8 @@ public class WmsMoveSn extends BaseBean {
}
public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn,
String createUser,String createDatetime){
this.organizeCode=organizeCode;
this.orderNo=orderNo;
this.item=item;
@ -234,5 +235,8 @@ public class WmsMoveSn extends BaseBean {
this.destZoneNo = destZoneNo;
this.destWhNo =destWhNo;
this.busiTypeCode = busiTypeCode;
this.sn = sn;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

Write Preview
Loading…
Cancel
Save