Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
commit
1901cf6eb0
@ -0,0 +1,65 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Transient;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :数据权限
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-26
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_DATA_AUTH")
|
||||
@Api("数据权限")
|
||||
public class MesDataAuth extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -8665559475167190408L;
|
||||
@Column(name = "ROLE_ID")
|
||||
@ApiParam("角色编号")
|
||||
private Long roleId;
|
||||
|
||||
@Column(name = "ROLE_NAME")
|
||||
@ApiParam("角色名称")
|
||||
private String roleName;
|
||||
|
||||
@Column(name = "DATA_OBJECT")
|
||||
@ApiParam("数据对象")
|
||||
private String dataObject;
|
||||
|
||||
@Column(name = "DATA_OBJECT_FULL_NAME")
|
||||
@ApiParam("数据对象全称")
|
||||
private String dataObjectFullName;
|
||||
|
||||
@Column(name = "DATA_OBJECT_NAME")
|
||||
@ApiParam("数据对象名称")
|
||||
private String dataObjectName;
|
||||
|
||||
@Column(name = "FILTER_RULE", columnDefinition = "TEXT")
|
||||
@ApiParam("过滤规则")
|
||||
private String filterRule;
|
||||
|
||||
public long getRoleIdVal() {
|
||||
return this.roleId == null ? 0 : this.roleId.longValue();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/4/28 21:30
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EDI_DATA")
|
||||
@Api("EDI数据")
|
||||
public class MesEdiData extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 4671561947551462256L;
|
||||
|
||||
@Column(name = "HOST")
|
||||
@ApiParam("edi电脑名")
|
||||
private String host;
|
||||
|
||||
@Column(name = "DATA")
|
||||
@ApiParam("数据")
|
||||
private String data;
|
||||
|
||||
@Column(name = "CONFIG")
|
||||
@ApiParam("edi配置")
|
||||
private String config;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class FilterGroup {
|
||||
private String andOr;
|
||||
private List<FilterRuleAndOr> groups;
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterRule {
|
||||
private String filed;
|
||||
private String op;
|
||||
private String value;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class FilterRuleAndOr {
|
||||
private String andOr;
|
||||
private List<FilterRule> rules;
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/30 2:01 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
public class OperateObjectParamModel {
|
||||
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equCode;
|
||||
|
||||
@ApiParam("运算对象代码")
|
||||
private String objectCode;
|
||||
|
||||
@ApiParam("日期")
|
||||
private String oeeDate;
|
||||
|
||||
@ApiParam("开始时段")
|
||||
private String startTime;
|
||||
|
||||
@Transient
|
||||
@ApiParam("结束时段")
|
||||
private String endTime;
|
||||
|
||||
@ApiParam("属性值")
|
||||
private Integer attributeValue = 0;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : PojoField模型
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2020-04-28
|
||||
* @Modify:
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class PojoFieldModel implements Serializable {
|
||||
private static final long serialVersionUID = 6761788924707802928L;
|
||||
|
||||
@ApiParam(value ="属性名")
|
||||
private String fieldName;
|
||||
|
||||
@ApiParam(value ="属性类型")
|
||||
private String fieldType;
|
||||
|
||||
@ApiParam(value ="属性描述")
|
||||
private String fieldDesc;
|
||||
|
||||
@ApiParam(value ="字段名称")
|
||||
private String fieldColumnName;
|
||||
|
||||
@ApiParam(value = "数据来源")
|
||||
private String dataSrc;
|
||||
|
||||
@ApiParam(value = "开窗列表显示列名称")
|
||||
private String listColumnName;
|
||||
|
||||
@ApiParam(value = "开窗搜索列名称")
|
||||
private String searchColumnName;
|
||||
|
||||
@ApiParam(value = "回显列名")
|
||||
private String explicitColumnName;
|
||||
|
||||
@ApiParam(value = "下拉框规则")
|
||||
private Integer selectRule;
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : Pojo模型
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2020-04-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class PojoModel implements Serializable {
|
||||
private static final long serialVersionUID = -3617516560880011259L;
|
||||
@ApiParam(value ="包名")
|
||||
private String packageName;
|
||||
|
||||
@ApiParam(value ="POJO类名")
|
||||
private String simpleName;
|
||||
|
||||
@ApiParam(value ="POJO类全名")
|
||||
private String fullName;
|
||||
|
||||
@ApiParam(value ="表名称名")
|
||||
private String tableName;
|
||||
|
||||
@ApiParam(value ="POJO类描述")
|
||||
private String pojoDesc;
|
||||
|
||||
@ApiParam(value ="属性集合")
|
||||
private List<PojoFieldModel> fieldList;
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBom;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesDataAuthRepository extends BaseRepository<MesDataAuth, Long> {
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import org.hibernate.annotations.GenericGenerator;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
|
||||
/**
|
||||
* @Description : 发运计划任务跟踪
|
||||
* @Reference :
|
||||
* @Author :QianHuaSheng
|
||||
* @CreateDate : 2020-04-27 4:37 下午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
public class AssignmentDto {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(generator = "IDGenerator")
|
||||
@GenericGenerator(name = "IDGenerator", strategy = "assigned")
|
||||
@ApiParam(value = "主键", example = "0")
|
||||
public Long id;
|
||||
|
||||
@ApiParam(value = "单号")
|
||||
private String orderNo;
|
||||
|
||||
@ApiParam(value = "时间")
|
||||
private String createDatetime;
|
||||
|
||||
@ApiParam(value = "零件号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "零件号名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam(value = "源存储区")
|
||||
private String srcZoneNo;
|
||||
|
||||
@ApiParam(value = "客户编码")
|
||||
private String custNo;
|
||||
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer itemStatus;
|
||||
|
||||
@ApiParam(value = "状态中文描述", example = "1")
|
||||
private String itemStatusStr;
|
||||
|
||||
@ApiParam(value = "出库数量")
|
||||
private Double outQty;
|
||||
|
||||
public AssignmentDto(String orderNo, String createDatetime, String partNameRdd,
|
||||
String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) {
|
||||
this.orderNo = orderNo;
|
||||
this.createDatetime = createDatetime;
|
||||
this.partNameRdd = partNameRdd;
|
||||
this.srcZoneNo = srcZoneNo;
|
||||
this.custNo = custNo;
|
||||
this.itemStatus = itemStatus;
|
||||
this.outQty = outQty;
|
||||
this.partNo = partNo;
|
||||
}
|
||||
|
||||
public AssignmentDto() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 脚本执行日志
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-29
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("插件日志")
|
||||
public class ScriptLoggerModel {
|
||||
@ApiParam("工厂")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("用户编号")
|
||||
private String userCode;
|
||||
|
||||
@ApiParam("脚本编号")
|
||||
private String scriptNo;
|
||||
|
||||
@ApiParam("日志内容")
|
||||
private String context;
|
||||
|
||||
@ApiParam("日志打印日期")
|
||||
private String printDate;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface EngineScriptPersistenceHistoryRepository extends BaseRepository<EngineScriptPersistenceHistory, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue