#

lsh

2024-01-21 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -46,12 +46,39 @@
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    if (result.getCode()==200){
                if(Cools.isEmpty(wrkMast)){
                    continue;
                }
                if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
                    if (!wrkMast.getStaNo().equals(122)){
                        continue;
                    }else {
                        System.out.println(staNo+"失败！");
                    }
                }
                if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                    continue;
                }
                boolean wrkTypeSign = fullKM(wrkMast);
                if (!Cools.isEmpty(wrkMast)){
                    if (wrkTypeSign) {
//                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,11);//1:取（叠盘）
//                        if (result.getCode()==200){
//                            continue;
//                        }else {
//                            System.out.println(staNo+"失败！");
//                        }
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                        }
                    } else {
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                        }
                    }
                }
            }
@@ -61,16 +88,37 @@
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
                    continue;
                }
//                boolean wrkTypeSign = fullKM(wrkMast);

                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    if (result.getCode()==200){
                        continue;
                    }else {
                        System.out.println(staNo+"失败！");
                    }
//                    if (wrkTypeSign){
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
                        if (result.getCode()==200) {
                            continue;
                        } else {
                            System.out.println(staNo+"失败！");
                        }
//                    }else {
//                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);
//                        if (result.getCode()==200) {
//                            continue;
//                        } else {
//                            System.out.println(staNo+"失败！");
//                        }
//                    }
                }
            }
        }
    }

    public boolean fullKM(WrkMast wrkMast){
        if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
            return true;
        }
        return false;
    }

}