Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
commit
1323569c56
@ -0,0 +1,56 @@
|
||||
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.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
||||
/**
|
||||
* @Description : 物料校验客户标签关系
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021/3/22 13:37
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL")
|
||||
@Api("IF_物料校验客户标签关系")
|
||||
public class IfPartCheckCustomerLabel extends BaseBean {
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "IS_CHECK")
|
||||
@ApiParam("是否校验")
|
||||
private Integer isCheck;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ColumnDefault("10")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
|
||||
@Column(name = "ERROR_MESSAGE")
|
||||
@ApiParam("异常消息")
|
||||
@Lob
|
||||
private String errorMessage;
|
||||
|
||||
@Column(name = "ACTION_CODE")
|
||||
@ApiParam("动作代码")
|
||||
private String actionCode;
|
||||
|
||||
@Column(name = "IF_CODE")
|
||||
@ApiParam("接口代码")
|
||||
private String ifCode;
|
||||
}
|
@ -0,0 +1,56 @@
|
||||
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.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
||||
/**
|
||||
* @Description : 物料校验客户标签明细
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021/3/22 13:37
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL_DETAIL")
|
||||
@Api("IF_物料校验客户标签明细")
|
||||
public class IfPartCheckCustomerLabelDetail extends BaseBean {
|
||||
|
||||
@Column(name = "PACKAGE_NO")
|
||||
@ApiParam("托条码")
|
||||
private String packageNo;
|
||||
|
||||
@Column(name = "CUSTOMER_LABEL")
|
||||
@ApiParam("客户标签")
|
||||
private String customerLabel;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ColumnDefault("10")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
|
||||
@Column(name = "ERROR_MESSAGE")
|
||||
@ApiParam("异常消息")
|
||||
@Lob
|
||||
private String errorMessage;
|
||||
|
||||
@Column(name = "ACTION_CODE")
|
||||
@ApiParam("动作代码")
|
||||
private String actionCode;
|
||||
|
||||
@Column(name = "IF_CODE")
|
||||
@ApiParam("接口代码")
|
||||
private String ifCode;
|
||||
}
|
@ -0,0 +1,123 @@
|
||||
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.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :物料关键数据关系记录
|
||||
* @Reference :
|
||||
* @Author : crish
|
||||
* @CreateDate : 2019-05-15
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_KP_DATA_RECORD")
|
||||
@Api("物料关键数据关系记录")
|
||||
public class MesKpDataRecord extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 8243089140216459544L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "KEY_DATA_CODE")
|
||||
@ApiParam("关键数据代码")
|
||||
private String keyDataCode;
|
||||
|
||||
@Column(name = "KEY_DATA_NAME")
|
||||
@ApiParam("关键数据名称")
|
||||
private String keyDataName;
|
||||
|
||||
@Column(name = "KEY_DATA_COUNT")
|
||||
@ApiParam("关键数据数量")
|
||||
private Integer keyDataCount;
|
||||
|
||||
@Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam("数据上限")
|
||||
private Double upperLimit;
|
||||
|
||||
@Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam("数据下限")
|
||||
private Double lowerLimit;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工位")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "TORQUE_GROUP")
|
||||
@ApiParam("扭矩组")
|
||||
private String torqueGroup;
|
||||
|
||||
@Column(name = "TORQUE_GROUP_SEQ")
|
||||
@ApiParam("扭矩组顺序")
|
||||
private Integer torqueGroupSeq;
|
||||
|
||||
@Column(name = "TORQUE")
|
||||
@ApiParam("扭矩项")
|
||||
private String torque;
|
||||
|
||||
@Column(name = "TORQUE_SEQ")
|
||||
@ApiParam("扭矩项顺序")
|
||||
private Integer torqueSeq;
|
||||
|
||||
@Column(name = "JOB_ID")
|
||||
@ApiParam("JOB_ID")
|
||||
private Integer jobId;
|
||||
|
||||
@Column(name = "LAST_TIGHTENING_ID")
|
||||
@ApiParam("最后一次扭矩id")
|
||||
private Long lastTighteningId;
|
||||
|
||||
@Column(name = "TORQUE_VALUE")
|
||||
@ApiParam("扭矩值")
|
||||
private Double torqueValue;
|
||||
|
||||
@Column(name = "RESULT")
|
||||
@ApiParam("采集结果")
|
||||
private Integer result;
|
||||
|
||||
@Column(name = "ACTUAL_NUM")
|
||||
@ApiParam("实采个数")
|
||||
private Integer actualNum;
|
||||
|
||||
@Column(name = "SPECIFIC_SN")
|
||||
@ApiParam("特殊码")
|
||||
private String specificSn;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
|
||||
public double getKeyDataCountVal() {
|
||||
return this.keyDataCount == null ? 0 : this.keyDataCount;
|
||||
}
|
||||
|
||||
public double getUpperLimitVal() {
|
||||
return this.upperLimit == null ? 0.0d : this.upperLimit;
|
||||
}
|
||||
|
||||
public double getLowerLimitVal() {
|
||||
return this.lowerLimit == null ? 0.0d : this.lowerLimit;
|
||||
}
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 特殊物料
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/24 3:10 PM
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_PART_CAR_MODEL")
|
||||
@Api("车型零件关系表")
|
||||
public class MesPartCarModel extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -4039513102671811231L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("零件名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "VEHICLE_CODE")
|
||||
@ApiParam("车型代码")
|
||||
private String vehicleCode;
|
||||
|
||||
@Column(name = "VEHICLE_NAME")
|
||||
@ApiParam("车型名称")
|
||||
private String vehicleName;
|
||||
|
||||
@Column(name = "SERIAL_NO")
|
||||
@ApiParam("车型流水号")
|
||||
private String serialNo;
|
||||
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 特殊物料
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/24 3:10 PM
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_PART_SPECIFIC")
|
||||
@Api("特殊物料关系信息")
|
||||
public class MesPartSpecific extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -4039513102671816031L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("父零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("父零件名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "ITEM_PART_NO")
|
||||
@ApiParam("子零件")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name = "ITEM_PART_NAME")
|
||||
@ApiParam("子零件名称")
|
||||
private String itemPartName;
|
||||
|
||||
@Column(name = "TORQUE_SN")
|
||||
@ApiParam("特殊码")
|
||||
private String specificSn;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
}
|
@ -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.IfPartCheckCustomerLabelDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021/3/22 15:41
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IfPartCheckCustomerLabelDetailRepository extends BaseRepository<IfPartCheckCustomerLabelDetail, 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.IfPartCheckCustomerLabel;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021/3/22 15:39
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IfPartCheckCustomerLabelRepository extends BaseRepository<IfPartCheckCustomerLabel, Long> {
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesKpDataRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/25 2:00 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesKpDataRecordRepository extends BaseRepository<MesKpDataRecord, Long> {
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartCarModel;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/24 3:13 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesPartCarModelRepository extends BaseRepository<MesPartCarModel, Long> {
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartSpecific;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/24 3:13 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesPartSpecificRepository extends BaseRepository<MesPartSpecific, Long> {
|
||||
}
|
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : Batch数据模型
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2021-04-05 14:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("Batch数据模型")
|
||||
public class WmsBatchModel {
|
||||
|
||||
@ApiParam("二维条码集合")
|
||||
private List<WmsSerialSn> wmsSerialSns;
|
||||
|
||||
@ApiParam("条码集合")
|
||||
private List<WmsStockSn> wmsStockSnList;
|
||||
|
||||
@ApiParam("Batch号")
|
||||
private String bhCode;
|
||||
|
||||
@ApiParam("上一个熔深Batch号")
|
||||
private String firstSnBatch;
|
||||
|
||||
@ApiParam("新事务单号")
|
||||
private String moveNo;
|
||||
|
||||
@ApiParam("是否正常件")
|
||||
private boolean flag;
|
||||
|
||||
@ApiParam("工厂代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("操作人")
|
||||
private String userName;
|
||||
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository.mesdata;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendPartCheck;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 库存条码dao层
|
||||
* @Reference :
|
||||
* @Author : dragon.xu
|
||||
* @CreateDate : 2018-11-17 15:53
|
||||
* @Modify:
|
||||
**/
|
||||
public interface WmsSendPartCheckRepository extends BaseRepository<WmsSendPartCheck, Long> {
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository.mesdata;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendSnCheck;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 库存条码dao层
|
||||
* @Reference :
|
||||
* @Author : dragon.xu
|
||||
* @CreateDate : 2018-11-17 15:53
|
||||
* @Modify:
|
||||
**/
|
||||
public interface WmsSendSnCheckRepository extends BaseRepository<WmsSendSnCheck, Long> {
|
||||
}
|
Loading…
Reference in New Issue