Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-12-26 a484168b903a919b24d65a5d95dea88a04d8f34c

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

@@ -41,7 +41,7 @@
    public boolean checkSiteError(Integer crnNo, boolean pakin) {
        BasCrnp crnp = this.selectById(crnNo);
        if (Cools.isEmpty(crnp)) {
            log.error("{}号堆垛机不存在", crnNo);
//            log.error("{}号堆垛机不存在", crnNo);
            return false;
        }
        if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
@@ -56,55 +56,11 @@
        }

        if (pakin) {
            //TODO控制入库暂存数，防止主干道堵塞，2022-5-24 ADD
            int staNo = 0;
            switch (crnNo){
                case 1:
                    staNo = 123;
                    break;
                case 2:
                    staNo = 121;
                    break;
                case 3:
                    staNo = 119;
                    break;
                case 4:
                    staNo = 117;
                    break;
                case 5:
                    staNo = 115;
                    break;
                case 6:
                    staNo = 113;
                    break;
                case 7:
                    staNo = 111;
                    break;
                case 8:
                    staNo = 109;
                    break;
                case 9:
                    staNo = 106;
                    break;
                case 10:
                    staNo = 105;
                    break;
                case 11:
                    staNo = 103;
                    break;
                case 12:
                    staNo = 101;
                    break;
            }
            int maxCount = 2;
            BasDevp devp = basDevpService.selectById(staNo);
            if(!Cools.isEmpty(devp)){
                maxCount = devp.getInQty();
            }

            //控制入库暂存数，防止主干道堵塞，2022-10-23 ADD  未实装
            int maxCount = 6;
            int storeCount = wrkMastService.getStoreCount(crnNo);

            if(storeCount >= maxCount){
            if(storeCount >= maxCount && crnNo == 1){
                log.error("{}号堆垛机暂存数已满!", crnNo);
                return false;
            }