Merge remote-tracking branch 'origin/dev' into dev

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;
+
+}

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;
     }

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;
+}

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<MesPLCConfigureRepository, Long> {
+}

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<MesTorqueDetail, Long> {
+}