1

zhang

2 天以前 42ba7926de5f21a2856e4c7b9c5ce148413b6cbe

 src/main/java/com/zy/common/model/OutLocDto.java

@@ -47,10 +47,18 @@
                if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                    continue;
                }
                if (next.getCount() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                if (!Cools.isEmpty(locDetl.getAnfme())) {
                    if (next.getCount() > locDetl.getAnfme()) {
                        throw new CoolException("服务器内部错误");
                    }
                }
                if (next.getCount().equals(locDetl.getAnfme())) {
                if (!locDetl.getMatnr().equalsIgnoreCase("空箱")){
                    if (next.getCount().equals(locDetl.getAnfme())) {
                        sameNumber++;
                        iterator.remove();
                        break;
                    }
                }else {
                    sameNumber++;
                    iterator.remove();
                    break;