#

whycq

2023-03-16 a566bdd94c21b60f57a0669fc923ffb9e16f0f4d

#

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

@@ -532,7 +532,37 @@
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站

                        Integer sourceStaNo = 0;
                        switch (wrkMast.getStaNo()){
                            case 100:
                                sourceStaNo = 101;
                                break;
                            case 103:
                                sourceStaNo = 104;
                                break;
                            case 110:
                                sourceStaNo = 111;
                                break;
                            case 113:
                                sourceStaNo = 114;
                                break;
                            case 200:
                                sourceStaNo = 201;
                                break;
                            case 203:
                                sourceStaNo = 204;
                                break;
                            case 300:
                                sourceStaNo = 301;
                                break;
                            case 303:
                                sourceStaNo = 304;
                                break;
                        }

                        wrkMast.setSourceStaNo(sourceStaNo); // 源站
//                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空
@@ -888,7 +918,7 @@
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            //            获取工作状态为14的工作档
            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
            if ( wrkMast1 !=null && (wrkMast1.getIoType().equals(103) || wrkMast1.getIoType().equals(107)) ) {
            if ( wrkMast1 !=null) {
                continue;
            }
            for (WrkMast wrkMast : wrkMasts) {

 src/main/resources/mapper/WrkMastMapper.xml

@@ -161,7 +161,10 @@
    </select>

    <select id="selectPakOutStep14" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=14 and io_type>100 order by io_pri desc,io_time,wrk_no asc
        select top 1 * from dbo.asr_wrk_mast
        where crn_no=#{crnNo}
        and ((wrk_sts=14 and io_type in (103,107) and source_sta_no=#{sourceStaNo}) or (wrk_sts in (2,3) and io_type in (53,57) and sta_no=#{sourceStaNo}))
        order by io_pri desc,io_time,wrk_no asc
    </select>

    <!--                                       入出库模式相关                                      -->