999

zhangc

2025-04-18 a3606d53403475ee05664058b343310c57249d2e

999

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

@@ -66,4 +66,7 @@

    WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);

    WrkMast selectWorkingPakout(Integer staNo);

    WrkMast selectWorkingPakin(Integer staNo);
}

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

@@ -42,4 +42,7 @@

    WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer wrkNo2);

    WrkMast selectWorkingPakout(Integer staNo);

    WrkMast selectWorkingPakin(Integer staNo);
}

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

@@ -2112,15 +2112,15 @@
        try {
            // 根据输送线plc遍历
            FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
            WrkMast pakout = wrkMastMapper.selectWorkingPakout(1032);
            WrkMast pakout = wrkMastService.selectWorkingPakout(1032);
            if (pakout != null) {
                if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
                    // 出库切换中
                    devpThread.ioModeOf2_5 = IoModeType.PAKOUT_BOOTING;
                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(1032);
                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
                    WrkMast pakin = wrkMastService.selectWorkingPakin(1032);
                    if (pakin == null && !devpThread.getStation().get(1032).isLoading()
                            && !devpThread.getStation().get(1032).isLoading()
                            && devpThread.getStation().get(1032).getWorkNo() == 0) {
                        // 出库模式
                        devpThread.ioModeOf2_5 = IoModeType.PAKOUT_MODE;
                    }

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

@@ -145,4 +145,14 @@
    public WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer manWrkNo) {
        return this.baseMapper.selectLiftWrkMastAndWrkNo(liftNo, wrkNo, manWrkNo);
    }

    @Override
    public WrkMast selectWorkingPakout(Integer staNo) {
        return this.baseMapper.selectWorkingPakout(staNo);
    }

    @Override
    public WrkMast selectWorkingPakin(Integer staNo) {
        return this.baseMapper.selectWorkingPakin(staNo);
    }
}

 src/main/resources/mapper/WrkMastMapper.xml

@@ -235,6 +235,20 @@
        where wrk_sts in (201, 202, 203, 204, 205, 210)
          and mk = #{chargeSta}
        order by io_pri desc, io_time, wrk_no asc
    </select>

    <select id="selectWorkingPakout" resultMap="BaseResultMap">
        select *
        from asr_wrk_mast
        where io_type = 101
          and sta_no = #{staNo} limit 0,1
    </select>

    <select id="selectWorkingPakin" resultMap="BaseResultMap">
        select *
        from asr_wrk_mast
        where io_type = 1
          and source_sta_no = #{staNo} limit 0,1
    </select>

</mapper>