From 6118cb61e1bf128f454492eb40491fffc37e1cf2 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 03 十二月 2025 13:11:00 +0800
Subject: [PATCH] 删除包装DelPackag去除admin账户验证

---
 Wms/WMS.BLL/SysServer/PackagServer.cs |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/PackagServer.cs b/Wms/WMS.BLL/SysServer/PackagServer.cs
index b898786..b6a347b 100644
--- a/Wms/WMS.BLL/SysServer/PackagServer.cs
+++ b/Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -210,7 +210,7 @@
             //鍒ゆ柇浜旂骇鍖呰鏄惁涓虹┖
             if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
             {
-                packagItems.L5Num = int.Parse(model.L5Num);
+                packagItems.L5Num = decimal.Parse(model.L5Num);
                 packagItems.L5Name = model.L5Name;
                 packagItems.Level += 1;
                 //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
@@ -227,7 +227,7 @@
             //鍒ゆ柇鍥涚骇鍖呰鏄惁涓虹┖
             if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
             {
-                packagItems.L4Num = int.Parse(model.L4Num);
+                packagItems.L4Num = decimal.Parse(model.L4Num);
                 packagItems.L4Name = model.L4Name;
                 packagItems.Level += 1;
                 //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
@@ -244,7 +244,7 @@
             //鍒ゆ柇涓夌骇鍖呰鏄惁涓虹┖
             if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
             {
-                packagItems.L3Num = int.Parse(model.L3Num);
+                packagItems.L3Num = decimal.Parse(model.L3Num);
                 packagItems.L3Name = model.L3Name;
                 packagItems.Level += 1;
                 //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
@@ -261,7 +261,7 @@
             //鍒ゆ柇浜岀骇鍖呰鏄惁涓虹┖
             if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
             {
-                packagItems.L2Num = int.Parse(model.L2Num);
+                packagItems.L2Num = decimal.Parse(model.L2Num);
                 packagItems.L2Name = model.L2Name;
                 packagItems.Level += 1;
                 //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
@@ -278,7 +278,7 @@
             //鍒ゆ柇涓�绾у寘瑁呮槸鍚︿负绌�
             if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
             {
-                packagItems.L1Num = int.Parse(model.L1Num);
+                packagItems.L1Num = decimal.Parse(model.L1Num);
                 packagItems.L1Name = model.L1Name;
                 packagItems.Level += 1;
             }
@@ -293,6 +293,7 @@
             return await PackagRst.EditAsync(packagItems);
         }
 
+
         /// <summary>
         /// 鍒犻櫎鍖呰淇℃伅
         /// </summary>
@@ -305,10 +306,14 @@
             {
                 throw Oops.Bah("鍖呰淇℃伅涓嶅瓨鍦紒");
             }
-            var modMaterial = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.PackagNo == packagItems.PackagNo);
-            if (modMaterial != null)
+            //admin鍙互璺宠繃姝ら獙璇�
+            if (userId != 1)
             {
-                throw Oops.Bah("瀛樺湪姝e湪浣跨敤姝ゅ寘瑁呯殑鐗╂枡锛�");
+                var modMaterial = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.PackagNo == packagItems.PackagNo);
+                if (modMaterial != null)
+                {
+                    throw Oops.Bah("瀛樺湪姝e湪浣跨敤姝ゅ寘瑁呯殑鐗╂枡锛�");
+                }
             }
 
             packagItems.IsDel = "1";

--
Gitblit v1.8.0