#

Administrator

14 小时以前 16bd33b89e43278a1080a5f322356675522c84ee

#

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

@@ -1301,6 +1301,10 @@

        //取消出库工作档时，查询单据管理表，回滚作业中数量
        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
//            if(!wrkMast.getLocNo().isEmpty()){
//                throw new CoolException("叫料/移库无法取消");
//            }

            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            for (WrkDetl wrkDetl : wrkDetls) {
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {

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

@@ -159,10 +159,18 @@
            if (candidate == sourceCrnNo) {
                continue;
            }
            Integer runingCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                    .eq("io_type", 101).eq("crn_no",candidate)
                    .in("wrk_sts", Arrays.asList(2L, 3L, 4L, 11L, 12L)));
            if(runingCount != null && runingCount > 5) {continue;}
//            Integer runingCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
//                    .eq("io_type", 101).eq("crn_no",candidate)
//                    .in("wrk_sts", Arrays.asList(2L, 3L, 4L, 11L, 12L)));
//            if(runingCount != null && runingCount > 3) {continue;}
            Integer existCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                    .eq("io_type", 101)
                    .eq("log_mk", "Y")
                    .eq("ove_mk", "N"));
            int allow = 3 - (existCount == null ? 0 : existCount);
            if (allow <= 0) {
                continue;
            }
            Integer candidateEmpty = locMastService.selectCount(new EntityWrapper<LocMast>()
                    .eq("crn_no", candidate)
                    .eq("loc_sts", "O")
@@ -219,7 +227,7 @@
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L);
        wrkMast.setIoType(101);
        wrkMast.setIoPri(13D);
        wrkMast.setIoPri(12D);
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setSourceLocNo(sourceLoc.getLocNo());
        wrkMast.setLocNo(targetLoc.getLocNo());
@@ -229,6 +237,7 @@
        wrkMast.setFullPlt("Y");
        wrkMast.setExitMk("N");
        wrkMast.setLogMk("Y");
        wrkMast.setEmptyMk("N");
        wrkMast.setPacked(null);
        wrkMast.setOveMk("N");
        wrkMast.setAppeUser(userId);