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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
许心洁 5 years ago
parent fc663ee283 6b11375a01
commit 927579aca5
88 changed files with 1452 additions and 284 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
import java.util.List;
@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode {
public List<WorkRelation> getPostRelations() {
return BeanRelation.list(this, EBaseOrder.PostRelations);
}
@JsonBackReference
public List<BaseOrder> getUpperOrders() {
return BeanRelation.list(this, EBaseOrder.UpperOrders);
}
@JsonBackReference
public List<BaseOrder> getLowerOrders() {
return BeanRelation.list(this, EBaseOrder.LowerOrders);
}
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
Unescape Escape View File

@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS {
@ApiParam(value ="内部表名")
private String inName;
@Column(name="TYPE")
@Column(name="IMPORT_TYPE")
@ApiParam(value ="导入类型")
@FieldAnnotation(defaultValue = "REPLACE")
private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
private ApsEnumUtil.IMPORT_DETAIL_TYPE importType;
@Column(name="SKIP_ROWS")
@ApiParam(value ="跳过行数")
@FieldAnnotation(defaultValue = "0")
private Integer skipRows;
@Column(name="ORDER_NUMBER")
@ApiParam(value ="序号")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
Unescape Escape View File

@ -5,6 +5,4 @@ public enum EBaseOrder {
Material,
PrevRelations,
PostRelations,
UpperOrders,
LowerOrders
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java
Unescape Escape View File

@ -10,15 +10,12 @@ import java.util.Date;
@Data
public class GanttCalendarModel {
private Long parent;
private Long resourceId;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date start_date;
private Date startDate;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date end_date;
private String color;
private Long id;
private Long workId;
private String text;
private Date endDate;
private String cls;
}

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

@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.mongodb.core.index.IndexDirection;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.*;
import java.io.Serializable;
@ -78,6 +80,7 @@ public abstract class BaseBean implements Serializable {
@AnnoOutputColumn(hidden = true)
public String createUser;
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
public String createDatetime;

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

@ -221,8 +221,9 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PARAM_VALUE_TYPE{
NUMBER(1,"数字"),
STRING(2,"字符串");
INTEGER(1,"整数"),
STRING(2,"字符串"),
FLOAT(3,"浮点");
private int value;
private String description;
@ -341,4 +342,116 @@ public class LacEnumUtil {
}
}
/**
* 逻辑运算符
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOGICAL_OPERATOR{
OR(10,"或"),
AND(20,"与");
private int value;
private String description;
LOGICAL_OPERATOR(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 RELATIONAL_OPERATOR{
GT(10,">"),
LT(20,"<"),
EQ(20,"=="),
NE(20,"!="),
GE(20,">="),
LE(20,"<=");
private int value;
private String description;
RELATIONAL_OPERATOR(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 TASK_CHECK_TYPE{
MASTER(10,"主"),
SLAVE(20,"从");
private int value;
private String description;
TASK_CHECK_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;
}
}
}

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

@ -1370,8 +1370,14 @@ public class MesEnumUtil {
MES_QC_CHECK_STANDARD(250, "质量检测标准"),
MES_FAULT_CAUSE(260,"设备故障原因"),
MES_FAULT_METHOD(270,"设备故障处理措施"),
MES_FAULT_PHENOMENON(280,"设备故障现象");
MES_FAULT_PHENOMENON(280,"设备故障现象"),
MES_DEFECT(290,"缺陷"),
MES_DEFECT_CAUSE(300,"缺陷原因"),
MES_SCRAP(310,"报废原因"),
MES_REPAIR(320,"质量数据处理措施"),
MES_EQU_TASK_PLAN(330,"设备作业周期计划"),
MES_PART_OJBECT(340,"物料对象"),
MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元");
private int value;
private String description;

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

@ -1035,6 +1035,62 @@ public class WmsEnumUtil {
}
}
/**
* 业务表：库存条码状态
* 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CARRIAGE_STATUS {
CREATE(10, "创建"),
PUBLISH(20, "发布"),
RECEIVE(30, "承运商接收"),
ARRIVE(40, "车辆到达"),
INSTALL(50, "装车完成"),
CARRIAGE_IN(60, "运输中"),
CLOSE(70, "已关单");
private int value;
private String description;
CARRIAGE_STATUS(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 String valueOfDescription(int val) {
return valueOf(val);
}
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;
}
}
/**
* 单据是否生成任务状态
*/
@ -1367,6 +1423,45 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 库存移动单状态状态:10=新建,20=已处理,30=处理出错
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMSSHIPPING_ORDER_STATUS {
CREATE(10, "新建"),
PENDING(20, "已处理"),
ERROR(30, "处理出错");
private int value;
private String description;
WMSSHIPPING_ORDER_STATUS(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 String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 库存移动单明细状态
@ -4324,4 +4419,150 @@ public class WmsEnumUtil {
}
}
/**
* 收货看板状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RECEIVING_GOODS_STATUS {
WAIT_RECEIVING(10, "待收货"),
RECEIVING(20, "收货中"),
COMPLETE_RECEIVING(30, "收货完成"),
UN_RECEIVED(40, "延迟未收货"),
ELSE(50,"其他");
private int value;
private String description;
RECEIVING_GOODS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static RECEIVING_GOODS_STATUS codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
* 发运看板状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FINAL_SHIPMENT_STATUS {
CREATE(10, "新建"),
PROCESSING(20, "处理中"),
COMPLETE(30, "已完成");
private int value;
private String description;
FINAL_SHIPMENT_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static FINAL_SHIPMENT_STATUS codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
* 生产计划主表状态创建
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_MASTER_STATUS {
CREATE(10,"CREATE", "创建"),
PLANNED(20,"PLANNED", "已计划"),
CLOSE(30,"CLOSE", "已关闭");
private int value;
private String code;
private String description;
WORK_ORDER_MASTER_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;
}
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean {
@Column(name="PARAM_TYPE")
@ApiParam(value ="参数类型")
@AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class)
private Integer paramType;
@Column(name="PARAM_VALUE_TYPE")

100
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
Unescape Escape View File

@ -0,0 +1,100 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
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 : yunhao
* @CreateDate : 2019-12-09 14:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_TASK_CHECK")
@Api(value="任务检查",description = "任务检查")
public class LacTaskCheck extends BaseBean {
@Column(name="COMMAND_STACK_TEMPLATE_ID")
@ApiParam(value ="指令集模板ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTemplateId;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="STEP_TASK_ID")
@ApiParam(value ="步骤ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepTaskId;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="任务名称")
private String taskNameRdd;
@Column(name="TASK_CHECK_TYPE")
@ApiParam(value ="任务检查类型")
@AnnoOutputColumn(refClass = LacEnumUtil.TASK_CHECK_TYPE.class)
private Integer taskCheckType;
@Column(name="TASK_CHECK_GROUP")
@ApiParam(value ="任务检查组")
private String taskCheckGroup;
@Column(name="PARAM_ID")
@ApiParam(value ="参数id")
@JsonSerialize(using = ToStringSerializer.class)
private Long paramId;
@Column(name="PARAM_NAME_RDD")
@ApiParam(value ="任务名称")
private String paramNameRdd;
@Column(name="PARAM_VALUE_TYPE")
@ApiParam(value ="参数值类型")
@AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValueType;
@Column(name="RELATIONAL_OPERATOR")
@ApiParam(value ="关系运算符")
@AnnoOutputColumn(refClass = LacEnumUtil.RELATIONAL_OPERATOR.class)
private Integer relationalOperator;
@Column(name="LOGICAL_OPERATOR")
@ApiParam(value ="逻辑运算符")
@AnnoOutputColumn(refClass = LacEnumUtil.LOGICAL_OPERATOR.class)
private Integer logicalOperator;
@Column(name="CHECK_VALUE")
@ApiParam(value ="检查值")
private String checkValue;
@Column(name="TARGET_STEP_ID")
@ApiParam(value ="目标步骤ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long targetStepId;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacTaskCheck;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-12-10 15:10
* @Modify:
**/
public interface LacTaskCheckRepository extends BaseRepository<LacTaskCheck, Long> {
}

19
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -4,17 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
import cn.estsh.i3plus.pojo.lac.bean.*;
import java.util.List;
/**
@ -187,4 +178,10 @@ public class LacHqlPack {
DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck);
DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean);
return ddlPackBean;
}
}

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

@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean {
@ApiParam("设备代码")
private String equipmentCode;
@Override
public String toString() {
return "MesDatasource{" +
"dsCode='" + dsCode + '\'' +
", dsName='" + dsName + '\'' +
", dsType='" + dsType + '\'' +
", dsHost='" + dsHost + '\'' +
", dsPort=" + dsPort +
", dsUser='" + dsUser + '\'' +
", dsPassword='" + dsPassword + '\'' +
", dsDbName='" + dsDbName + '\'' +
", equipmentCode='" + equipmentCode + '\'' +
'}';
}
}

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -26,30 +23,33 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_DEFECT_RECORD")
@Table(name = "MES_DEFECT_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name="DEFECT_CODE")
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name="DEFECT_NAME")
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name="DEFECT_LOCATION")
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean {
@ApiParam("面位")
private String sideLocation;
@Column(name="REPAIR_STATUS")
@Column(name = "REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.math.BigDecimal;
/**
@ -26,7 +23,10 @@ import java.math.BigDecimal;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DISMANTLE_RECORD")
@Table(name = "MES_DISMANTLE_RECORD", indexes = {
@Index(columnList = "SN"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Author: Wynne.Lu
@ -24,7 +21,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装规格")
public class MesPackage extends BaseBean {
@Column(name = "PACKAGE_NO")

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_DETAIL")
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean {

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL")
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表")
public class MesPackageTravel extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -26,7 +23,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_ORDER")
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Api("生产主计划")
public class MesPlanOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :产品绑定记录表
@ -26,7 +23,10 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_BIND_RECORD")
@Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +23,11 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN")
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean implements Serializable {
@ -120,15 +121,15 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码类型 10=正常 20=首检件")
private Integer snType;
@Column(name = "TRAY")
@Column(name = "TRAY_NO")
@ApiParam("托盘号")
private String tray;
private String trayNo;
@Transient
@ApiParam("返回信息")
private String resultMsg;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@ -187,7 +188,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", trayNo='" + trayNo + '\'' +
", resultMsg='" + resultMsg + '\'' +
", operateType=" + operateType +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description : 产品条码履历实体类
@ -25,7 +22,12 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN_TRAVEL")
@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@Column(name = "SERIAL_NUMBER")

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.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.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCT_DATA")
@Table(name = "MES_PRODUCT_DATA", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "OBJECT_CODE"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ -48,6 +54,10 @@ public class MesProductData extends BaseBean {
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -26,7 +23,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA")
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER")
@Table(name = "MES_QUEUE_ORDER", indexes = {
@Index(columnList = "CUST_FLAG_NO")
})
@Api("生产队列主表")
public class MesQueueOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL")
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
@Index(columnList = "ORDER_NO")
})
@Api("生产队列明细")
public class MesQueueOrderDetail extends BaseBean {
@Column(name = "ORDER_NO")

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.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.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_RAW_PART_SN")
@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
@Api("原材料信息")
public class MesRawPartSn extends BaseBean {
@Column(name = "PART_NO")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -26,7 +23,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -24,7 +25,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Table(name = "MES_SCRAP_RECORD", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WC_CHECK_RECORD")
@Table(name = "MES_WC_CHECK_RECORD", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("开线检查记录")
public class MesWcCheckRecord extends BaseBean {

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MONITOR_LOG")
@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean {

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

@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -26,7 +23,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_ORDER")
@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Api("生产工单")
public class MesWorkOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,10 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_ORDER_LOG")
@Table(name = "MES_WORK_ORDER_LOG", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("生产工单日志")
public class MesWorkOrderLog extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
@ -67,9 +66,6 @@ public class ProdPackageModel {
@ApiParam("包装集合")
private List<MesPackage> packageList;
@ApiParam("工单集合")
private List<MesWorkOrder> workOrderList;
@ApiParam("打印状态文字")
private String printStrStatus;

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

@ -69,14 +69,12 @@ public class MesHqlPack {
/**
* 根据打印模板的模板代码查询模板信息
*
* @param organizeCode
* @param mesLabelTemplate
* @return
*/
public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
return packBean;
}

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUST_ORDER")
@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Api("客户信息")
public class MesCustOrder extends BaseBean {

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.util.Date;
@ -25,30 +26,33 @@ import java.util.Date;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_RECORD")
@Table(name = "MES_DEFECT_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name="DEFECT_CODE")
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name="DEFECT_NAME")
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name="DEFECT_LOCATION")
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean {
@ApiParam("面位")
private String sideLocation;
@Column(name="REPAIR_STATUS")
@Column(name = "REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -24,7 +25,10 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DISMANTLE_RECORD")
@Table(name = "MES_DISMANTLE_RECORD", indexes = {
@Index(columnList = "SN"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -27,7 +24,9 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK")
@Table(name = "MES_EQU_TASK", indexes = {
@Index(columnList = "TASK_NO")
})
@Api("设备作业任务")
public class MesEquTask extends BaseBean {
@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean {
private String pageType;
@Transient
@ApiParam(value ="明细列表")
@ApiParam(value = "明细列表")
private List<MesEquTaskDetail> mesEquTaskDetailList;
}

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -27,7 +24,9 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_DETAIL")
@Table(name = "MES_EQU_TASK_DETAIL", indexes = {
@Index(columnList = "EQUIPMENT_CODE")
})
@Api("设备作业任务明细")
public class MesEquTaskDetail extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description :设备维修作业记录
@ -26,7 +23,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = {
@Index(columnList = "EQUIPMENT_CODE")
})
@Api("设备维修作业记录")
public class MesEquTaskRepairRecord extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description :设备点检保养作业记录
@ -26,7 +23,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = {
@Index(columnList = "EQUIPMENT_CODE")
})
@Api("设备点检保养作业记录")
public class MesEquTaskStandardRecord extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Author: Wynne.Lu
@ -24,7 +21,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装规格")
public class MesPackage extends BaseBean {
@Column(name = "PACKAGE_NO")

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_DETAIL")
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean {

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL")
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表")
public class MesPackageTravel extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -26,7 +23,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_ORDER")
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Api("生产主计划")
public class MesPlanOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -26,7 +27,10 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_BIND_RECORD")
@Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN")
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean {
@ -117,11 +118,11 @@ public class MesProduceSn extends BaseBean {
@ApiParam("条码类型")
private Integer snType;
@Column(name = "TRAY")
@Column(name = "TRAY_NO")
@ApiParam("托盘号")
private String tray;
private String trayNo;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@ -184,7 +185,7 @@ public class MesProduceSn extends BaseBean {
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", trayNo='" + trayNo + '\'' +
", operateType=" + operateType +
", resultMsg='" + resultMsg + '\'' +
'}';

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description : 产品条码履历实体类
@ -25,7 +22,12 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN_TRAVEL")
@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ -120,7 +122,7 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("托盘号")
private String trayNo;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.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.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCT_DATA")
@Table(name = "MES_PRODUCT_DATA", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "OBJECT_CODE"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -26,7 +23,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA")
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -29,7 +26,9 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER")
@Table(name = "MES_QUEUE_ORDER", indexes = {
@Index(columnList = "CUST_FLAG_NO")
})
@Api("生产队列主表")
public class MesQueueOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL")
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
@Index(columnList = "ORDER_NO")
})
@Api("生产队列明细")
public class MesQueueOrderDetail extends BaseBean {
@Column(name = "ORDER_NO")

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.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.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_RAW_PART_SN")
@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
@Api("原材料信息")
public class MesRawPartSn extends BaseBean {
@Column(name = "PART_NO")

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -24,7 +25,10 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -24,7 +25,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Table(name = "MES_SCRAP_RECORD", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WC_CHECK_RECORD")
@Table(name = "MES_WC_CHECK_RECORD", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("开线检查记录")
public class MesWcCheckRecord extends BaseBean {

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.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.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MONITOR_LOG")
@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean {

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

@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;

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

@ -9,10 +9,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -26,7 +23,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_ORDER")
@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Api("生产工单")
public class MesWorkOrder extends BaseBean {
@Column(name = "ORDER_NO")

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

@ -8,10 +8,7 @@ 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 javax.persistence.*;
/**
* @Description:
@ -25,7 +22,10 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_ORDER_LOG")
@Table(name = "MES_WORK_ORDER_LOG", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("生产工单日志")
public class MesWorkOrderLog extends BaseBean {
@Column(name = "ORDER_NO")

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
Unescape Escape View File

@ -9,10 +9,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -27,16 +27,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_EXCEPTION",
indexes = {
@Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID")
}
)
@Table(name="SYS_LOG_EXCEPTION")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogException extends BaseBean {
//CommonEnumUtil.SOFT_TYPE
@Indexed
@Column(name="EXC_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
Unescape Escape View File

@ -12,10 +12,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -30,16 +30,11 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_OPERATE",
indexes = {
@Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"),
@Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE")
})
@Table(name="SYS_LOG_OPERATE")
@Api(value="操作日志表",description = "操作日志表")
public class SysLogOperate extends BaseBean {
//CommonEnumUtil.SOFT_TYPE
@Indexed
@Column(name="OPERATE_MODULE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
@ -53,7 +48,7 @@ public class SysLogOperate extends BaseBean {
return operateModuleName;
}
//ImppEnumUtil.OPERATE_TYPE（枚举）
@Indexed
@Column(name="OPERATE_TYPE")
@ApiParam(value ="操作类型" , example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
Unescape Escape View File

@ -12,10 +12,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -30,24 +30,19 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_SYSTEM",
indexes = {
@Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"),
@Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID")
})
@Table(name="SYS_LOG_SYSTEM")
@Api(value="系统日志表",description = "系统日志表")
public class SysLogSystem extends BaseBean {
@Indexed
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志级别" , example ="1")
//ImppEnumUtil.LOG_LEVEL
@AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
private Integer logLevel;
@Indexed
@Column(name="LOG_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
//CommonEnumUtil.SOFT_TYPE
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer logModuleId;

11
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -11,9 +11,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -28,12 +29,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_TASK_TIME",
indexes = {
@Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"),
@Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME")
})
@Table(name="SYS_LOG_TASK_TIME")
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {
@ -79,6 +75,7 @@ public class SysLogTaskTime extends BaseBean {
@ApiParam(value ="任务周期表达式")
private String taskCycleExpsRdd;
@Indexed
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -9,11 +9,8 @@ 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;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -28,7 +25,12 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_DATA_DETAIL")
@Table(name = "BS_SUIT_DATA_DETAIL",indexes = {
@Index(name="bs_suit_data_detail_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
@Index(name="bs_suit_data_detail_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"),
@Index(name="bs_suit_data_detail_suit_case_code_idx",columnList = "SUIT_CASE_CODE_RDD"),
@Index(name="bs_suit_data_detail_create_date_time_idx",columnList = "CREATE_DATE_TIME")
})
@Api(value = "适配报文详情", description = "适配报文详情")
public class BsSuitDataDetail extends BaseBean {

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

@ -9,11 +9,8 @@ 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;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -28,7 +25,12 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_RECORD")
@Table(name = "BS_SUIT_RECORD",indexes = {
@Index(name="bs_suit_record_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"),
@Index(name="bs_suit_record_suit_case_code_idx",columnList = "SUIT_CASE_CODE"),
@Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"),
@Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"),
})
@Api(value = "适配记录", description = "适配记录")
public class BsSuitRecord extends BaseBean {

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

@ -9,6 +9,7 @@ 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;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SUIT_RECORD_PARAM")
@Table(name = "SUIT_RECORD_PARAM",indexes = {
@Index(name="suit_record_param_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
})
@Api(value = "适配记录参数", description = "适配记录参数")
public class BsSuitRecordParam extends BaseBean {

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

@ -9,10 +9,8 @@ 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;
import javax.persistence.*;
/**
* @Description : 请求适配记录
@ -26,7 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_REQUEST_RECORD")
@Table(name = "BS_SUIT_REQUEST_RECORD",indexes = {
@Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
})
@Api(value = "请求适配记录", description = "请求适配记录")
public class BsSuitRequestRecord extends BaseBean {

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

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : MES_生产计划主明细表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-09 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PP_DETAILS")
@Api("MES_生产计划明细表")
public class MesPpDetails extends BaseBean{
private static final long serialVersionUID = 9214639813072592727L;
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String woekorderNo;
@Column(name="ITEM")
@ApiParam("行号")
private Integer item;
@Column(name="PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("零件名称")
private String partNameRdd;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "工单数量", example = "0")
public Double qty;
public Integer getItem() {
return item == null ? 0 : this.item.intValue();
}
public Double getQty() {
return qty == null ? 0D : this.qty.doubleValue();
}
}

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

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.wms.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_生产计划主表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-09 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PP_MASTER")
@Api("MES_生产计划主表")
public class MesPpMaster extends BaseBean{
private static final long serialVersionUID = 9214639813072592726L;
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String woekorderNo;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
private String pdlineNo;
@Column(name="PLAN_PRODUCT_TIME")
@ApiParam("生产日期")
private String planProductTime;
@Column(name="SHIFT_NO")
@ApiParam("班次代码")
private String shitNo;
@Column(name="START_PRODUCT_TIME")
@ApiParam("开始生产时间")
private String startProductTime;
@Column(name="END_PRODUCT_TIME")
@ApiParam("结束生产时间")
private String endProductTime;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
private Integer orderStatus = 0;
public Integer getOrderStatus() {
return orderStatus == null ? 0 : this.orderStatus.intValue();
}
}

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

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 生产计划模板
* @Reference :
* @author: jessica.chen
* @date: 2019/12/10 17:10
* @Modify:
*/
@Data
@Api(value="生产计划模板",description = "生产计划模板")
public class MesPpTemplate extends BaseBean {
private static final long serialVersionUID = 2167743108452607913L;
@ApiParam(value = "工单号")
@AnnoOutputColumn
private String woekorderNo;
@ApiParam(value = "产线代码")
@AnnoOutputColumn
private String pdlineNo;
@ApiParam(value = "生产日期")
@AnnoOutputColumn
private String planProductTime;
@ApiParam(value = "班次代码")
@AnnoOutputColumn
private String shitNo;
@ApiParam(value = "开始生产时间")
@AnnoOutputColumn
private String startProductTime;
@ApiParam(value = "结束生产时间")
@AnnoOutputColumn
private String endProductTime;
@ApiParam(value = "零件号")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "零件描述")
@AnnoOutputColumn
private String partNameRdd;
@ApiParam(value = "工单数量")
@AnnoOutputColumn
private Double qty;
}

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

@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
public String title;
@Column(name = "TAG")
@ApiParam(value = "标签")
private String tag;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}

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

@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean {
@ApiParam(value = "加密编码")
private String encryptionNo;
@Column(name = "LAST_CS_TIME")
@ApiParam(value = "末次盘点时间")
private String lastCsTime;
@Transient
@ApiParam(value = "末次盘点开始时间")
private String lastCsTimeStart ;
@Transient
@ApiParam(value = "末次盘点结束时间")
private String lastCsTimeEnd;
public WmsLocate() {
}
public WmsLocate(String locateNo,Integer destBoxQty) {
this.locateNo = locateNo;
this.destBoxQty = destBoxQty;

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

@ -30,7 +30,7 @@ import javax.persistence.*;
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PART_NO")
})
@Api("库存移动单主表信息")
@Api("库存移动单处理成功后的记录")
public class WmsMoveToERP extends BaseBean {
private static final long serialVersionUID = -6223527594941733060L;

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

@ -0,0 +1,157 @@
package cn.estsh.i3plus.pojo.wms.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 : WMS_拉动计划任务明细表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-10 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_PULL_TASK_DETAILS")
@Api("WMS_拉动计划任务明细表")
public class WmsPullTaskDetails extends BaseBean{
private static final long serialVersionUID = 9214639813072592736L;
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String woekorderNo;
@Column(name="ITEM")
@ApiParam(value = "行号", example = "0")
private Integer item = 0;
@Column(name="TERMINAL_NO")
@ApiParam("工位代码")
private String terminalNo;
@Column(name="LOCATE_NO")
@ApiParam("库位代码")
private String locateNo;
@Column(name="LOCATE_CAPACITY")
@ApiParam("库位容量")
private String locateCapacity;
@Column(name="PART_NO")
@ApiParam("零件编号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("零件名称")
private String partNameRdd;
@Column(name="PLAN_PACK_COUNT")
@ApiParam(value = "计划容器数", example = "0")
private Integer planPackCount = 0;
@Column(name="FIRST_BATCH_QTY")
@ApiParam(value = "首批批量", example = "0")
private Integer firstBatchQty = 0;
@Column(name="FIRST_PACK_COUNT")
@ApiParam(value = "首批容器数", example = "0")
private Integer firstPackCount = 0;
@Column(name="REQUEST_QTY")
@ApiParam(value = "补货批量", example = "0")
private Integer requestQty = 0;
@Column(name="REQUEST_PACK_COUNT")
@ApiParam(value = "补货容器数", example = "0")
private Integer requestPackCount = 0;
@Column(name="REQUEST_LOT_NO")
@ApiParam(value = "补货批次", example = "0")
private Integer requestLotNo = 0;
@Column(name="REQUEST_TOTAL_COUNT")
@ApiParam(value = "补货累加次数", example = "0")
private Integer requestTotalCount = 0;
@Column(name="LAST_REQUEST_TIME")
@ApiParam("上一次补货时间")
private String lastRequestTtime;
@Column(name="BOOT_QTY")
@ApiParam(value = "尾箱批量", example = "0")
private Integer bootQty = 0;
@Column(name="BOOT_PACK_COUNT")
@ApiParam(value = "尾箱容器数", example = "0")
private Integer bootPackCount = 0;
@Column(name="BOOT_LOT_NO")
@ApiParam(value = "尾箱批次", example = "0")
private Integer bootLotNo = 0;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
private Integer orderStatus = 0;
public Integer getOrderStatus() {
return orderStatus == null ? 0 : this.orderStatus.intValue();
}
public Integer getBootLotNo() {
return bootLotNo == null ? 0 : this.bootLotNo.intValue();
}
public Integer getBootPackCount() {
return bootPackCount == null ? 0 : this.bootPackCount.intValue();
}
public Integer getBootQty() {
return bootQty == null ? 0 : this.bootQty.intValue();
}
public Integer getRequestTotalCount() {
return requestTotalCount == null ? 0 : this.requestTotalCount.intValue();
}
public Integer getRequestLotNo() {
return requestLotNo == null ? 0 : this.requestLotNo.intValue();
}
public Integer getRequestPackCount() {
return requestPackCount == null ? 0 : this.requestPackCount.intValue();
}
public Integer getRequestQty() {
return requestQty == null ? 0 : this.requestQty.intValue();
}
public Integer getFirstPackCount() {
return firstPackCount == null ? 0 : this.firstPackCount.intValue();
}
public Integer getFirstBatchQty() {
return firstBatchQty == null ? 0 : this.firstBatchQty.intValue();
}
public Integer getPlanPackCount() {
return planPackCount == null ? 0 : this.planPackCount.intValue();
}
public Integer getItem() {
return item == null ? 0 : this.item.intValue();
}
}

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

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.wms.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 : WMS_拉动计划任务主表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-09 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_PULL_TASK_MASTER")
@Api("WMS_拉动计划任务主表")
public class WmsPullTaskMaster extends BaseBean{
private static final long serialVersionUID = 9214639813072592736L;
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String woekorderNo;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
private String pdlineNo;
@Column(name="PLAN_PRODUCT_TIME")
@ApiParam("生产日期")
private String planProductTime;
@Column(name="SHIFT_NO")
@ApiParam("班次代码")
private String shitNo;
@Column(name="START_PRODUCT_TIME")
@ApiParam("开始生产时间")
private String startProductTime;
@Column(name="END_PRODUCT_TIME")
@ApiParam("结束生产时间")
private String endProductTime;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
private Integer orderStatus = 0;
public Integer getOrderStatus() {
return orderStatus == null ? 0 : this.orderStatus.intValue();
}
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 车辆信息
@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean {
@Column(name="ORDER_STATUS")
@ApiParam(value ="单据状态")
private String orderStatus;
private Integer orderStatus;
@Column(name="CUST_NAME")
@ApiParam(value ="客户名称RDD")
@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean {
@ApiParam(value =" 申请部门")
private String depart;
@Transient
@ApiParam("物料编码")
private String partNo;
}

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java
Unescape Escape View File

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :公共父类入参
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-07 16:06
* @Modify:
**/
@Data
public class BaseDto {
}

36
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java
Unescape Escape View File

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Transient;
import java.io.Serializable;
@Data
public class WmsCarDto extends BaseDto implements Serializable {
@Column(name="CAR_NO")
@ApiParam(value ="车牌号")
private String carNo;
@Column(name="DRIVER_NO")
@ApiParam(value ="默认驾驶员")
private String driverNo;
@Column(name="VENDOR_NO")
@ApiParam(value ="所属供应商")
private String vendorNo;
@ApiParam("是否删除，默认否")
protected Integer isDeleted = 2;
@ApiParam("是否有效，默认是")
protected Integer isValid = 1;
protected String organizeCode;
}

38
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
/**
* @Description :驾驶员入参
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-07 16:06
* @Modify:
**/
@Data
public class WmsTmsDriverDto extends BaseDto implements Serializable {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@ApiParam(value ="驾驶员姓名")
private String driverName;
@Column(name="LOGIN_NO")
@ApiParam(value =" 登录账号")
private String loginNo;
@ApiParam("是否删除，默认否")
protected Integer isDeleted = 2;
@ApiParam("是否有效，默认是")
protected Integer isValid = 1;
protected String organizeCode;
}

35
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :装车单入参
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-07 16:06
* @Modify:
**/
@Api("装车单入参")
@Data
public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("物料号")
private String partNo;
@ApiParam("运输状态")
private String carriageStatus;
@ApiParam("单据号")
private String orderNo;
@ApiParam("是否删除，默认否")
protected Integer isDeleted = 2;
@ApiParam("是否有效，默认是")
protected Integer isValid = 1;
@ApiParam("工厂代码")
protected String organizeCode;
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails;
import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :MES_生产计划明细表
* @Reference :
* @Author : jessica,chen
* @CreateDate : 2019-11-27 14:49
* @Modify:
**/
@Repository
public interface MesPpDetailsRepository extends BaseRepository<MesPpDetails, Long> {
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
import org.springframework.stereotype.Repository;
/**
* @Description :MES_生产计划主表
* @Reference :
* @Author : jessica,chen
* @CreateDate : 2019-11-27 14:49
* @Modify:
**/
@Repository
public interface MesPpMasterRepository extends BaseRepository<MesPpMaster, Long> {
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :wms拉动计划明细表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-11 14:49
* @Modify:
**/
@Repository
public interface WmsPullTaskDetailsRepository extends BaseRepository<WmsPullTaskDetails, Long> {
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :wms拉动计划主表
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-11 14:49
* @Modify:
**/
@Repository
public interface WmsPullTaskMasterRepository extends BaseRepository<WmsPullTaskMaster, Long> {
}

45
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -44,14 +44,14 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
}
// 封装有效状态、删除状态、创建人和创建时间
DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
}
// 封装有效状态、删除状态、创建人和创建时间
DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr;
}
@ -2574,4 +2574,41 @@ public class WmsHqlPack {
return result;
}
/**
* 生产计划主表信息分页查询条件
*
* @param mesPpMaster
* @return
*/
public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result);
DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result);
DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result);
DdlPreparedPack.getStringSmallerPack(mesPpMaster.getEndProductTime(), "endProductTime", result);
getStringBuilderPack(mesPpMaster, result);
return result;
}
/**
* 生产计划明细表信息分页查询条件
*
* @param mesPpDetails
* @return
*/
public static DdlPackBean packHqlMesPpDetails(MesPpDetails mesPpDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result);
getStringBuilderPack(mesPpDetails, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save