From 4c8a86bce9a4f19322935d91917576f6460a40bb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:23:21 +0800
Subject: [PATCH] 调整空值报错的问题

---
 DevApp/Gs.DevApp/UserControl/CopyXls.cs |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index 0317ead..031e8ca 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -1,5 +1,7 @@
-锘縰sing DevExpress.Spreadsheet;
+锘縰sing CefSharp.DevTools.Debugger;
+using DevExpress.Spreadsheet;
 using DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -18,14 +20,15 @@
     {
         private string orderType;
         private string orderGuid;
+        private string orgId;
         private static readonly string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
 
-        public CopyXls(string orgId, string _orderGuid, string _orderType)
+        public CopyXls(string orgId, string _orderGuid, string _orderType, string _orgId)
         {
             InitializeComponent();
-            this.Text = "姝e湪澶嶅埗锛�" + _orderType;
             this.orderType = _orderType;
             this.orderGuid = _orderGuid;
+            this.orgId = _orgId;
             this.spreadsheetControl1.DocumentLoaded += new EventHandler(spreadsheetControl1_DocumentLoaded);
             if (!string.IsNullOrEmpty(filePath))
             {
@@ -33,6 +36,10 @@
                 {
                     IWorkbook workbook = spreadsheetControl1.Document;
                     workbook.LoadDocument(filePath);
+                    SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+                    SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+                    SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+                    SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
                 }
                 else
                 {
@@ -53,7 +60,8 @@
             }
             else
             {
-                Text = fileName;
+                //Text = "姝e湪浠庛��" + fileName + "銆戝鍒跺埌銆�" + this.orderType.ToString()+"銆�";
+                Text = "姝e湪蹇嵎褰曞叆鍒般��" + this.orderType.ToString() + "銆戯紝缁勭粐ID涓恒��" + this.orgId.ToString() + "銆�";
             }
         }
 
@@ -64,7 +72,43 @@
         /// <param name="e"></param>
         private void btnSave_Click(object sender, EventArgs e)
         {
-            spreadsheetControl1.SaveDocument();
+            var list = new List<dynamic>();
+            for (int row = 2; row <= spreadsheetControl1.ActiveWorksheet.GetUsedRange().RowCount; row++)
+            {
+                string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A1"].Value.ToString();
+                string sl = spreadsheetControl1.ActiveWorksheet.Cells["B1"].Value.ToString();
+                string bz = spreadsheetControl1.ActiveWorksheet.Cells["C1"].Value.ToString();
+                string bllx = spreadsheetControl1.ActiveWorksheet.Cells["D1"].Value.ToString();
+                list.Add(new
+                {
+                    itemNo = itemNo,
+                    sl = sl,
+                    bz = bz,
+                    bllx = bllx,
+                });
+            }
+            UpdateParent?.Invoke(this,
+                new UpdateParentEventArgs { DynamicList = list });
+            Close();
         }
+
+        /// <summary>
+        /// 浠庢暟鎹簱閲岃鍙栧埌Excel
+        /// </summary>
+        /// <param name="workSheet"></param>
+        /// <param name="coordinates">浣嶇疆鏍煎紡濡侫1 B2</param>
+        /// <param name="coordValue">鍊�</param>
+        /// <param name="isBold">鏄惁鍔犵矖</param>
+        private void SetCellText(Worksheet workSheet, string coordinates, string coordValue, bool isBold)
+        {
+            workSheet.Cells[coordinates].Value = coordValue;
+            workSheet.Cells[coordinates].Style.Font.Bold = isBold;
+        }
+
+        /// <summary>
+        /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3