Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.javayun-zuoyi
yiming.gu
6 years ago
commit
2eb732c7df
@ -0,0 +1,93 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-16-17:36
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_KPSN_RULE")
|
||||
@Api("关键件条码校验规则")
|
||||
public class MesKpsnRule extends BaseBean {
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="LENGTH")
|
||||
@ApiParam("长度")
|
||||
private Integer length;
|
||||
|
||||
@Column(name="FROM1")
|
||||
@ApiParam("起始1")
|
||||
private Integer from1;
|
||||
|
||||
@Column(name="TO1")
|
||||
@ApiParam("至1")
|
||||
private Integer to1;
|
||||
|
||||
@Column(name="FIX1")
|
||||
@ApiParam("内容1")
|
||||
private String fix1;
|
||||
|
||||
@Column(name="FROM2")
|
||||
@ApiParam("起始2")
|
||||
private Integer from2;
|
||||
|
||||
@Column(name="TO2")
|
||||
@ApiParam("至2")
|
||||
private Integer to2;
|
||||
|
||||
@Column(name="FIX2")
|
||||
@ApiParam("内容2")
|
||||
private String fix2;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam("类型")
|
||||
private String type;
|
||||
|
||||
@Column(name="BIND_RULE")
|
||||
@ApiParam("绑定规则")
|
||||
private Integer bandRule;
|
||||
|
||||
@Column(name="SUPPLIER_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String supplierCode;
|
||||
|
||||
public int getLengthVal() {
|
||||
return this.length == null ? 0 : this.length;
|
||||
}
|
||||
|
||||
public int getFrom1Val() {
|
||||
return this.from1 == null ? 0 : this.from1;
|
||||
}
|
||||
|
||||
public int getTo1Val() {
|
||||
return this.to1 == null ? 0 : this.to1;
|
||||
}
|
||||
|
||||
public int getFrom2Val() {
|
||||
return this.from2 == null ? 0 : this.from2;
|
||||
}
|
||||
|
||||
public int getTo2Val() {
|
||||
return this.to2 == null ? 0 : this.to2;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
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.ColumnDefault;
|
||||
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 : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PROCESS_BOM")
|
||||
@Api("工序物料清单")
|
||||
public class MesProcessBom extends BaseBean {
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name="ITEM_PART_NO")
|
||||
@ApiParam("子零件")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "子零件数量", example = "0")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "IS_REPEAT")
|
||||
@ApiParam(value = "是否可重复")
|
||||
private Integer isRepeat;
|
||||
|
||||
@Column(name = "IS_CHECK")
|
||||
@ApiParam(value = "是否检查")
|
||||
private Integer isCheck;
|
||||
|
||||
public double getQtyVal() {
|
||||
return this.qty == null ? 0.0d : this.qty;
|
||||
}
|
||||
|
||||
public int getIsRepeatVal() {
|
||||
return this.isRepeat == null ? 0 : this.isRepeat;
|
||||
}
|
||||
|
||||
public int getIsCheckVal() {
|
||||
return this.isCheck == null ? 0 : this.isCheck;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
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.MesKpsnRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesKpsnRuleRepository extends BaseRepository<MesKpsnRule, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
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.MesProcessBom;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProcessBomRepository extends BaseRepository<MesProcessBom, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue