#

野心家

2023-03-15 a19c350a3f55762dc93246b024c3cf2ff852bded

 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;
            }
@@ -966,12 +966,7 @@
    public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
        String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
        //按照工作档出库
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", slave.getId())
                .and()
                .gt("io_type", 100)
                .orderBy("appe_time")
        );
        List<WrkMast> wrkMasts = wrkMastService.selectWrkIoType(slave.getId());
        if (!Cools.isEmpty(wrkMasts)) {
            for (WrkMast wrkMast : wrkMasts) {
                CrnSlave.CrnStn crnStn = null;