yun-zuoyi
zcg 6 years ago
commit 7016f20282

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

@ -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 ="序号")

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

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

@ -947,12 +947,12 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_TYPE {
PART("PART_ALARM", 110060205, "物料"),
QUALITY("QUALITY_ALARM", 110060206, "质量"),
EQUIP("EQUMENT_ALARM", 110060207, "设备"),
PROCESS("ROUTING_ALARM", 110060208, "工艺"),
CHECK("OTHER_ALARM", 110060209, "自处理"),
FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
PART("PART_ALARM", 110060104, "物料"),
QUALITY("QUALITY_ALARM", 110060105, "质量"),
EQUIP("EQUMENT_ALARM", 110060106, "设备"),
PROCESS("ROUTING_ALARM", 110060107, "工艺"),
CHECK("OTHER_ALARM", 110060108, "自处理"),
FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
private String value;
private Integer code;

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

@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
TRUE_OR_FALSE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* - MES_PACK_SPEC
* 10.
@ -172,7 +204,9 @@ public class MesEnumUtil {
this.description = description;
}
public String getValue() { return value;}
public String getValue() {
return value;
}
public String getDescription() {
return description;

@ -1180,7 +1180,7 @@ public class MesPcnEnumUtil {
MATERIAL(30, "materials", "物料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
ENVIRONMENT(60, "environment", "环境");
private int value;

@ -961,7 +961,7 @@ public class WmsEnumUtil {
/**
*
* 1=10=20=30=40=50=60=70=
* 10=20=30=40=50=60=70=80=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
@ -1347,6 +1347,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);
}
}
/**
*
@ -4304,4 +4343,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;
}
}
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION")
@Api("mes系统业务动作")
public class MesAction extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam("动作名称")
private String actionName;
@Column(name = "ACTION_TYPE")
@ApiParam("动作类型")
private Integer actionType;
public int getActionTypeVal() {
return this.actionType == null ? 0 : this.actionType;
}
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_METHOD")
@Api("系统业务动作方法")
public class MesActionMethod extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}
}

@ -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 + '\'' +
'}';
}
}

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -49,20 +49,18 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncFrequency;
@Column(name = "SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name = "SYNC_PATTERN")//2.新增 1.修改
@ApiParam("同步方式")
@Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2.新增 1.修改")
private Integer syncPattern;
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
@Column(name = "SYNC_TYPE")
@ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes")
private Integer syncType;
@Column(name = "LAST_SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@ -74,6 +72,10 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
@Column(name = "IS_IGNORE_ORG")
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

@ -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 {
@ -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 + '\'' +

@ -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")
@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="OPERATE_TYPE")
@Column(name = "SN_TYPE")
@ApiParam("条码类型 10=正常默认20=首检件")
private Integer snType;
@Column(name = "TRAY_NO")
@ApiParam("托盘号")
private String trayNo;
@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")
@ -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 {

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

@ -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")
@ -203,6 +200,10 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("mes生产工单页面按钮控制")
private MesButtonFlagModel mesButtonFlagModel;
@Transient
@ApiParam("批量打包开窗页面查询工单=1")
private String pageType;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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

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

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesActionRepository extends BaseRepository<MesAction, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
}

@ -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;
}
@ -126,8 +124,13 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
} else {
if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) {
DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(),
MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean);
}
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,6 +28,9 @@ import javax.persistence.Table;
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean {
private static final long serialVersionUID = 7270930330576127126L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@ -49,20 +52,18 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncFrequency;
@Column(name = "SYNC_TIME")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name = "SYNC_PATTERN")//2、新增 1、修改
@ApiParam("同步方式")
@Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2、新增 1、修改")
private Integer syncPattern;
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
@Column(name = "SYNC_TYPE")
@ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes")
private Integer syncType;
@Column(name = "LAST_SYNC_TIME")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@ -74,6 +75,14 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
@Column(name = "IS_IGNORE_ORG")
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
public int getIsIgnoreOrgVal() {
return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
}
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

@ -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 {
@ -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 + '\'' +
'}';

@ -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")
@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="OPERATE_TYPE")
@Column(name = "SN_TYPE")
@ApiParam("条码类型 10=正常默认20=首检件")
private Integer snType;
@Column(name = "TRAY_NO")
@ApiParam("托盘号")
private String trayNo;
@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 {

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

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

@ -477,10 +477,6 @@ public class MesHqlPack {
public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
@ -1055,16 +1051,9 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
}
if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
}
if (null != pcnSyncCfg.getSyncType()) {
DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
}
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
return packBean;
}

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

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

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

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

@ -103,7 +103,7 @@ public class WmsBom extends BaseBean {
@Column(name = "TERMINAL_NO")
@ApiParam(value = "工位代码")
private String terminalnNo;
private String terminalNo;
public Double getQty() {
return this.qty == null ? 0 : this.qty.doubleValue();

@ -0,0 +1,64 @@
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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_CAR")
@Api("车辆信息")
public class WmsCar extends BaseBean {
@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;
@Transient
@ApiParam("司机名称")
private String driverNameRdd;
@Transient
@ApiParam(value = "供应商名称")
private String vendorNameRdd;
}

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

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

@ -0,0 +1,48 @@
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 :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-05 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_SHIFT")
@Api("班次信息")
public class WmsShift extends BaseBean{
private static final long serialVersionUID = 9214639813072592714L;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
private String shiftNo;
@Column(name="SHIFT_NAME")
@ApiParam("班次名称")
private String shiftName;
@Column(name="START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="END_TIME")
@ApiParam("结束时间")
private String endTime;
}

@ -0,0 +1,52 @@
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 :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-05 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_SHIFT_REST")
@Api("班休信息")
public class WmsShiftRest extends BaseBean{
private static final long serialVersionUID = 9214639813072592715L;
@Column(name="REST_NO")
@ApiParam("班休代码")
private String restNo;
@Column(name="REST_NAME")
@ApiParam("班休名称")
private String restName;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
private String shiftNo;
@Column(name="START_REST_TIME")
@ApiParam("开始休息时间")
private String startRestTime;
@Column(name="END_REST_TIME")
@ApiParam("结束休息时间")
private String endRestTime;
}

@ -0,0 +1,63 @@
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 :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_DRIVER")
@Api("驾驶员信息")
public class WmsTmsDriver extends BaseBean {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@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;
}

@ -0,0 +1,100 @@
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 :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT")
@Api("装车单信息")
public class WmsTmsShippingExt extends BaseBean {
@Column(name="MOVE_NO")
@ApiParam(value ="移库单号")
private String moveNo;
@Column(name="DESTINATION")
@ApiParam(value ="到货地点")
private String destination;
@Column(name="REC_USER")
@ApiParam(value ="接收人")
private String recUser;
@Column(name="REC_PHONE")
@ApiParam(value ="接收人电话")
private String recPhone;
@Column(name="DOCK_NO")
@ApiParam(value ="道口")
private String dockNo;
@Column(name="VENDOR_NO")
@ApiParam(value ="承运商编号")
private String vendorNo;
@Column(name="VENDOR_NAME")
@ApiParam(value ="承运商名称RDD")
private String vendorName;
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@ApiParam(value ="驾驶员名称RDD")
private String driverName;
@Column(name="PHONE")
@ApiParam(value ="驾驶员联系方式RDD")
private String phone;
@Column(name="ORDER_STATUS")
@ApiParam(value ="单据状态")
private String orderStatus;
@Column(name="CUST_NAME")
@ApiParam(value ="客户名称RDD")
private String custName;
@Column(name="CUST_NO")
@ApiParam(value ="客户编号RDD")
private String custNo;
@Column(name="CAR_NO")
@ApiParam(value ="车牌号RDD")
private String carNo;
@Column(name="DELIVERY_TIME")
@ApiParam(value ="计划发车时间")
private String deliveryTime;
@Column(name="ARRIVEL_TIME")
@ApiParam(value ="要求到货时间")
private String arrivelTime;
@Column(name="DEPART")
@ApiParam(value =" 申请部门")
private String depart;
}

@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
*/
@Column(name = "SRC_WHERE", length = 255)
public String srcWhere;
/**
*
*/
@Column(name = "SRC_GROUP_COLUMNS", length = 255)
public String srcGroupColumns;
/**
*
* SYNFLG=Y,SYNDATE={#XX}

@ -0,0 +1,51 @@
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 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;
@Transient
@ApiParam("司机名称")
private String driverNameRdd;
@Transient
@ApiParam(value = "供应商名称")
private String vendorNameRdd;
@ApiParam(value = "是否删除,默认否")
private Integer isDeleted = 2;
@ApiParam("是否有效,默认是")
private Integer isValid = 1;
}

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
@Data
public class WmsTmsDriverDto implements Serializable {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@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;
@ApiParam("是否有效,默认是")
private Integer isValid = 1;
}

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

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsCar;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-04 15:29
* @Modify:
**/
@Repository
public interface WmsCarRepository extends BaseRepository<WmsCar, Long> {
}

@ -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.WmsShift;
import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-05 14:49
* @Modify:
**/
@Repository
public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
}

@ -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.WmsShift;
import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-05 14:49
* @Modify:
**/
@Repository
public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
}

@ -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.WmsCar;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-04 15:29
* @Modify:
**/
@Repository
public interface WmsTmsDriverRepository extends BaseRepository<WmsTmsDriver, Long> {
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save