#

zjj

2024-03-15 c383b54bbd4f7e025911703b82569c5cd25e29a8

#

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -110,4 +110,6 @@


    WrkMast selectPickStep2(@Param("barcode")String barcode);

    WrkMast selectByWrkNo(@Param("wrkNo")Integer wrkNo);
}

 src/main/java/com/zy/asrs/service/WrkMastService.java

@@ -15,4 +15,5 @@

    int getOutToStn182(Integer devpNo);

    WrkMast selectByWrkNo(int wrkNo);
}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2480,6 +2480,11 @@
                            log.error("小车复位失败，小车号{}！",rgvProtocol.getRgvNo());
                            break;
                        }
                        WrkMast wrkMast1 = wrkMastService.selectByWrkNo(rgvProtocol.getTaskNo1().intValue());
                        wrkMast1.setUpdMk("Y");

                        wrkMastService.updateById(wrkMast1);

                        wrkMastSta.setWrkSts(3);
                        wrkMastStaMapper.updateById(wrkMastSta);
                        BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -31,4 +31,9 @@
    public int getOutToStn182(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
    }

    @Override
    public WrkMast selectByWrkNo(int wrkNo) {
        return this.baseMapper.selectByWrkNo(wrkNo);
    }
}

 src/main/resources/mapper/WrkMastMapper.xml

@@ -188,4 +188,8 @@
    <select id="selectPickStep2" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_mast where barcode = #{barcode} and (wrk_sts=14 and io_type=107) or (wrk_sts=2 and io_type=57)
    </select>
    <select id="selectByWrkNo" resultMap="BaseResultMap">
        select * from asr_wrk_mast
        where wrk_no = #{wrkNo}
    </select>
</mapper>