自动化立体仓库 - WMS系统
zyx
2024-04-16 45d602719964509214d06ec5173f23e5307d5dfe
src/main/java/com/zy/common/model/TaskDto.java
@@ -110,22 +110,34 @@
                if (!dto.getMatnr().equals(locDetl.getMatnr())) {
                    continue;
                }
                if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
                if(!Cools.eq(dto.getBatch(),locDetl.getBatch())){
                    continue;
                }
                if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
                if(!Cools.eq(dto.getCsocode(),locDetl.getThreeCode())){
                    continue;
                }
                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
                    if (!dto.getBatch().equals(locDetl.getBatch())) {
                        continue;
                    }
                if(!Cools.eq(dto.getIsoseq(),locDetl.getDeadTime())){
                    continue;
                }
                if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
                    if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
                        continue;
                    }
                if(!Cools.eq(dto.getContainerCode(),locDetl.getSuppCode())){
                    continue;
                }
//                if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
//                    continue;
//                }
//                if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
//                    continue;
//                }
//                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
//                    if (!dto.getBatch().equals(locDetl.getBatch())) {
//                        continue;
//                    }
//                }
//                if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
//                    if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
//                        continue;
//                    }
//                }
                if (dto.getAnfme() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                }