From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
index f3f1c30..296abb2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -1,11 +1,11 @@
-锘縰sing Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
+锘縰sing System;
 using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
 
-namespace Gs.DevApp.UserControl
+namespace Gs.DevApp.DevFrm.Warehouse
 {
     public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
     {
@@ -49,12 +49,12 @@
                     foreach (DataRow dr in dt.Rows)
                     {
                         string checkBox = dr["chkInt"].ToString();
-                        string _guid = dr["rkmxGuid"].ToString();
+                        //string _guid = dr["guid"].ToString();
                         if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                         {
                             list.Add(new
                             {
-                                rkmxGuid = dr["rkmxGuid"].ToString(),
+                                rkmxGuid = dr["guid"].ToString(),
                                 invBillNo = dr["invBillNo"].ToString(),
                                 itemNo = dr["itemNo"].ToString(),
                                 itemName = dr["itemName"].ToString(),

--
Gitblit v1.9.3