#

lty

8 小时以前 a0131e8ae6dedaac1f48e6dd40aee5955e205a9c

#

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

@@ -169,6 +169,7 @@
                    .eq("ove_mk", "N"));
            int allow = 3 - (existCount == null ? 0 : existCount);
            if (allow <= 0) {
                log.info("自动移库已达上限{}", existCount);
                continue;
            }
            Integer candidateEmpty = locMastService.selectCount(new EntityWrapper<LocMast>()
@@ -294,6 +295,7 @@
                        .eq("crn_no", crnNo)
                        .eq("io_type", 110)
                );
                if(crnNo !=1){continue;}
                if(!wrkMastList.isEmpty()){continue;}
                Integer emptyLocCount = locMastService.selectCount(new EntityWrapper<LocMast>()
                        .eq("crn_no", crnNo)

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

@@ -451,13 +451,29 @@
                    movLoc(wrkMast);
                    break;
                case 2:
                    WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
                    if(Objects.isNull(wrkMast1.getIsSuplus())){
                    WrkMast wrkMast1 = wrkMastService.selectOne(
                            new EntityWrapper<WrkMast>()
                                    .eq("barcode", wrkMast.getBarcode())
                                    .eq("io_type", 101)
                    );

                    if (Cools.isEmpty(wrkMast1)) {
                        break;
                    }
                    if(!Cools.isEmpty(wrkMast1)) {

                    if ("Y".equals(wrkMast1.getLogMk().trim())) {
                        wrkMast1.setOveMk("Y");
                        if(!wrkMastService.updateById(wrkMast1)) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());
                        }
                        break;
                    }
                    if (Objects.isNull(wrkMast1.getIsSuplus())) {
                        break;
                    }

                    wrkMast1.setOveMk("Y");
                    if(!wrkMastService.updateById(wrkMast1)) {
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());