From 8c2d952e4ea6925a04d083c0e73817f2c3400049 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 21 八月 2025 14:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/asrs/controller/TVController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 5a4bb40..4589c83 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -334,7 +334,7 @@
break;
}
if (!Cools.isEmpty(wrkMastList1)) {
- String msg = "绔欑偣鍦ㄥ叆搴�;";
+ String msg = "绔欑偣鍦ㄥ叆搴�";
Set<Integer> set = new HashSet<>();
for (WrkMast wrkMast : wrkMastList1) {
set.add(wrkMast.getSourceStaNo());
@@ -342,10 +342,10 @@
return R.ok().add(set.toString() + msg);
}
if (!Cools.isEmpty(wrkMastList2)) {
- String msg = "绔欑偣鍦ㄥ嚭搴�;";
+ String msg = "绔欑偣鍦ㄥ嚭搴�";
Set<Integer> set = new HashSet<>();
for (WrkMast wrkMast : wrkMastList2) {
- set.add(wrkMast.getSourceStaNo());
+ set.add(wrkMast.getStaNo());
}
return R.ok().add(set.toString() + msg);
}
--
Gitblit v1.9.1