From 0ff66508469ce993b771fe63085f7039a430999c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:33:42 +0800
Subject: [PATCH] 1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示

---
 src/main/java/com/zy/common/model/OutLocDto.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 810abac..77e050b 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -40,17 +40,17 @@
         for (LocDetl locDetl : locDetls) {
             Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
             while (iterator.hasNext()) {
-                LocDetl next = iterator.next().getLocDetl();
-                if (!next.getMatnr().equals(locDetl.getMatnr())) {
+                LocDetlDto next = iterator.next();
+                if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
                     continue;
                 }
-                if (!Cools.eq(next.getBatch(), locDetl.getBatch())) {
+                if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                     continue;
                 }
-                if (next.getAnfme() > locDetl.getAnfme()) {
+                if (next.getCount() > locDetl.getAnfme()) {
                     throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
                 }
-                if (next.getAnfme().equals(locDetl.getAnfme())) {
+                if (next.getCount().equals(locDetl.getAnfme())) {
                     sameNumber++;
                     iterator.remove();
                     break;

--
Gitblit v1.9.1