From 7e2fe692d16412e0c20a433a81cb85a3cb39cb2b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 30 八月 2025 17:07:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index 2824a33..031e8ca 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -1,6 +1,7 @@
锘縰sing CefSharp.DevTools.Debugger;
using DevExpress.Spreadsheet;
using DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -19,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 = "姝ｅ湪澶嶅埗锛�" + _orderType;
this.orderType = _orderType;
this.orderGuid = _orderGuid;
+ this.orgId = _orgId;
this.spreadsheetControl1.DocumentLoaded += new EventHandler(spreadsheetControl1_DocumentLoaded);
if (!string.IsNullOrEmpty(filePath))
{
@@ -34,7 +36,10 @@
{
IWorkbook workbook = spreadsheetControl1.Document;
workbook.LoadDocument(filePath);
- // SetCellText(spreadsheetControl1.ActiveWorksheet, location, item.F_Name, true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
}
else
{
@@ -55,7 +60,8 @@
}
else
{
- Text = fileName;
+ //Text = "姝ｅ湪浠庛��" + fileName + "銆戝鍒跺埌銆�" + this.orderType.ToString()+"銆�";
+ Text = "姝ｅ湪蹇嵎褰曞叆鍒般��" + this.orderType.ToString() + "銆戯紝缁勭粐ID涓恒��" + this.orgId.ToString() + "銆�";
}
}
@@ -66,7 +72,24 @@
/// <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>
@@ -81,6 +104,11 @@
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