#

野心家

2023-03-15 a19c350a3f55762dc93246b024c3cf2ff852bded

#

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

@@ -109,7 +109,7 @@

    Integer selectExistInEmpty();

    @Select("select * from where crn_no=#{crnNo} and io_type>=100 order by appe_time")
    @Select("select * from where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
    public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo);



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

@@ -729,7 +729,7 @@
                wrkMasts.add(wrkMast);
                count++;
                if(count==0) continue;
                if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime())
                if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime() && wrkMast.getIoPri()<wrkMasts.get(i).getIoPri())
                    i=count;
                crnStn1=crnStn;
            }