From 3e3590ecd8305c6bb9815dc940221296b0f08011 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 25 六月 2025 10:34:00 +0800
Subject: [PATCH] #出库完成变为等待确认
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 f4be3d9..c54f46d 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
@@ -6,20 +6,18 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;
-import com.vincent.rsf.server.common.domain.BaseParam;
-import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,6 +43,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("鐗╂枡缂栫爜涓虹┖");
}
@@ -86,13 +86,13 @@
}
param.setType(Constants.TASK_TYPE_OUT_STOCK);
- try {
- locItemService.generateTask(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 RuntimeException(e);
+// }
- return R.ok();
+ return R.ok(param);
}
--
Gitblit v1.9.1