From cc286e3641ef72fe7cb1312487a6d4e40bda81fe Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 145 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 139 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index ac32e5a..7854fe6 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -1,11 +1,16 @@
锘縰sing CefSharp.DevTools.Debugger;
using DevExpress.Spreadsheet;
+using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
+using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
+using System.Data.SqlTypes;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -19,14 +24,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)
{
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 +40,20 @@
{
IWorkbook workbook = spreadsheetControl1.Document;
workbook.LoadDocument(filePath);
- SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "ddd", true);
+ switch (this.orderType)
+ {
+ case "鍏跺畠鍏ュ簱":
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
+ break;
+ case "鐗╂枡璋冩嫧":
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ break;
+ }
}
else
{
@@ -55,8 +74,7 @@
}
else
{
- //Text = "姝ｅ湪浠庛��" + fileName + "銆戝鍒跺埌銆�" + this.orderType.ToString()+"銆�";
- Text = "姝ｅ湪澶嶅埗鍒般��" + this.orderType.ToString() + "銆�";
+ Text = "姝ｅ湪蹇嵎褰曞叆鍒般��" + this.orderType.ToString() + "銆戯紝缁勭粐ID涓恒��" + this.orgId.ToString() + "銆�";
}
}
@@ -67,7 +85,117 @@
/// <param name="e"></param>
private void btnSave_Click(object sender, EventArgs e)
{
- spreadsheetControl1.SaveDocument();
+ int rowsCount = spreadsheetControl1.ActiveWorksheet.GetUsedRange().RowCount;
+ spreadsheetControl1.ActiveWorksheet.MoveToEnd();
+ if (rowsCount < 2)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氳〃鏍间笉鑳戒负绌猴紒");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("鍏辨湁銆�" + (rowsCount - 1).ToString() + "銆戞潯鏁版嵁锛岀‘瀹氬鍒跺悧锛�"))
+ return;
+ var list = new List<dynamic>();
+ switch (this.orderType)
+ {
+ case "鍏跺畠鍏ュ簱":
+ #region MyRegion
+ {
+ for (int row = 2; row <= rowsCount; row++)
+ {
+ string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+ string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+ string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+ string bllx = spreadsheetControl1.ActiveWorksheet.Cells["D" + row.ToString()].Value.ToString().Trim();
+ var _obj = new
+ {
+ itemNo = itemNo,
+ orgId = this.orgId,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ list.Add(new
+ {
+ itemNo = itemNo,
+ sl = sl,
+ bz = bz,
+ bllx = bllx,
+ itemName = dy.itemName,
+ itemModel = dy.itemModel,
+ dwName = dy.kfName,
+ itemId = dy.itemId
+ });
+ }
+ else
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+ return;
+ }
+ }
+ }
+ #endregion
+ break;
+ case "鐗╂枡璋冩嫧":
+ #region MyRegion
+ {
+ for (int row = 2; row <= rowsCount; row++)
+ {
+ string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+ string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+ string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+ var _obj = new
+ {
+ itemNo = itemNo,
+ orgId = this.orgId,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ list.Add(new
+ {
+ itemNo = itemNo,
+ sl = sl,
+ bz = bz,
+ itemName = dy.itemName,
+ itemModel = dy.itemModel,
+ dwName = dy.kfName,
+ itemId = dy.itemId
+ });
+ }
+ else
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+ return;
+ }
+ }
+ }
+ #endregion
+ break;
+ }
+
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { DynamicList = list });
+ Close();
}
/// <summary>
@@ -83,5 +211,10 @@
workSheet.Cells[coordinates].Style.Font.Bold = isBold;
}
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3