From e22ecf30efa7cc4637fb6a9fbd1b9136614cde44 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 17 May 2019 16:05:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 8889ab4..dc7c2ea 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -104,6 +105,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Transient + @ApiParam("返回信息") + private String resultMsg; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 018d4a0404bbdb1a8bdd2534f72e30a4b260d576 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 17 May 2019 16:54:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?PLC=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 59 ++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 82 ++++++++++++++++++++++ .../pcn/repository/MesPLCConfigureRepository.java | 16 +++++ .../pcn/repository/MesTorqueDetailRepository.java | 17 +++++ 4 files changed, 174 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java new file mode 100644 index 0000000..2ad8ec6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -0,0 +1,59 @@ +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 :PLC设备信息配置表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLC_CONFIGURE") +@Api("PLC设备信息配置表") +public class MesPLCConfigure extends BaseBean { + @Column(name="IP") + @ApiParam("设备ip") + private String ipAddress; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String channelName; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String deviceName; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String tagName; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java new file mode 100644 index 0000000..f99cd7f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -0,0 +1,82 @@ +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-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_TORQUE_DETAIL") +@Api("扭矩信息记录表") +public class MesTorqueDetail extends BaseBean { + @Column(name="SN") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name="UPPER_LIMIT") + @ApiParam("最大值") + private Double upperLimit; + + @Column(name="LOWER_LIMIT") + @ApiParam("最小值") + private Double lowerLimit; + + @Column(name="TORQUE_DETAIL_VALUE") + @ApiParam("扭矩值") + private Double torqueValue; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="ok") + @ApiParam("扭矩是否合格") + private String ok; + + @Column(name="PART_NO") + @ApiParam("扭矩是否合格") + private String partNO; + + @Column(name="p_set") + @ApiParam("螺丝枪PSET设置值") + private String deviceSetValue; + + @Column(name="MAXANGLE") + @ApiParam("最大扭矩") + private String maxAngle; + + @Column(name="MINANGLE") + @ApiParam("最小扭矩") + private String minAngel; + + @Column(name="FINALANGLE") + @ApiParam("最终扭矩") + private Integer finalAngle; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java new file mode 100644 index 0000000..cce563e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.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.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPLCConfigureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java new file mode 100644 index 0000000..d2be5f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesTorqueDetailRepository extends BaseRepository { +}