yun-zuoyi
曾贞一 5 years ago
commit 6190a4f66d

@ -43,7 +43,8 @@ public class CommonEnumUtil {
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
CONSOLE(95, 8010, 2, "impp-console", "服务监控台");
CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
DEV(9999, 0000, 0, "Development", "系统调试");
/**
* ID
@ -1231,7 +1232,7 @@ public class CommonEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_DETAIL_SHOW_TYPE {
public enum LOG_DETAIL_SHOW_TYPE {
DEBUG(1, "DEBUG"),
OVER_TIME(2, "记录超时服务"),
ALL_METHOD(3, "所有服务"),
@ -1963,6 +1964,50 @@ public class CommonEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DAO_OPERATE_TYPE {
INSERT(1, "新增"),
DELETE(2, "删除"),
UPDATE(3, "修改"),
SELECT(4, "查询");
private int value;
private String description;
private DAO_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* actuator env
*/

@ -6363,4 +6363,55 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PURCHASE_PLAN_HISTORY_STATUS {
CREATE(10, "CREATE", "采购订单创建"),
PUBLISH(20, "PUBLISH", "采购订单发布"),
VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"),
VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"),
VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"),
RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"),
FAIL(70, "FAIL", "质检完成");
private int value;
private String code;
private String description;
PURCHASE_PLAN_HISTORY_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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -11,8 +11,10 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
* @Author: jokelin
@ -53,4 +55,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
@Column(name = "PLAN_CAPACITY")
@ApiParam("计划产量")
private Integer planCapacity;
@Transient
@ApiParam("看板时段计划产量")
private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacities;
}

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 6:55
* @Modify:
*/
@Data
public class BoardModel {
@ApiParam("看板名称")
private String boardName;
@ApiParam("班别")
private String shiftName;
@ApiParam("对象值描述")
private String objectValueDesc;
@ApiParam("计划人数")
private Integer planPeopleNum;
@ApiParam("实际人数")
private Integer actualPeopleNum;
@ApiParam("目标达成数")
private Integer achievedPeopleNum;
@ApiParam("看板时段计划产量")
private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
}

@ -41,6 +41,8 @@ public class RequestModel {
private ActionRequestModel actionRequestBean;//工单状态
private String serialNumber;//过程条码
public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
this.queueOrderList = queueOrderList;
this.currentSeq = currentSeq;
@ -166,4 +168,8 @@ public class RequestModel {
public void setDestStatus(Integer destStatus) {
this.destStatus = destStatus;
}
public String getSerialNumber() { return serialNumber; }
public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; }
}

@ -18,6 +18,7 @@ import java.io.Serializable;
@Data
public class ClassFieldModel implements Serializable {
private static final long serialVersionUID = -8873901724079105728L;
@ApiParam(value ="包名")
private String packageName;

@ -21,6 +21,7 @@ import java.util.List;
@Data
public class ClassModel implements Serializable {
private static final long serialVersionUID = -8024274383480419754L;
@ApiParam(value ="服务ID")
private int serverId;

@ -0,0 +1,120 @@
package cn.estsh.i3plus.pojo.model.license;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.io.Serializable;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Objects;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-2-10 5:10
* @Modify:
**/
@Data
public class ImppLicense implements Serializable {
private static final long serialVersionUID = 2365830603839063328L;
private static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
/**
*
*
*
*
*
*
*
* 线
*
*
* 线
*
*/
/* 基础信息 */
@ApiParam(value ="授权ID")
private Long Id; // ID
@ApiParam(value ="授权应用ID")
private Long appId; // APP_ID
@ApiParam(value ="授权读取授权数据ID")
private Integer licenseSourceId; // 授权数据来源
public String getLicenseSourceTxt() {
return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId);
}
/* 授权信息 */
@ApiParam(value ="授权开始时间")
private String licenseStartDateTime; // 授权开始时间
@ApiParam(value ="授权结束时间")
private String licenseEndDateTime; // 授权结束时间
@ApiParam(value ="授权组织数量")
private Integer licenseMaxOrganize; // 授权组织数量
@ApiParam(value ="授权仓库数量")
private Integer licenseMaxWarehouse; // 授权仓库数量
@ApiParam(value ="授权产线数量")
private Integer licenseMaxProductionLine; // 授权产线数量
@ApiParam(value ="授权用户数量")
private Integer licenseMaxUser; // 授权用户数量
@ApiParam(value ="授权同时在线数量")
private Integer licenseMaxUserSession; // 授权在线用户数量
@ApiParam(value ="授权描述信息")
private String licenseDescription; // 授权描述信息
@ApiParam(value ="深思授权信息")
private ImppLicenseSenseshield senseshield;
/* 业务人员信息 */
@ApiParam(value ="授权创建时间")
private Date licenseCreateDateTime; // 授权时间
@ApiParam(value ="授权创建人员ID")
private Long licenseCreateUserId; // 授权用户ID
@ApiParam(value ="授权创建人员名称")
private String licenseCreateUserName; // 授权人名称
@ApiParam(value ="授权更新人员ID")
private Long licenseUpdateUserId; // 授权更新人员ID
@ApiParam(value ="授权更新人员名称")
private String licenseUpdateUserName; // 授权人名称
@ApiParam(value ="授权更新人员时间")
private Date licenseUpdateDateTime; // 授权更新时间
/* 授权锁信息(软锁,usb锁) */
@ApiParam(value ="授权使用开始时间")
private String lockStartTime;
@ApiParam(value ="授权使用结束时间")
private String lockEndTime;
@ApiParam(value ="锁类型")
private String lockType;
/* 基础业务逻辑 */
@ApiParam(value ="到期时间")
private String maturityDateTime;
public String getMaturityDateTime() {
if(StringUtils.isBlank(maturityDateTime)){
return StringUtils.isNotBlank(lockEndTime) ? lockEndTime : licenseEndDateTime;
}
return maturityDateTime;
}
public void setSenseshield(ImppLicenseSenseshield senseshield) {
if(Objects.nonNull(senseshield)){
try {
Date lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L);
Date licenseEndDateTime = new Date(this.licenseEndDateTime);
this.lockType = senseshield.getType();
this.maturityDateTime = DateFormatUtils.format(lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime,TIME_FORMAT);
}catch (Exception e){
}
}
this.senseshield = senseshield;
}
}

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.model.license;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-16 7:54
* @Modify:
**/
@Data
public class ImppLicenseSenseshield {
/**
* license_id : 170817
* enable : true
* guid : 6cece6946234ed4292617306ccd1191a
* first_use_time : 1587029768
* span_time : 315360000
* concurrent_type : win_user_session
* concurrent : 1000
* version : 0
* module : 0000000000000000
* last_update_timestamp : 1587029200
* last_update_timesn : 0
* rom_size : 1184
* raw_size : 1184
* pub_size : 0
* developer_id : 0800000000001005
* type : local
* sn : 9733c801000702075ed2000200270021
*/
private int license_id;
private boolean enable;
private String guid;
private int first_use_time;
private int span_time;
private String concurrent_type;
private int concurrent;
private int version;
private String module;
private int last_update_timestamp;
private int last_update_timesn;
private int rom_size;
private int raw_size;
private int pub_size;
private String developer_id;
private String type;
private String sn;
}

@ -1,12 +1,14 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.Objects;
/**
* @Description : model
@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable {
@ApiParam(value = "适配器")
private BsSuitCase bsSuitCase;
@ApiParam(value = "适配器同步处理Cloud微服务标识")
private Integer resultSoftType;
@ApiParam(value = "数据源适配套件")
private BsSuitCaseDataSource bsSuitCaseDataSource;
@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable {
public BsSuitCaseModel(BsSuitCase bsSuitCase) {
this.bsSuitCase = bsSuitCase;
if(Objects.nonNull(bsSuitCase.getResultSoftType())){
this.resultSoftType = bsSuitCase.getResultSoftType();
}
}
}

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-18 10:26
* @Modify:
**/
@Data
public class SuitImppCloudModel {
@ApiParam(value = "适配器信息")
private BsSuitCaseModel model;
@ApiParam(value = "请求参数信息")
private Object param;
public SuitImppCloudModel() {
}
public SuitImppCloudModel(SuitServerModel serverModel) {
this.model = serverModel.getBsSuitCaseModel();
this.param = serverModel.getObj();
this.param = serverModel.getObj();
}
public SuitImppCloudModel(BsSuitCaseModel model, Object param) {
this.model = model;
this.param = param;
}
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -35,6 +36,14 @@ public class SysConfig extends BaseBean {
@ApiParam(value ="名称")
private String name;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="CONFIG_TYPE")
@ApiParam(value ="参数类型ID枚举1.系统配置..." , example ="-1")
private Integer configType;

@ -0,0 +1,82 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-20 9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION")
@Api(value="对象历史")
public class SysPojoVersion extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="REF_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long refId;
@Column(name="REF_CLASS")
@ApiParam(value ="记录对象")
private String refClass;
@Column(name="VERSION_NO")
@ApiParam(value ="记录对象版本号")
private Integer versionNo = 0;
@Column(name="operateType")
@ApiParam(value ="操作类型")
private Integer operateType;
public String getOperateTypeTxt() {
return operateType == null ? null : CommonEnumUtil.DAO_OPERATE_TYPE.valueOf(operateType);
}
@Column(name="VERSION_METHOD_NAME")
@ApiParam(value ="操作方法名称")
private String versionMethodName;
@Column(name="POJO_DETAIL_ID")
@ApiParam(value ="对象明细id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pojoDetailId;
@Lob
@Column(name="POJO_COMPARE")
@ApiParam(value ="记录对象对比差异")
private String pojoCompare;
@Transient
@ApiParam(value ="用户部门信息")
private SysPojoVersionDetail versionDetail;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-20 9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION_DETAIL")
@Api(value="对象历史")
public class SysPojoVersionDetail extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
@Column(name="POJO_VERSION_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pojoVersionId;
@Lob
@Column(name="POJO_BEFORE",length = 5000)
@ApiParam(value ="原始对象信息")
private String pojoBefore;
@Lob
@Column(name="POJO_AFTER",length = 5000)
@ApiParam(value ="修改之后对象信息")
private String pojoAfter;
@Lob
@Column(name="POJO_COMPARE",length = 5000)
@ApiParam(value ="记录对象对比差异")
private String pojoCompare;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.platform.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;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-20 9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION_PLAN")
@Api(value="对象历史")
public class SysPojoVersionPlan extends BaseBean {
private static final long serialVersionUID = -1120504360281638917L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="REF_CLASS")
@ApiParam(value ="记录对象")
private String refClass;
@Column(name="REF_CLASS_TITLE")
@ApiParam(value ="记录对象名称")
private String refClassTitle;
@Column(name="PLAN_STATUS")
@ApiParam(value ="记录对象状态")
private Integer planStatus;
@Column(name="PLAN_DESCRIPTION")
@ApiParam(value ="记录对象描述")
private String planDescription;
}

@ -0,0 +1,129 @@
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-9 8:41
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_CONSOLE")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogConsole extends BaseBean {
/******** 服务器信息 ********/
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private String softType;
@Column(name="LOG_HOST")
@ApiParam(value ="服务器IP")
private String logHost;
@Column(name="LOG_PID")
@ApiParam(value ="应用PID")
private Long logPid;
@Column(name="LOG_PORT")
@ApiParam(value ="应用端口")
private Integer logPort;
@Column(name="LOG_GORP")
@ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)")
private String logGorp;
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")
private String logLevel;
@Column(name="LOG_TYPE")
@ApiParam(value ="操作类型(post,put,get)")
private String logType;
/******** 用户信息 ********/
@Column(name="USER_HOST")
@ApiParam(value ="用户登录IP")
private String userHost;
@Column(name="USER_BROWSER")
@ApiParam(value ="用户登录浏览器")
private String userBrowser;
@Column(name="USER_OS")
@ApiParam(value ="用户登录操作系统")
private String userOs;
@Column(name="USER_ID")
@ApiParam(value ="账号ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="用户登录名称")
private String userLoginName;
/******** 日志信息 ********/
@Column(name="EXECUTE_THREAD_ID")
@ApiParam(value ="执行线程")
private String executeThreadId;
@Column(name="EXECUTE_CLASS_NAME")
@ApiParam(value ="执行Class")
private String executeClassName;
@Column(name="EXECUTE_METHOD")
@ApiParam(value ="执行方法")
private String executeMethod;
@Column(name="EXECUTE_LINE_NUMBER")
@ApiParam(value ="报错行数")
private Integer executeLineNumber;
@Column(name="EXECUTE_TITLE")
@ApiParam(value ="方法标题")
private String executeTitle;
@Column(name="EXECUTE_ARGS")
@ApiParam(value ="执行参数")
private String executeArgs;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
private Integer executeTime;
@Column(name="EXECUTE_STATUS")
@ApiParam(value ="执行状态")
private String executeStatus;
@Column(name="EXECUTE_MESSAGE")
@ApiParam(value ="执行日志信息")
private String executeMessage;
@Column(name="ERROR_STACK_TRACE",length = 5000)
@ApiParam(value ="执行异常堆栈信息")
private String errorStackTrace;
}

@ -43,7 +43,7 @@ public class SysLogTaskTime extends BaseBean {
@Column(name="SCHEDULER_SERVER_PORT")
@ApiParam(value ="调度服务器端口")
private String schedulerServerPort;
private Integer schedulerServerPort;
@Column(name="TASK_THREAD_ID")
@ApiParam(value ="任务线程id")

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionDetailRepository extends BaseRepository<SysPojoVersionDetail, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionPlanRepository extends BaseRepository<SysPojoVersionPlan, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionRepository extends BaseRepository<SysPojoVersion, Long> {
}

@ -334,4 +334,11 @@ public class PtlHqlPack {
DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
return packBean;
}
public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode);
DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean);
DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean);
return packBean;
}
}

