From 9be4b8a7d08cac22ce5d52a35841bd14c4e1e9c5 Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 16 May 2019 06:53:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=A8=8B=E5=BA=8F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 10 +++ .../pojo/mes/pcn/bean/MesProdBindRecord.java | 83 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/model/StepModel.java | 66 +++++++++++++++++ .../repository/MesProdBindRecordRepository.java | 16 +++++ .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 84 ++++++++++++++++++++++ .../repository/MesProdBindRecordRepository.java | 16 +++++ 6 files changed, 275 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdBindRecordRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 2b521a7..2b5b8f1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工序物料清单 @@ -54,6 +55,15 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否检查") private Integer isCheck; + @Transient + @ApiParam("是否已绑定") + private boolean isBind; + + @Transient + @ApiParam("显示颜色") + private String color; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java new file mode 100644 index 0000000..9a32f70 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -0,0 +1,83 @@ +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_PROD_BIND_RECORD") +@Api("产品绑定记录表") +public class MesProdBindRecord extends BaseBean { + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("产品条码零件号") + private String partNo; + + @Column(name="WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元") + private String workCellCode; + + @Column(name = "STEP_CODE") + @ApiParam(value = "工步代码") + private String stepCode; + + @Column(name="ITEM_PART_NO") + @ApiParam("原材料零件号") + private String itemPartNo; + + @Column(name="KP_SN") + @ApiParam("原材料条码") + private String kpSn; + + @Column(name = "KP_QTY") + @ColumnDefault("0") + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @Column(name="SUPPLIER_CODE") + @ApiParam("供应商") + private String supplierCode; + + @Column(name="VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "RESULT") + @ApiParam(value = "结果") + private String result; + + public double getQtyVal() { + return this.kpQty == null ? 0.0d : this.kpQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java new file mode 100644 index 0000000..860b636 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class StepModel implements Serializable { + @ApiParam("工步代码") + private String stepCode; + + @ApiParam("工步名称") + private String stepName; + + @ApiParam("工步描述") + private String stepText; + + @ApiParam("工步类型") + private String stepType; + + @ApiParam("工步对象") + private String stepObject; + + /** + * 工位扫描业务所需使用字段 + */ + @ApiParam("流程代码") + private String routeCode; + + /** + * 工位扫描业务所需使用字段 + */ + @ApiParam("工序代码") + private String processCode; + + /** + * 工位扫描业务所需使用字段 + */ + @ApiParam("工步顺序") + private Integer stepSeq; + + /** + * 工位扫描业务所需使用字段 + */ + @ApiParam("工步执行完毕") + private boolean isComplete; + + /** + * 工位扫描业务所需使用字段 + */ + @ApiParam("工步是否跳过") + private boolean isJump; + + public StepModel(String stepCode,String stepName,String stepText,String stepType,String stepObject, + String routeCode,String processCode,Integer stepSeq){ + this.stepCode = stepCode; + this.stepName = stepName; + this.stepText = stepText; + this.stepType = stepType; + this.stepObject = stepObject; + this.routeCode = routeCode; + this.processCode = processCode; + this.stepSeq = stepSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java new file mode 100644 index 0000000..2b9ba19 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java @@ -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.MesProdBindRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdBindRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java new file mode 100644 index 0000000..23731fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -0,0 +1,84 @@ +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 org.springframework.format.annotation.DateTimeFormat; + +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_PROD_BIND_RECORD") +@Api("产品绑定记录表") +public class MesProdBindRecord extends BaseBean { + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("产品条码零件号") + private String partNo; + + @Column(name="WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元") + private String workCellCode; + + @Column(name = "STEP_CODE") + @ApiParam(value = "工步代码") + private String stepCode; + + @Column(name="ITEM_PART_NO") + @ApiParam("原材料零件号") + private String itemPartNo; + + @Column(name="KP_SN") + @ApiParam("原材料条码") + private String kpSn; + + @Column(name = "KP_QTY") + @ColumnDefault("0") + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @Column(name="SUPPLIER_CODE") + @ApiParam("供应商") + private String supplierCode; + + @Column(name="VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "RESULT") + @ApiParam(value = "结果") + private String result; + + public double getQtyVal() { + return this.kpQty == null ? 0.0d : this.kpQty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdBindRecordRepository.java new file mode 100644 index 0000000..1fe50d8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdBindRecordRepository.java @@ -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.MesProdBindRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdBindRecordRepository extends BaseRepository { +}