From 7182a886498f8e3d8e707cde1a1c9fa625923f7e Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Sat, 5 Apr 2025 13:35:39 +0000
Subject: [PATCH] SVN r447

SVN-Revision: r447
---
 插件库/Lskj.PubBill/BillModule.Designer.cs | 13 ++++++-------
 插件库/Lskj.PubBill/BillModule.cs          | 21 ++++++++++++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/插件库/Lskj.PubBill/BillModule.Designer.cs b/插件库/Lskj.PubBill/BillModule.Designer.cs
index f9424b5..e3d159b 100644
--- a/插件库/Lskj.PubBill/BillModule.Designer.cs
+++ b/插件库/Lskj.PubBill/BillModule.Designer.cs
@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             this.ssc_main = new DevExpress.XtraEditors.SplitContainerControl();
             this.ssc_main_top = new DevExpress.XtraEditors.SplitContainerControl();
             this.pl_left = new DevExpress.XtraEditors.PanelControl();
@@ -41,7 +40,7 @@
             this.pl_treeview_detault_search = new DevExpress.XtraEditors.PanelControl();
             this.panelControl4 = new DevExpress.XtraEditors.PanelControl();
             this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
+            this.barManager1 = new DevExpress.XtraBars.BarManager();
             this.barDockControl1 = new DevExpress.XtraBars.BarDockControl();
             this.barDockControl2 = new DevExpress.XtraBars.BarDockControl();
             this.barDockControl3 = new DevExpress.XtraBars.BarDockControl();
@@ -51,7 +50,7 @@
             this.btnTreeSearch = new DevExpress.XtraEditors.SimpleButton();
             this.pl_main_bottom = new DevExpress.XtraEditors.PanelControl();
             this.dbpFP = new DevExpress.XtraEditors.DropDownButton();
-            this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.pmFP = new DevExpress.XtraBars.PopupMenu();
             this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
             this.btnHiding = new DevExpress.XtraEditors.SimpleButton();
             this.btnHelp = new DevExpress.XtraEditors.SimpleButton();
@@ -64,15 +63,15 @@
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.btn_input = new DevExpress.XtraEditors.SimpleButton();
             this.dpbImport = new DevExpress.XtraEditors.DropDownButton();
-            this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.pmBillExp = new DevExpress.XtraBars.PopupMenu();
             this.btnBillAdd = new DevExpress.XtraEditors.SimpleButton();
             this.btnBillApply = new DevExpress.XtraEditors.SimpleButton();
             this.dpCopyBill = new DevExpress.XtraEditors.DropDownButton();
-            this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.pmBill = new DevExpress.XtraBars.PopupMenu();
             this.btnPrint = new DevExpress.XtraEditors.DropDownButton();
-            this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.pMprint = new DevExpress.XtraBars.PopupMenu();
             this.dpbTools = new DevExpress.XtraEditors.DropDownButton();
-            this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.pMenu = new DevExpress.XtraBars.PopupMenu();
             this.btnDelete = new DevExpress.XtraEditors.SimpleButton();
             this.btnBillSave = new DevExpress.XtraEditors.SimpleButton();
             this.pl_main_top = new DevExpress.XtraEditors.PanelControl();
diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 429acac..1213732 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2586,6 +2586,25 @@ namespace Lskj.PubBill
                 if (!string.IsNullOrWhiteSpace(e.MemuModel.ResultSQL))
                 {
                     string resultSql = e.MemuModel.ResultSQL;
+                    if (e.DialogModel != null && e.DialogModel.DialogDllName.Equals("Lskj.PubBomImport.dll", StringComparison.OrdinalIgnoreCase)&& e.DialogModel.ReturnTag.ToString()=="3")
+                    {
+                        DataRow dataRow = this.gcMain.GridView.GetFocusedDataRow();
+                        string[] strArrlist = resultSql.Split('^');
+                        if (strArrlist.Count() != 3) return;
+                        string selectSql = ReplaceHelper.ReplaceRowParam(dataRow, strArrlist[0]);
+                        string isUpadSql = ReplaceHelper.ReplaceRowParam(dataRow, strArrlist[1]);
+                        DataRow fileRow = BaseImpl.GetDataRowResult(selectSql);
+                        string Billdocument_Id = fileRow != null ? fileRow["Billdocument_Id"] + "" : string.Empty;
+                        dataRow["qms_laddf_RelatedId"] = Billdocument_Id;
+                        if (fileRow!=null && BaseImpl.GetDataRowResult(isUpadSql) != null)
+                        {
+                            string upadSql = ReplaceHelper.ReplaceRowParam(fileRow, strArrlist[2]);
+                            upadSql = ReplaceHelper.ReplaceRowParam(dataRow, strArrlist[2]);
+                            SqlHelper.ExecuteNonQuery(upadSql);
+                        }
+                        this.gcMain.GridView.UpdateCurrentRow();
+                        this.gcMain.GridView.ShowEditor();
+                    }else
                     if (e.DialogModel != null && e.DialogModel.DialogDllName.Equals("lskj.pubadd.dll", StringComparison.OrdinalIgnoreCase) && e.DialogModel.PubDialogType == DialogType.PubAddRecord)
                     {
                         if (e.DialogModel.ReturnTag != null && e.DialogModel.ReturnTag is MyControl)
@@ -2599,7 +2618,7 @@ namespace Lskj.PubBill
                         {
                             this.AddRowToGridView(item);
                         }
-                    }
+                    } 
                     else
                     {
                         resultSql = this.ControlObj.ReplaceControlValue(resultSql);