From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/common/model/TaskDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 286ab79..2d3ab9c 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.utils.MatCompareUtils;
import lombok.Data;
import java.util.*;
@@ -106,6 +107,9 @@
continue;
}
}
+ if (!MatCompareUtils.compare(dto,locDetl)){
+ continue;
+ }
if (dto.getAnfme() > locDetl.getAnfme()) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
--
Gitblit v1.9.1