From c388b869f9fc019a2dadb41f25f240f4e4aaf31d Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 13 三月 2024 11:48:45 +0800
Subject: [PATCH] 修改添加物料编码重复的提示消息,编辑物料编码重复时需过滤本身,修改编辑物料信息成功的提示消息,物料类别区域设为必填项,包装管理一级包装添加或编辑时不可为空,类别编码、包装编码不可更改。

---
 Wms/Wms/Controllers/BllSoController.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index cfe804a..489c5f2 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 = "" });
 
 

--
Gitblit v1.8.0