From e701bbb0b83037cb945cdd66d7f943b68c88f004 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 07 三月 2024 12:56:37 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/Wms/Controllers/BllSoController.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index cfe804a..a63e4d6 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -697,8 +697,19 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _exNoticeSvc.ExportSuccess(taskNo, int.Parse(userId));
-
+ var type = _taskSvc.GetTaskType(taskNo);
+ if (type == "1")//鍑哄簱瀹屾垚
+ {
+ _exNoticeSvc.ExportSuccess(taskNo, int.Parse(userId));
+ }
+ else if (type == "2")//鍑哄簱鏃朵骇鐢熺殑绉诲簱浠诲姟瀹屾垚
+ {
+ _exNoticeSvc.RelocationSuccess(taskNo, int.Parse(userId));
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = "浠诲姟绫诲瀷閿欒锛岃鏍稿疄锛�" });
+ }
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
--
Gitblit v1.8.0