*
L
2025-07-17 16999af4129f6e43bb11b00796f1c48207840128
*
3个文件已修改
20 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/BasRgv.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/RgvThread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasRgvMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -56,6 +56,20 @@
    private Integer rgvSts;
    /**
     * 作业态
     */
    @ApiModelProperty(value= "作业态")
    @TableField("rgv_sts1")
    private Integer rgvSts1;
    /**
     * 作业态
     */
    @ApiModelProperty(value= "作业态")
    @TableField("rgv_sts2")
    private Integer rgvSts2;
    /**
     * 任务号
     */
    @ApiModelProperty(value= "任务号")
src/main/java/com/zy/core/thread/RgvThread.java
@@ -263,6 +263,8 @@
            BasRgv basRgv = new BasRgv();
            basRgv.setRgvNo(slave.getId());
            basRgv.setRgvSts((int)rgvProtocol.getMode());
            basRgv.setRgvSts1((int)rgvProtocol.getStatus1());
            basRgv.setRgvSts2((int)rgvProtocol.getStatus2());
            basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
            if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
                log.error("RGV plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -354,6 +356,8 @@
                    BasRgv basRgv = new BasRgv();
                    basRgv.setRgvNo(slave.getId());
                    basRgv.setRgvSts((int)rgvProtocol.getMode());
                    basRgv.setRgvSts1((int)rgvProtocol.getStatus1());
                    basRgv.setRgvSts2((int)rgvProtocol.getStatus2());
                    basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
                    basRgv.setNowStaNo(rgvProtocol.getRgvPosI());
                    if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
src/main/resources/mapper/BasRgvMapper.xml
@@ -8,6 +8,8 @@
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />
        <result column="rgv_sts" property="rgvSts" />
        <result column="rgv_sts1" property="rgvSts1" />
        <result column="rgv_sts2" property="rgvSts2" />
        <result column="wrk_no1" property="wrkNo1" />
        <result column="wrk_no2" property="wrkNo2" />
        <result column="rgv_err" property="rgvErr" />