@ -108,6 +108,13 @@ public class BsSuitCase extends BaseBean {
@ApiParam(value = "是否推送MQ")
private Integer isPushMQ;
@Column(name = "RESULT_SOFT_TYPE")
@ApiParam(value = "同步调用微服务")
private Integer resultSoftType;
public String getResultSoftTypeTxt() {
return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType);
}
@Column(name = "SSL_KEY_ID")
@ApiParam(value = "证书id")
@JsonSerialize(using = ToStringSerializer.class)

@ -163,6 +163,32 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("集装箱号")
private String containerNo;
@Transient
@ApiParam("采购订单状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
private Integer purchaseItemStatus;
@Transient
@ApiParam("供应商")
private String vendorNo;
@Transient
@ApiParam("供应商名称")
private String vendorName;
@Transient
@ApiParam("开始时间")
private String planStratDate;
@Transient
@ApiParam("结束时间")
private String planEndDate;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
public Double getSnpVal() {
return snp;
}
@ -185,4 +211,38 @@ public class WmsPOMasterDetails extends BaseBean {
this.erpAreaNo = erpAreaNo;
this.organizeCode = organizeCode;
}
public WmsPOMasterDetails(
String organizeCode,
String orderNo,
Integer purchaseItemStatus,
String planDate,
String planTime,
String partNo,
String partNameRdd,
Double qty,
Double rcQty,
String vendorNo,
String createUser,
String createDatetime,
String modifyUser,
String modifyDatetime,
String remark
){
this.organizeCode = organizeCode;
this.orderNo = orderNo;
this.purchaseItemStatus = purchaseItemStatus;
this.planDate = planDate;
this.planTime = planTime;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.rcQty = rcQty;
this.vendorNo = vendorNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.remark = remark;
}
}

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;
/**
* @Description :
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-04-15 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PURCHASE_PLAN_HISTORY")
@Api("采购计划历史")
public class WmsPurchasePlanHistory extends BaseBean {
private static final long serialVersionUID = -8147353212724381079L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
private String orderNo;
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
@Column(name = "CAR_NO")
@ApiParam("车牌号")
private String carNo;
@Column(name = "CONTACT")
@ApiParam("联系人")
private String contact;
@Column(name = "CONTACT_TEL")
@ApiParam("联系电话")
private String contactTel;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPurchasePlanHistory;
import org.springframework.stereotype.Repository;
/**
* @Description : dao
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-04-15 10:30
* @Modify:
**/
@Repository
public interface WmsPurchasePlanHistoryRepository extends BaseRepository<WmsPurchasePlanHistory, Long> {
}
Loading…
Cancel
Save