Merge remote-tracking branch 'origin/dev' into dev
commit
5ba022c21a
Binary file not shown.
@ -0,0 +1,68 @@
|
||||
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:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/22 11:03 上午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_OFF_LINE_RECORD")
|
||||
@Api("MES_产品下线记录")
|
||||
public class MesOffLineRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -2767323581134885752L;
|
||||
|
||||
@Column(name = "AREA_CODE")
|
||||
@ApiParam("区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "WORK_ORDER_NO")
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@Column(name = "OFF_LINE_TIME")
|
||||
@ApiParam("下线时间")
|
||||
private String offLineTime;
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesOffLineRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/22 11:10 上午
|
||||
* @Modify:
|
||||
*/
|
||||
@Repository
|
||||
public interface MesOffLineRecordRepository extends BaseRepository<MesOffLineRecord, Long> {
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_WINDOW")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("PTL_界面")
|
||||
public class PtlWindow extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -1596443842758197995L;
|
||||
|
||||
@Column(name = "WINDOW_NO")
|
||||
@ApiParam("界面代码")
|
||||
private String windowNo;
|
||||
|
||||
@Column(name = "WINDOW_NAME")
|
||||
@ApiParam("界面名称")
|
||||
private String windowName;
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_WINDOW_ELEMENT")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("PTL_界面元素")
|
||||
public class PtlWindowElement extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -1596427582758197995L;
|
||||
|
||||
@Column(name = "WINDOW_NO")
|
||||
@ApiParam("界面代码")
|
||||
private String windowNo;
|
||||
|
||||
@Column(name = "ELEMENT_NO")
|
||||
@ApiParam("元素代码")
|
||||
private String elementNo;
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("PTL_界面元素属性")
|
||||
public class PtlWindowElementAttribute extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -1596427582758285995L;
|
||||
|
||||
@Column(name = "WINDOW_NO")
|
||||
@ApiParam("界面代码")
|
||||
private String windowNo;
|
||||
|
||||
@Column(name = "ELEMENT_NO")
|
||||
@ApiParam("元素代码")
|
||||
private String elementNo;
|
||||
|
||||
@Column(name = "ATTRIBUTE_NO")
|
||||
@ApiParam("属性代码")
|
||||
private String attributeNo;
|
||||
|
||||
@Column(name = "ATTRIBUTE_VALUE")
|
||||
@ApiParam("属性值")
|
||||
private String attributeValue;
|
||||
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
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.WmsEnumUtil;
|
||||
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 : BH子检测项
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_BH_CHILD_DETECTION_ITEM")
|
||||
@Api("BH子检测项")
|
||||
public class WmsBhChildDetectionItem extends BaseBean {
|
||||
|
||||
@Column(name = "CHECK_TYPE")
|
||||
@ApiParam("检测大类")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
|
||||
private Integer checkType;
|
||||
|
||||
@Column(name = "ITEM_CHECK_CODE")
|
||||
@ApiParam("子检测项代码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String itemCheckCode;
|
||||
|
||||
@Column(name = "ITEM_CHECK_NAME")
|
||||
@ApiParam("子检测项名称")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String itemCheckName;
|
||||
|
||||
@Column(name = "VALUE_TYPE")
|
||||
@ApiParam("值类型")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
|
||||
private Integer valueType;
|
||||
}
|
@ -0,0 +1,57 @@
|
||||
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.WmsEnumUtil;
|
||||
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 : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PART_CHECK_TYPE")
|
||||
@Api("物料检测大类")
|
||||
public class WmsPartCheckType extends BaseBean {
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("产线代码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String partName;
|
||||
|
||||
@Column(name = "CHECK_TYPE")
|
||||
@ApiParam("检测大类")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
|
||||
private Integer checkType;
|
||||
|
||||
@Column(name = "SAMPLE_SIZE")
|
||||
@ApiParam("样本数")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
|
||||
private Integer sampleSize;
|
||||
}
|
@ -0,0 +1,77 @@
|
||||
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.WmsEnumUtil;
|
||||
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 : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PART_ITEM_CHECK")
|
||||
@Api("物料子检测项")
|
||||
public class WmsPartItemCheck extends BaseBean {
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("产线代码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "CHECK_TYPE")
|
||||
@ApiParam("检测大类")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
|
||||
private Integer checkType;
|
||||
|
||||
@Column(name = "CHECK_ITEM_CODE")
|
||||
@ApiParam("子检测项代码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String checkItemCode;
|
||||
|
||||
@Column(name = "CHECK_ITEM_NAME")
|
||||
@ApiParam("子检测项名称")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String checkItemName;
|
||||
|
||||
@Column(name = "VALUE_TYPE")
|
||||
@ApiParam("子检测箱值类型")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
|
||||
private Integer valueType;
|
||||
|
||||
@Column(name = "STANDARD")
|
||||
@ApiParam("标准值")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
|
||||
private Double standard;
|
||||
|
||||
@Column(name = "MAX")
|
||||
@ApiParam("最大值")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
|
||||
private Double max;
|
||||
|
||||
@Column(name = "MIN")
|
||||
@ApiParam("最小值")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
|
||||
private Double min;
|
||||
}
|
@ -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.WmsBhChildDetectionItem;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : BH子检测项
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsBhChildDetectionItemRepository extends BaseRepository<WmsBhChildDetectionItem, 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.WmsPartCheckType;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description : 物料检测大类
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public interface WmsPartCheckTypeRepository extends BaseRepository<WmsPartCheckType, 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.WmsPartItemCheck;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 持久层物料子检测项
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPartItemCheckRepository extends BaseRepository<WmsPartItemCheck, Long> {
|
||||
}
|
Loading…
Reference in New Issue