yun-zuoyi
陈思洁 6 years ago
commit 45c1fc6571

@ -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;
}

@ -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;

@ -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;
}
}
}

@ -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;

@ -1015,6 +1015,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;
}
}
/**
*
*/

@ -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;
}

@ -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> {
}

@ -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;
}
}

@ -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;

@ -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 {

@ -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")

@ -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 {

@ -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 {

@ -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")

@ -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")

@ -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 {
@ -128,7 +129,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("返回信息")
private String resultMsg;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;

@ -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")

@ -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;

@ -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 {

@ -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")

@ -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")

@ -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")

@ -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 {

@ -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 {

@ -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 {

@ -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 {

@ -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")

@ -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")

@ -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 {

@ -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;

@ -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 {

@ -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,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,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,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 {

@ -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")

@ -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 {

@ -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 {

@ -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")

@ -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")

@ -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 {
@ -121,7 +122,7 @@ public class MesProduceSn extends BaseBean {
@ApiParam("托盘号")
private String trayNo;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;

@ -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;

@ -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")

@ -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,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")

@ -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")

@ -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,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 {

@ -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 {

@ -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 {

@ -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 {

@ -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")

@ -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")

@ -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")

@ -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")

@ -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,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)

@ -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 {

@ -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 {

@ -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 {

@ -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 {

@ -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;
}

@ -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;

@ -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;
}

@ -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 {
}

@ -8,44 +8,29 @@ import javax.persistence.Transient;
import java.io.Serializable;
@Data
public class WmsCarDto implements Serializable {
public class WmsCarDto extends BaseDto implements Serializable {
@Column(name="CAR_NO")
@ApiParam(value ="车牌号")
private String carNo;
@Column(name="CAR_DESC")
@ApiParam(value ="车辆描述")
private String carDesc;
@Column(name="MAX_CAPACITY")
@ApiParam(value ="载重量(KG)")
private String maxCapacity;
@Column(name="DRIVER_NO")
@ApiParam(value ="默认驾驶员")
private String driverNo;
@Column(name="PHONE")
@ApiParam(value ="车主电话")
private String phone;
@Column(name="VENDOR_NO")
@ApiParam(value ="所属供应商")
private String vendorNo;
@ApiParam("是否删除,默认否")
@Transient
@ApiParam("司机名称")
private String driverNameRdd;
protected Integer isDeleted = 2;
@Transient
@ApiParam(value = "供应商名称")
private String vendorNameRdd;
@ApiParam("是否有效,默认是")
protected Integer isValid = 1;
@ApiParam(value = "是否删除,默认否")
private Integer isDeleted = 2;
protected String organizeCode;
@ApiParam("是否有效,默认是")
private Integer isValid = 1;
}

@ -6,8 +6,15 @@ 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 implements Serializable {
public class WmsTmsDriverDto extends BaseDto implements Serializable {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
@ -17,33 +24,15 @@ public class WmsTmsDriverDto implements Serializable {
@ApiParam(value ="驾驶员姓名")
private String driverName;
@Column(name="SEX")
@ApiParam(value ="驾驶员性别")
private Integer sex;
@Column(name="AGE")
@ApiParam(value ="驾驶员年龄")
private String age;
@Column(name="ID_NO")
@ApiParam(value ="驾驶员身份证号")
private String idNo;
@Column(name="ADRESS")
@ApiParam(value ="驾驶员籍贯")
private String adress;
@Column(name="PHONE")
@ApiParam(value ="车牌号")
private String phone;
@Column(name="LOGIN_NO")
@ApiParam(value =" 登录账号")
private String loginNo;
@ApiParam("是否删除,默认否")
private Integer isDeleted = 2;
protected Integer isDeleted = 2;
@ApiParam("是否有效,默认是")
private Integer isValid = 1;
protected Integer isValid = 1;
protected String organizeCode;
}

@ -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;
}
Loading…
Cancel
Save