From b72d5964a8031b5f0df3c04d3677d7b0cdb26ba3 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 12 三月 2024 11:47:41 +0800
Subject: [PATCH] 修改AGV转运完成功能

---
 Wms/Wms/Controllers/PdaSoController.cs |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index de7edbc..b320755 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -203,7 +203,7 @@
                     return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
                 }
 
-                _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, int.Parse(userId));
+                _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3,model.PickQty ,int.Parse(userId));
 
                 return Ok(new { code = 0, msg = "鎷h揣瀹屾垚", data = "" });
             }
@@ -340,5 +340,38 @@
            
         }
 
+
+        /// <summary>
+        /// 鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨�
+        /// </summary>
+        /// <param name="palletNo">鎵樼洏鍙�</param>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetSampleType(string palletNo)
+        {
+            try
+            {
+                var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                }
+                string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(UserId))
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                } 
+
+                var type = _pdaSoSvc.GetSampleType(palletNo);
+
+                return Ok(new { data = type, code = 0, msg = "鑾峰彇鍙栨牱绫诲瀷" });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { data = "", code = 1, msg = "鑾峰彇鍙栨牱绫诲瀷閿欒锛�" + e.Message });
+            }
+
+        }
+
     }
 }

--
Gitblit v1.8.0