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

zwl

昨天 6cfcd3471b380c483ab06c709c028eb94ba2a2b2

 src/main/java/com/zy/common/web/WcsController.java

@@ -79,7 +79,7 @@
            return R.ok(dto1);
        }
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
        if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 1) {
        if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
            return R.error("限行");
        }
        waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));