From 5d31cb5f1fb32a478d5b751ebfe97d47db890778 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 01 四月 2026 14:17:42 +0800
Subject: [PATCH] #前端
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
index 771c1bc..798de0d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
@@ -43,6 +44,8 @@
QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
if (null != map.get("matnr") && !Cools.isEmpty(map.get("matnr"))){
locItemQueryWrapper.eq("matnr_code", map.get("matnr"));
+ }else if(null != map.get("maktx") && !Cools.isEmpty(map.get("maktx"))){
+ locItemQueryWrapper.eq("maktx", map.get("maktx"));
}else {
return R.error("鐗╂枡缂栫爜涓虹┖");
}
@@ -72,7 +75,8 @@
longs = JSONArray.parseArray(map.get("type").toString(), String.class);
map.entrySet().removeIf(next -> next.getKey().equals("type"));
}
- List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
+// List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
+ List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>());
return R.ok().add(list);
}
@@ -87,12 +91,13 @@
try {
locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new CoolException(e);
}
- return R.ok("浠诲姟鐢熸垚鎴愬姛");
+ return R.ok();
}
}
+
--
Gitblit v1.9.1