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

zjj

2024-10-30 89689c46d9be3b23cb6049636f127a55c05555cc

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

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

@@ -57,13 +57,13 @@

        if (pakin) {
            //控制入库暂存数，防止主干道堵塞，2022-10-23 ADD  未实装
//            int maxCount = 2;
//            int storeCount = wrkMastService.getStoreCount(crnNo);
//
//            if(storeCount >= maxCount){
//                log.error("{}号堆垛机暂存数已满!", crnNo);
//                return false;
//            }
            int maxCount = 6;
            int storeCount = wrkMastService.getStoreCount(crnNo);

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

            if ("N".equals(crnp.getInEnable())) {
                log.error("{}号堆垛机不可入", crnNo);

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

@@ -105,6 +105,7 @@
            WrkMastLog wrkMastLog = new WrkMastLog();
            wrkMastLog.sync(wrkMast1);
            wrkMastLog.setModiTime(now);
            wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
            if (!wrkMastLogService.insert(wrkMastLog)){
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }