From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 6a6da7e..1f602b1 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("鐗╂枡缂栫爜涓虹┖");
}
@@ -84,13 +87,13 @@
}
param.setType(Constants.TASK_TYPE_OUT_STOCK);
-// try {
-// locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
+ } catch (Exception e) {
+ throw new CoolException(e);
+ }
- return R.ok(param);
+ return R.ok();
}
--
Gitblit v1.9.1