#

Junjie

18 小时以前 a1f531ee3acc549aabfed8efb6c821e6f6209fa4

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

@@ -582,10 +582,21 @@
        if (param.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }
        if (param.getCombMats().size() > 1) {
//        if (param.getCombMats().size() > 1) {
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
        HashMap<String, Object> containMatnrMap = new HashMap<>();
        for (CombParam.CombMat mat : param.getCombMats()) {
            if(!containMatnrMap.containsKey(mat.getMatnr())) {
                containMatnrMap.put(mat.getMatnr(), 1);
            }
        }

        if (containMatnrMap.size() > 1) {
            throw new CoolException("不允许混料===>>" + param.getBarcode());
        }


        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));