Merge branch 'master' into test
commit
9d64793a5f
@ -0,0 +1,74 @@
|
||||
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;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :工位投料履历信息
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_CELL_FEED_RECORD")
|
||||
@Api("工位投料履历信息")
|
||||
public class MesCellFeedRecord extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 1947971379489107783L;
|
||||
@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")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "RAW_TYPE")
|
||||
@ApiParam("原料类型")
|
||||
private String rawType;
|
||||
|
||||
@Column(name = "RAW_SN")
|
||||
@ApiParam("原材料条码")
|
||||
private String rawSn;
|
||||
|
||||
@Column(name = "RAW_QTY")
|
||||
@ApiParam("原材料数量")
|
||||
private Double rawQty;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("关联批次")
|
||||
private String lotNo;
|
||||
|
||||
@Column(name = "SUPPLIER_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String supplierCode;
|
||||
|
||||
|
||||
public double getRawQtyVal() {
|
||||
return this.rawQty == null ? 0l : this.rawQty;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
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.MesCellFeedRecord;
|
||||
|
||||
/**
|
||||
* @Description : 工位投料履历持久化类
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-17 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
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 : siliter.yuan
|
||||
* @CreateDate : 2020-06-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_CELL_FEED_RECORD")
|
||||
@Api("工位投料履历信息")
|
||||
public class MesCellFeedRecord extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 1947971369489107783L;
|
||||
@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")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "RAW_TYPE")
|
||||
@ApiParam("原料类型")
|
||||
private String rawType;
|
||||
|
||||
@Column(name = "RAW_SN")
|
||||
@ApiParam("原材料条码")
|
||||
private String rawSn;
|
||||
|
||||
@Column(name = "RAW_QTY")
|
||||
@ApiParam("原材料数量")
|
||||
private Double rawQty;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("关联批次")
|
||||
private String lotNo;
|
||||
|
||||
@Column(name = "SUPPLIER_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String supplierCode;
|
||||
|
||||
|
||||
public double getRawQtyVal() {
|
||||
return this.rawQty == null ? 0l : this.rawQty;
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/7/30 9:30 AM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PART_SAMPLE")
|
||||
@Api("产品样本配置")
|
||||
public class MesPartSample extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -9190123981329081945L;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/16 14:21
|
||||
* @desc 打包样本
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("打包样本")
|
||||
public class PackageSampleModel {
|
||||
|
||||
@ApiParam(name = "已打包数量")
|
||||
private Double alreadyPackageCount;
|
||||
|
||||
@ApiParam(name = "标准打包数量")
|
||||
private Double standardPackageCount;
|
||||
|
||||
@ApiParam(name = "样本类型")
|
||||
private Map<String, String> sampleTypeMap;
|
||||
|
||||
@ApiParam(name = "样本类型代码")
|
||||
private String lastSampleTypeCode;
|
||||
|
||||
@ApiParam(name = "选择的样本类型")
|
||||
private String chooseSampleTypeCode;
|
||||
|
||||
@ApiParam(name = "强制执行工步")
|
||||
private String forceStepCode;
|
||||
|
||||
@ApiParam(name = "强制打包密码")
|
||||
private String password;
|
||||
|
||||
@ApiParam(name = "工厂")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(name = "工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCellFeedRecord;
|
||||
|
||||
/**
|
||||
* @Description : 工位投料履历持久化类
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-17 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
|
||||
}
|
||||
@ -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.MesPartSample;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPartSampleRepository extends BaseRepository<MesPartSample, Long> {
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue