Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
陈思洁
4 years ago
commit
74947bfaf8
@ -0,0 +1,44 @@
|
||||
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: dominic
|
||||
* @Date: 2020/12/03 20:29
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_ANALYSIS_RULE")
|
||||
@Api("MES_解析规则")
|
||||
public class MesAnalysisRule extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -5274274774653791153L;
|
||||
|
||||
@Column(name = "RULE_CODE")
|
||||
@ApiParam("规则代码")
|
||||
private String ruleCode;
|
||||
|
||||
@Column(name = "ANALYSIS_RULE_CODE")
|
||||
@ApiParam("解析规则")
|
||||
private String analysisRuleCode;
|
||||
|
||||
@Column(name = "OBJECT_CODE")
|
||||
@ApiParam("对象代码")
|
||||
private String objectCode;
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
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.Index;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/12/10 5:39 PM
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PACKAGE_QUEUE", indexes = {
|
||||
@Index(columnList = "PACKAGE_NO"),
|
||||
@Index(columnList = "CT_NO")
|
||||
})
|
||||
@Api("MES_包装队列")
|
||||
public class MesPackageQueue extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -7427832962272134299L;
|
||||
|
||||
@Column(name = "PACKAGE_NO")
|
||||
@ApiParam("包装编码")
|
||||
private String packageNo;
|
||||
|
||||
@Column(name = "CT_NO")
|
||||
@ApiParam("容器编号")
|
||||
private String ctNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameAdd;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("批号")
|
||||
private String lotNo;
|
||||
|
||||
@Column(name = "FIX_LOT_NO")
|
||||
@ApiParam("特殊批号")
|
||||
private String fixLotNo;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
|
||||
@ApiParam("排序")
|
||||
private Double seq;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
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: dominic
|
||||
* @Date: 2020/12/03 20:29
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PART_ANALYSIS_RULE")
|
||||
@Api("MES_物料解析规则配置")
|
||||
public class MesPartAnalysisRule extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 7877300316848838443L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "RULE_CODE")
|
||||
@ApiParam("规则代码")
|
||||
private String ruleCode;
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 产品工序过程查询-条件
|
||||
* @author yumingxing
|
||||
* @version 1.0
|
||||
* @date 2021/1/10 11:02
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ApiModel("产品工序过程查询-条件")
|
||||
public class ConditionQueryModel {
|
||||
|
||||
@ApiParam("项目名称")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("客户零件号")
|
||||
private String customerPartNo;
|
||||
|
||||
@ApiParam("开始时间")
|
||||
private String modifyStartTime;
|
||||
|
||||
@ApiParam("结束时间")
|
||||
private String modifyEndTime;
|
||||
|
||||
@ApiParam("零件二维码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("质量状态")
|
||||
private Integer qcStatus;
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author yumingxing
|
||||
* @version 1.0
|
||||
* @date 2021/1/9 14:29
|
||||
**/
|
||||
@ApiModel("项目号零件号")
|
||||
@Data
|
||||
|
||||
public class ProdCustPartModel {
|
||||
|
||||
@ApiParam("项目号")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("客户零件号")
|
||||
private String customerPartNo;
|
||||
|
||||
public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) {
|
||||
this.prodCfgTypeCode = prodCfgTypeCode;
|
||||
this.partNo = partNo;
|
||||
this.customerPartNo = customerPartNo;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 产品履历报表-产品信息
|
||||
* @author yumingxing
|
||||
* @version 1.0
|
||||
* @date 2020/12/18 15:16
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("产品工序过程查询-条件查询页面")
|
||||
public class ProductSnConditionModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 3154899794523800804L;
|
||||
|
||||
@ApiParam("零件二维码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("客户零件号")
|
||||
private String customerPartNo;
|
||||
|
||||
@ApiParam("CMS零件号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("项目名称")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("产线")
|
||||
private String workCenterName;
|
||||
|
||||
@ApiParam("工序名称")
|
||||
private String processName;
|
||||
|
||||
@ApiParam("工位名称")
|
||||
private String workCellName;
|
||||
|
||||
@ApiParam(value = "扫码时间")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam("质量状态")
|
||||
private Integer qcStatus;
|
||||
|
||||
@ApiParam("质量状态Name")
|
||||
private String qcStatusName;
|
||||
|
||||
public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) {
|
||||
this.serialNumber = serialNumber;
|
||||
this.customerPartNo = customerPartNo;
|
||||
this.partNo = partNo;
|
||||
this.prodCfgTypeCode = prodCfgTypeCode;
|
||||
this.workCenterName = workCenterName;
|
||||
this.processName = processName;
|
||||
this.workCellName = workCellName;
|
||||
this.createDatetime = createDatetime;
|
||||
this.qcStatus = qcStatus;
|
||||
}
|
||||
}
|
||||
@ -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.MesAnalysisRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: dominic
|
||||
* @Date: 2020/12/03 20:29
|
||||
* @Modify:
|
||||
*/
|
||||
@Repository
|
||||
public interface MesAnalysisRuleRepository extends BaseRepository<MesAnalysisRule, Long> {
|
||||
}
|
||||
@ -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.MesPackageQueue;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/12/10 5:40 PM
|
||||
* @Modify:
|
||||
*/
|
||||
@Repository
|
||||
public interface MesPackageQueueRepository extends BaseRepository<MesPackageQueue, Long> {
|
||||
}
|
||||
@ -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.MesPartAnalysisRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: dominic
|
||||
* @Date: 2020/12/03 20:29
|
||||
* @Modify:
|
||||
*/
|
||||
@Repository
|
||||
public interface MesPartAnalysisRuleRepository extends BaseRepository<MesPartAnalysisRule, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue