#

TQS

2024-08-16 5430dc3eb2a8490c799298fe6578d55f1992df2b

#

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

@@ -126,6 +126,7 @@

    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWorkingPakoutTwoF(@Param("staNo")Integer staNo);


    WrkMast selectShallowLoc(@Param("row")Integer row,@Param("bay")Integer bay,@Param("lev")Integer lev);

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

@@ -1065,7 +1065,7 @@
                        //  判断堆垛机状态等待确认
                        if (crnProtocol.modeType == CrnModeType.AUTO
                                && crnProtocol.statusType == CrnStatusType.IDLE
                                && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                                && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()!=(short)4) {
                            News.info("堆垛机接驳任务执行，工作号："+staProtocol.getWorkNo()+"；执行堆垛机号："+slave.getId()+"；接驳取货位："+crnStn.getStaNo()+"；接驳放货位："+staProtocol.getSiteId());
                            // 堆垛机接驳任务命令下发区 --------------------------------------------------------------------------
                            CrnCommand crnCommand = new CrnCommand();
@@ -1097,7 +1097,7 @@
                        //  判断堆垛机状态等待确认
                        if (crnProtocol.modeType == CrnModeType.AUTO
                                && crnProtocol.statusType == CrnStatusType.IDLE
                                && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                                && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()==(short)4) {
                            News.info("堆垛机接驳任务执行，工作号："+staProtocol.getWorkNo()+"；执行堆垛机号："+slave.getId()+"；接驳取货位："+crnStn.getStaNo()+"；接驳放货位："+staProtocol.getSiteId());
                            // 堆垛机接驳任务命令下发区 --------------------------------------------------------------------------
                            CrnCommand crnCommand = new CrnCommand();
@@ -4873,8 +4873,8 @@
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());

                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    Integer sourceStaNo = inSta.getStaNo()==103 ? 104 : inSta.getStaNo()==113 ? 104 : 204;
                    WrkMast pakout = wrkMastMapper.selectWorkingPakout(sourceStaNo);
                    Integer staNoEnd = inSta.getStaNo()==113 ? 114 : 214;
                    WrkMast pakout = wrkMastMapper.selectWorkingPakoutTwoF(staNoEnd);
                    boolean sign = true;
                    int[] staNos = new int[3];

@@ -4883,7 +4883,7 @@
                            staNos = new int[]{112,113,114};
                            for (int staNo : staNos){
                                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
                                    sign = false;
                                }
                            }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -273,6 +273,15 @@
        order by io_time,wrk_no
    </select>

    <select id="selectWorkingPakoutTwoF" resultMap="BaseResultMap">
        select top 1 *
        from dbo.asr_wrk_mast
        where wrk_sts > 10
        and io_type > 100 and io_type != 11
        and sta_no = #{staNo}
        order by io_time,wrk_no
    </select>

    <select id="selectShallowLoc" resultMap="BaseResultMap">
        select top 1 *
        from dbo.asr_loc_mast