From 42ce1f4b6f9df984d14e29f9d9ff188de7f3c6d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 07 五月 2026 09:45:33 +0800
Subject: [PATCH] #地图更新
---
src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
index 5eb4023..9c54f23 100644
--- a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
+++ b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
@@ -17,10 +17,7 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatch.StationCommandDispatchResult;
import com.zy.core.dispatch.StationCommandDispatcher;
-import com.zy.core.enums.RedisKeyType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.StationCommandType;
-import com.zy.core.enums.WrkIoType;
+import com.zy.core.enums.*;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
@@ -159,10 +156,20 @@
}
String barcode = context.getStationProtocol().getBarcode();
- long count = wrkMastService.count(new QueryWrapper<WrkMast>().eq("barcode", barcode));
- if (count > 0) {
+ List<WrkMast> wrkMastList = wrkMastService.list(new QueryWrapper<WrkMast>()
+ .eq("barcode", barcode)
+ );
+ if (wrkMastList.size() > 0) {
+ boolean showTips = true;
+ for (WrkMast wrkMast : wrkMastList) {
+ if (wrkMast.getWrkSts().equals(WrkStsType.NEW_INBOUND.sts)) {
+ showTips = false;
+ break;
+ }
+ }
+
Object tipsLimit = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_SUCCESS_REPEAT_WARNING_TIPS_LIMIT.key + barcode);
- if (tipsLimit == null) {
+ if (tipsLimit == null && showTips) {
policy.setSystemWarning(context, "绯荤粺浠诲姟宸插瓨鍦�");
}
return;
--
Gitblit v1.9.1