From f679ac0947417416900ab28308dd3bf235336078 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 三月 2026 13:00:57 +0800
Subject: [PATCH] 描述修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index e0ac9b8..7141848 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -962,7 +962,7 @@
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.getBarcode())
@@ -1171,15 +1171,15 @@
.eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
// if (!Cools.isEmpty(waitPakin)) {
-// throw new CoolException("鎵樼洏涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
+// throw new CoolException("鏂欑涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
// }
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.get("barcode").toString()));
if (!tasks.isEmpty()) {
- throw new CoolException("鎵樼洏鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
+ throw new CoolException("鏂欑鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
}
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
if (!Cools.isEmpty(locs)) {
- throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
+ throw new CoolException("鏂欑涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
}
// List<WaitPakinItem> items = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
// items.forEach(item -> {
@@ -1269,10 +1269,14 @@
*/
@Override
public R getDeviceSites() {
- List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
+ // 鍏堟煡鍏ㄩ儴鍐嶆寜 site 鍘婚噸锛岄伩鍏� GROUP BY 涓� only_full_group_by 鍐茬獊
+ List<DeviceSite> all = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
.select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
- .eq(DeviceSite::getStatus, 1)
- .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
+ .eq(DeviceSite::getStatus, 1));
+ List<DeviceSite> sites = all.stream()
+ .collect(Collectors.toMap(DeviceSite::getSite, d -> d, (a, b) -> a))
+ .values().stream()
+ .collect(Collectors.toList());
return R.ok(sites);
}
--
Gitblit v1.9.1