#

lsh

2024-06-07 78a63c83855b86ad930878d109ff5ac60c055b63

#

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

@@ -88,12 +88,13 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute1(){//自动调空板出库 煜星二楼小料箱  172
        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
            Integer devNo = 173;
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", 172).eq("loading", "Y"));
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", devNo).eq("loading", "Y"));
                int count = 10;
                if (loadIngCount<=count){
                    bareBoardHandler.startYx(172,count);
                    bareBoardHandler.startYx(devNo,count);
                }
            }
        }
@@ -102,12 +103,13 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){//自动调空板出库 煜星一楼
        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
            Integer devNo = 448;
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448"));
            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", 448).eq("loading", "Y"));
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", devNo).eq("loading", "Y"));
                int count = 25;
                if (loadIngCount<=count){
                    bareBoardHandler.startYx(448,count);
                    bareBoardHandler.startYx(devNo,count);
                }
            }
        }

 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java

@@ -169,16 +169,15 @@
            crns.add(7);
            boolean sign = true;
            for (Integer crnNo : crns){
                List<String> locNoList = new ArrayList<>();

                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (basCrnp.getCrnSts()!=3 || !basCrnp.getOutEnable().equals("Y")){
                    continue;
                }
                sign = true;
                // 获取库位
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
                for (LocMast locMastS : locMasts){
                    List<String> locNoList = new ArrayList<>();
                    sign = true;

                    if (Cools.isEmpty(locMastS)) {
//                    throw new CoolException("库中无空板！！！");
@@ -194,10 +193,9 @@
                    locNoList.add(locMastS.getLocNo());

                    //小料箱伴生出库
                    if (Utils.getRow(locMastS.getLocNo())<=8){
                    if (sign && Utils.getRow(locMastS.getLocNo())<=8){
                        String locNoOther = staNoOther(locMastS.getLocNo());
                        LocMast locMastOther = locMastService.selectById(locNoOther);

                        if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") ||  locMastOther.getLocSts().equals("R")){
                            if (locMastOther.getLocSts().equals("D")){
                                locNoList.add(locNoOther);
@@ -205,7 +203,7 @@
                        }else {
                            sign=false;
                        }
                    }else if (Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
                    }else if (sign && Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
                        String locNoOther = staNoOther(locMastS.getLocNo());
                        LocMast locMastOther = locMastService.selectById(locNoOther);
                        if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") ||  locMastOther.getLocSts().equals("R")){