From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111

---
 service/Warehouse/MesItemTblManager.cs |   93 +++++++++++++++++++++-------------------------
 1 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 8b0fa5c..6b1ef67 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -1,11 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
 using NewPdaSqlServer.DB;
 using NewPdaSqlServer.Dto.service;
 using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
 using NewPdaSqlServer.util;
 using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Security.Cryptography;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
 
 namespace NewPdaSqlServer.service.Warehouse;
 
@@ -28,19 +31,18 @@
         // 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
         var parameters = new[]
         {
-            new SugarParameter("@pi_orgId", orgId),
-            new SugarParameter("@type", query.Type),
-            new SugarParameter("@inP1", null),
-            new SugarParameter("@inP2", null),
-            new SugarParameter("@inP3", null),
-            new SugarParameter("@inP4", null)
+        new SugarParameter("@pi_orgId", orgId),
+        new SugarParameter("@type", query.Type),
+        new SugarParameter("@inP1", null),
+        new SugarParameter("@inP2", null),
+        new SugarParameter("@inP3", null),
+        new SugarParameter("@inP4", null)
         };
         try
         {
             // 杩斿洖鍗曞彿瀛楃涓插垪琛�
             var blDetails = Db.Ado.SqlQuery<string>(
-                "EXEC prc_pda_sctl_list @pi_orgId,@type,@inP1,@inP2,@inP3,@inP4",
-                parameters);
+                "EXEC prc_pda_sctl_list @pi_orgId,@type,@inP1,@inP2,@inP3,@inP4", parameters);
             return blDetails;
         }
         catch (Exception ex)
@@ -54,8 +56,7 @@
     /// </summary>
     /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
     /// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
-    public dynamic GetMesItemTblDetailByBillNo(dynamic query,
-        dynamic RequestInfo)
+    public dynamic GetMesItemTblDetailByBillNo(dynamic query, dynamic RequestInfo)
     {
         if (string.IsNullOrEmpty(query.billNo))
             throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -73,25 +74,24 @@
 
         // 鑾峰彇鏈畬鎴愮殑閿�鍞��璐ф槑缁�
         var parameters = new[]
-        {
-            new SugarParameter("@billNo", query.billNo),
-            new SugarParameter("@pi_orgId", orgId),
-            new SugarParameter("@inP1", null),
-            new SugarParameter("@inP2", null),
-            new SugarParameter("@inP3", null),
-            new SugarParameter("@inP4", null)
-        };
+{
+        new SugarParameter("@billNo", query.billNo),
+        new SugarParameter("@pi_orgId",orgId),
+        new SugarParameter("@inP1", null),
+        new SugarParameter("@inP2", null),
+        new SugarParameter("@inP3", null),
+        new SugarParameter("@inP4", null)
+    };
         try
         {
-            var blDetails = Db.Ado.SqlQuery<dynamic>(
-                "EXEC prc_pda_sctl_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
-                parameters);
-            var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
-            var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+            List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+                "EXEC prc_pda_sctl_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+            var items = blDetails.Where(x => x.DSQty > 0).ToList();    // 寰呮壂鐗╂枡
+            var ysitems = blDetails.Where(x => x.SQty > 0).ToList();   // 宸叉壂鐗╂枡
             return new
             {
-                items,
-                ysitems,
+                items = items,
+                ysitems = ysitems,
                 Count = items.Count + ysitems.Count
             };
         }
@@ -134,7 +134,7 @@
     /// </summary>
     /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
     /// <returns>澶勭悊缁撴灉</returns>
-    public dynamic SctlScanBarcode(WarehouseQuery query, dynamic RequestInfo)
+    public dynamic SctlScanBarcode(WarehouseQuery query,dynamic RequestInfo)
     {
         // 楠岃瘉鏉$爜淇℃伅
         var barcode = Db.Queryable<MesInvItemBarcodes>()
@@ -184,17 +184,14 @@
                     new SqlParameter("@pi_orgId", orgId),
                     new SqlParameter("@PI_INP1", DBNull.Value),
                     new SqlParameter("@PI_INP2", DBNull.Value),
-                    new SqlParameter("@PO_OUT_MSG", SqlDbType.NVarChar)
-                        { Direction = ParameterDirection.Output, Size = 2000 },
-                    new SqlParameter("@PO_OUT_SUM", SqlDbType.Int)
-                        { Direction = ParameterDirection.Output },
-                    new SqlParameter("@PO_ITEM_NO", SqlDbType.NVarChar)
-                        { Direction = ParameterDirection.Output, Size = 100 },
+                    new SqlParameter("@PO_OUT_MSG", SqlDbType.NVarChar) { Direction = ParameterDirection.Output, Size = 2000 },
+                    new SqlParameter("@PO_OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+                    new SqlParameter("@PO_ITEM_NO", SqlDbType.NVarChar) { Direction = ParameterDirection.Output, Size = 100 },
                     new SqlParameter("@PO_QUANTITY", SqlDbType.Decimal)
                     {
                         Direction = ParameterDirection.Output,
-                        Precision = 18, // 鏍规嵁瀹為檯鏁版嵁搴撶簿搴﹁皟鏁�
-                        Scale = 10 // 鏍规嵁瀹為檯鏁版嵁搴撳皬鏁颁綅璋冩暣
+                        Precision = 18,   // 鏍规嵁瀹為檯鏁版嵁搴撶簿搴﹁皟鏁�
+                        Scale = 10         // 鏍规嵁瀹為檯鏁版嵁搴撳皬鏁颁綅璋冩暣
                     }
                 };
 
@@ -202,13 +199,9 @@
                 cmd.ExecuteNonQuery();
 
                 var outMsg = parameters[7].Value?.ToString() ?? string.Empty;
-                var outSum = parameters[8].Value != DBNull.Value
-                    ? Convert.ToInt32(parameters[8].Value)
-                    : -1;
+                var outSum = parameters[8].Value != DBNull.Value ? Convert.ToInt32(parameters[8].Value) : -1;
                 var itemNo = parameters[9].Value?.ToString() ?? string.Empty;
-                var quantity = parameters[10].Value != DBNull.Value
-                    ? Convert.ToDecimal(parameters[10].Value)
-                    : 0m;
+                var quantity = parameters[10].Value != DBNull.Value ? Convert.ToDecimal(parameters[10].Value) : 0m;
 
                 if (outSum == -1) throw new Exception(outMsg);
 
@@ -218,13 +211,13 @@
                 return query;
             }
             catch (Exception ex)
-            {
-                throw new Exception(ex.Message);
-            }
-            finally
-            {
-                conn.Close();
-            }
+                {
+                    throw new Exception(ex.Message);
+                }
+                finally
+                {
+                    conn.Close();
+                }
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3