Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wynne1005
5 years ago
commit
b8239f6455
@ -0,0 +1,43 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description : 排程结果分析及建议
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ScheduleAnalyze {
|
||||
|
||||
@ApiParam(value ="工作编码")
|
||||
private String workCode;
|
||||
|
||||
@ApiParam(value ="数量")
|
||||
private Double count;
|
||||
|
||||
@ApiParam(value ="计划开始时间")
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date planStart;
|
||||
|
||||
@ApiParam(value ="计划结束时间")
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date planEnd;
|
||||
|
||||
@ApiParam(value ="问题描述")
|
||||
private String describe;
|
||||
|
||||
@ApiParam(value ="解决方案")
|
||||
private String solution;
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :不良信息接口表
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "IF_DEFECT_DATA")
|
||||
@Api("不良信息接口数据")
|
||||
public class IfDefectData extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 4320604250440221049L;
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serailNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "DEFECT_CODE")
|
||||
@ApiParam("缺陷代码")
|
||||
private String defectCode;
|
||||
|
||||
@Column(name = "DEFECT_NAME")
|
||||
@ApiParam("缺陷名称")
|
||||
private String defectName;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name = "DEFECT_ACTION_TYPE")
|
||||
@ApiParam("不良处理类型")
|
||||
private Integer defectActionType;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
|
||||
@Lob
|
||||
@Column(name = "ERROR_MESSAGE")
|
||||
@ApiParam("异常消息")
|
||||
private String errorMessage;
|
||||
|
||||
@Column(name = "ACTION_TYPE")
|
||||
@ApiParam("动作代码")
|
||||
private String actionType;
|
||||
|
||||
@Column(name = "IF_CODE")
|
||||
@ApiParam("接口代码")
|
||||
private String ifCode;
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :产品工作中心配置
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PROD_WORK_CENTER")
|
||||
@Api("产品工作中心配置")
|
||||
public class MesProdWorkCenter extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 9215737252535074536L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "IS_DEFAULT")
|
||||
@ApiParam("是否默认")
|
||||
private Integer isDefault;
|
||||
|
||||
@Column(name = "PART_SN")
|
||||
@ApiParam("料箱条码")
|
||||
private String partSn;
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description: 条码解绑实体
|
||||
* @Reference:
|
||||
* @Author: siliter.yuan
|
||||
* @CreateDate: 2020-06-28-11:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class PackageSnModel {
|
||||
|
||||
@ApiParam("包装条码")
|
||||
private String packageNo;
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("批次")
|
||||
private String lotNo;
|
||||
|
||||
@ApiParam("创建人")
|
||||
private String createUser;
|
||||
|
||||
@ApiParam("创建时间")
|
||||
private String createDateTime;
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author: siliter.yuan
|
||||
* @CreateDate: 2020/6/28 8:06 PM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Api("涂装检测MODEL")
|
||||
public class PaintCheckModel {
|
||||
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("颜色")
|
||||
private String color;
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("界面编号")
|
||||
private String windowNo;
|
||||
|
||||
@ApiParam("缺陷类型")
|
||||
private String defectType;
|
||||
|
||||
@ApiParam("缺陷描述")
|
||||
private String defectDesc;
|
||||
|
||||
@ApiParam("缺陷标识值")
|
||||
private String defectFlagValue;
|
||||
|
||||
@ApiParam("不良品处理类型")
|
||||
private Integer defectActionType;
|
||||
|
||||
@Column(name = "PROD_CFG_TYPE_CODE")
|
||||
@ApiParam("项目代码")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("界面组件参数数据")
|
||||
List<MesWindowModuleParam> windowModuleParamList;
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.IfDefectData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : if不良信息接口
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-28 16:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IfDefectDataRepository extends BaseRepository<IfDefectData, Long> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdWorkCenter;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-04-24-17:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProdWorkCenterRepository extends BaseRepository<MesProdWorkCenter, Long> {
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import cn.estsh.i3plus.pojo.model.wms.engine.domain.WmsThreeDimenLocateModel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description 3D仓库-库位优化模型
|
||||
* @Reference
|
||||
* @Author dragon
|
||||
* @CreateDate 2020/6/1 14:22
|
||||
* @Modify
|
||||
*/
|
||||
@Data
|
||||
public class WmsLocateListModel implements Serializable {
|
||||
private static final long serialVersionUID = -2672721389336190491L;
|
||||
|
||||
List<WmsThreeDimenLocateModel> unsolvedLocates;
|
||||
|
||||
String organizeCode;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms.engine.domain;
|
||||
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
public class LocateStrengthComparator implements Comparator<WmsThreeDimenLocateModel> {
|
||||
@Override
|
||||
public int compare(WmsThreeDimenLocateModel o1, WmsThreeDimenLocateModel o2) {
|
||||
return o1.getFrequency() - o2.getFrequency();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms.engine.domain;
|
||||
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
public class LocationStrengthComparator implements Comparator<Integer> {
|
||||
@Override
|
||||
public int compare(Integer seq1, Integer seq2) {
|
||||
return seq1 - seq2;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Index;
|
||||
import javax.persistence.Table;
|
||||
|
||||
|
||||
/**
|
||||
* @Description : 北京海纳川任务明细
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2018-11-17 14:50
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = {
|
||||
@Index(columnList = "TASK_CODE")
|
||||
})
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细")
|
||||
public class WmsAutoForkCallBackDetails extends BaseBean {
|
||||
private static final long serialVersionUID = -8103992000562208799L;
|
||||
|
||||
@Column(name = "REQ_CODE")
|
||||
@ApiParam(value = "请求编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String reqCode;
|
||||
|
||||
|
||||
@Column(name = "REQ_TIME")
|
||||
@ApiParam(value = "请求时间")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String reqTime;
|
||||
|
||||
@Column(name = "CLIENT_CODE")
|
||||
@ApiParam(value = "客服端编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String clientCode;
|
||||
|
||||
@Column(name = "TOKEN_CODE")
|
||||
@ApiParam(value = "令牌号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String tokenCode;
|
||||
|
||||
@Column(name = "INTERFACE_NAME")
|
||||
@ApiParam(value = "接口名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String interfaceName;
|
||||
|
||||
@Column(name = "METHOD")
|
||||
@ApiParam(value = "方法名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String method;
|
||||
|
||||
@Column(name = "TASK_CODE")
|
||||
@ApiParam(value = "任务单号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String taskCode;
|
||||
|
||||
@Column(name = "WB_CODE")
|
||||
@ApiParam(value = "工作为")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String wbCode;
|
||||
|
||||
@Column(name = "POD_CODE")
|
||||
@ApiParam(value = "货架编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String podCode;
|
||||
|
||||
@Column(name = "CURRENT_POSITION_CODE")
|
||||
@ApiParam(value = "子任务的位置编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String currentPositionCode;
|
||||
|
||||
@Column(name = "ROBOT_CODE")
|
||||
@ApiParam(value = "执行任务的VGA编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String robotCode;
|
||||
|
||||
//10=新建,20=已处理,30=处理出错
|
||||
@Column(name = "STATUS", nullable = false)
|
||||
@ApiParam("处理标准")
|
||||
public Integer status;
|
||||
|
||||
@Column(name = "REMARK", nullable = false)
|
||||
@ApiParam("备注")
|
||||
public String remark;
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
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 : jimmy.zeng
|
||||
* @CreateDate : 2020-06-23 13:55
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_AUTO_TASK_LOG")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "自动任务日志", description = "自动任务日志")
|
||||
public class WmsAutoTaskLog extends BaseBean {
|
||||
private static final long serialVersionUID = -7839329617395574378L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("关联订单号")
|
||||
public String orderNo;
|
||||
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
public String busiType;
|
||||
|
||||
@Column(name = "STRATEGY_NO")
|
||||
@ApiParam("策略代码")
|
||||
public String strategyNo;
|
||||
|
||||
@Column(name = "STRATEGY_ACTION")
|
||||
@ApiParam("策略动作")
|
||||
public String strategyAction;
|
||||
|
||||
@Column(name = "ERROR_MSG")
|
||||
@ApiParam("错误信息")
|
||||
public String errorMsg;
|
||||
}
|
||||
@ -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.WmsAutoForkCallBackDetails;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
|
||||
/**
|
||||
* @Description :北京海纳川回调任务明细
|
||||
* @Reference :
|
||||
* @Author : puxiao.lioa
|
||||
* @CreateDate : 2018-11-13 10:19
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsAutoForkCallBackDetailsRepository extends BaseRepository<WmsAutoForkCallBackDetails, 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.WmsAutoTaskLog;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-06-23 21:46
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsAutoTaskLogRecRepository extends BaseRepository<WmsAutoTaskLog,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue