From 1d30f9cac62106854305db7f1c2a2191d58beae2 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期二, 12 八月 2025 15:52:22 +0800
Subject: [PATCH] 1、优化批量删除:在批量删除条码类中新增判断aboutGuid是否为有效的uniqueidentifier来判断是否为合并到货条码删除

---
 WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs |   86 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
index 541d344..44e4de0 100644
--- a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
+++ b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
@@ -115,6 +115,7 @@
                 m = dr.RowToDynamic();
                 m.list1 = dset.Tables[1].TableToDynamicList();
                 m.list2 = dset.Tables[2].TableToDynamicList();
+                m.list3 = dset.Tables[3].TableToDynamicList();
             }
         }
         catch (Exception ex)
@@ -124,6 +125,67 @@
         return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                     "璇诲彇鎴愬姛锛�");
     }
+
+    /*  /// <summary>
+      /// 鍒犻櫎鏉$爜
+      /// </summary>
+      /// <param name="model"></param>
+      /// <returns></returns>
+      [RequestMethod(RequestMethods.POST)]
+      public ReturnDto<int?> DeleteBarcode([FromBody] dynamic model)
+      {
+          int? rtnInt = (int)ReturnCode.Default;
+          string guidList = model.guidList;
+          string aboutType = model.aboutType;
+          string aboutGuid = model.aboutGuid;
+          var _outMsg = "";
+          var _outSum = -1;
+          using (var conn = new SqlConnection(DbHelperSQL.strConn))
+          {
+              using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
+              {
+                  try
+                  {
+                      conn.Open();
+                      cmd.CommandType = CommandType.StoredProcedure;
+                      SqlParameter[] parameters =
+                      {
+                          new("@outMsg", SqlDbType.NVarChar, 300),
+                          new("@outSum", SqlDbType.Int),
+                          new("@inOrderGuid", aboutGuid),
+                          new("@inEdtUserGuid", _userGuid),
+                          new("@guidList", guidList),
+                          new("@aboutType", aboutType)
+                      };
+                      parameters[0].Direction = ParameterDirection.Output;
+                      parameters[1].Direction = ParameterDirection.Output;
+                      foreach (var parameter in parameters)
+                          cmd.Parameters.Add(parameter);
+                      cmd.ExecuteNonQuery();
+                      _outMsg = parameters[0].Value.ToString();
+                      _outSum = int.Parse(parameters[1].Value.ToString());
+                  }
+                  catch (Exception ex)
+                  {
+                      LogHelper.Debug(ToString(),
+                          "prc_barcode_del error锛�" + ex.Message);
+                      _outMsg = ex.Message;
+                      _outSum = -1;
+                  }
+                  finally
+                  {
+                      conn.Close();
+                  }
+              }
+          }
+
+          if (_outSum <= 0)
+              return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
+                  _outMsg);
+          return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
+      }
+  */
+    /// <summary>
 
 
     /// <summary>
@@ -140,9 +202,15 @@
         string aboutGuid = model.aboutGuid;
         var _outMsg = "";
         var _outSum = -1;
+
+        // 鍒ゆ柇aboutGuid鏄惁涓烘湁鏁堢殑uniqueidentifier
+        bool is_validGuid = Guid.TryParse(aboutGuid, out _);
+        // 鏍规嵁楠岃瘉缁撴灉閫夋嫨瀵瑰簲鐨勫瓨鍌ㄨ繃绋�
+        string storedProcedureName = is_validGuid ? "[prc_barcode_del]" : "[prc_barcode_del_hb]";
+
         using (var conn = new SqlConnection(DbHelperSQL.strConn))
         {
-            using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
+            using (var cmd = new SqlCommand(storedProcedureName, conn))
             {
                 try
                 {
@@ -150,13 +218,13 @@
                     cmd.CommandType = CommandType.StoredProcedure;
                     SqlParameter[] parameters =
                     {
-                        new("@outMsg", SqlDbType.NVarChar, 300),
-                        new("@outSum", SqlDbType.Int),
-                        new("@inOrderGuid", aboutGuid),
-                        new("@inEdtUserGuid", _userGuid),
-                        new("@guidList", guidList),
-                        new("@aboutType", aboutType)
-                    };
+                    new("@outMsg", SqlDbType.NVarChar, 300),
+                    new("@outSum", SqlDbType.Int),
+                    new("@inOrderGuid", aboutGuid),
+                    new("@inEdtUserGuid", _userGuid),
+                    new("@guidList", guidList),
+                    new("@aboutType", aboutType)
+                };
                     parameters[0].Direction = ParameterDirection.Output;
                     parameters[1].Direction = ParameterDirection.Output;
                     foreach (var parameter in parameters)
@@ -168,7 +236,7 @@
                 catch (Exception ex)
                 {
                     LogHelper.Debug(ToString(),
-                        "prc_barcode_del error锛�" + ex.Message);
+                        $"{storedProcedureName} error锛歿ex.Message}");
                     _outMsg = ex.Message;
                     _outSum = -1;
                 }

--
Gitblit v1.9.3