From 86985a3e211ab4cc1e94a696c15a6f77d21c462a Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期二, 15 十月 2024 18:36:51 +0800
Subject: [PATCH] 修改出库单据问题

---
 Wms/Wms/Controllers/BllSoController.cs |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index cfe804a..f64a0bd 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -72,7 +72,7 @@
         {
             try
             {
-                var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.Msg);
+                var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);
 
                 return Ok(new { code = 0, count=0, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
             }
@@ -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 = "" });
 
 
@@ -715,7 +726,7 @@
         /// <param name="taskNo">浠诲姟鍙�</param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult AgainSendSoTask(string taskNo)
+        public IActionResult AgainSendSoTask(string taskNo, string Receiver)
         {
             try
             {
@@ -730,7 +741,7 @@
                 {
                     return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
                 }
-                _exNoticeSvc.AgainSendSoTask(taskNo, int.Parse(userId),"");
+                _exNoticeSvc.AgainSendSoTask(taskNo,Receiver, int.Parse(userId),"");
 
                 return Ok(new { code = 0, msg = "鎴愬姛涓嬪彂浠诲姟", data = "" });
 

--
Gitblit v1.8.0