From 668590b860e572990b357747f39810e955823caf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 20:16:53 +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/WcsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index 129de11..48df947 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -38,7 +38,7 @@
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- InTaskMsgDto msgDto = wcsService.createInTask(param,getLoginUserId());
+ InTaskMsgDto msgDto = wcsService.createInTask(param);
return R.ok(msgDto);
@@ -56,7 +56,7 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- if (param.getIoType().equals(TaskType.TASK_TYPE_AGV_IN.type)) {
+ if (!param.getIoType().equals(TaskType.TASK_TYPE_IN.type)) {
return R.error("鍏ュ簱绫诲瀷鏈夎");
}
wcsService.agvTaskPickUpComplete(param);
--
Gitblit v1.9.1