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

whycq

2024-04-10 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65

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

@@ -47,6 +47,15 @@
                if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getSuppCode(),locDetl.getSuppCode())){
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getThreeCode(),locDetl.getThreeCode())){
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getDeadTime(),locDetl.getDeadTime())){
                    continue;
                }
                if (next.getCount() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                }