#

Junjie

9 天以前 b67bafd95dc17136ac0eab068ba51cd55e1669f3

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

@@ -27,6 +27,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 移动端服务核心类
@@ -555,9 +556,15 @@
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
//        if (param.getCombMats().size() > 1) {
        List<String> codes = param.getCombMats().stream().map(CombParam.CombMat::getTiaoma).collect(Collectors.toList());
        Set<String> sets = new HashSet<>();
        if (codes.stream().anyMatch(item -> !sets.add(item))) {
            throw new CoolException("条码重复扫码了");
        }
        //        if (param.getCombMats().size() > 1) {
//            throw new CoolException("请提取一个商品，或者刷新重新组托！");
//        }

        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -622,6 +629,9 @@
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                if ("Y".equals(param.getTkFlag())) {
                    waitPakin.setTkFlag(detlDto.getTkFlag());
                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }