From 650fe9e42e3de66be29769da72cc755273246dd9 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:23:04 +0800
Subject: [PATCH] 更新优化代码
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index e3cbe7c..69a321e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,16 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm
+namespace Gs.DevApp.DevFrm.Warehouse
{
public partial class Frm_MesDbck : DevExpress.XtraEditors.XtraForm
{
@@ -86,6 +87,76 @@
gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
};
+
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_fapporgid.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_fapporgid.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鐗╂枡璋冩嫧.ToString());
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ string _orgId = txt_fapporgid.GetId();
+ string _orgName = txt_fapporgid.GetName();
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["itemNo"] = dym.itemNo;
+ _row["itemName"] = dym.itemName;
+ _row["itemModel"] = dym.itemModel;
+ _row["itemUnit"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["shNum"] = dym.sl;
+ _row["remark"] = dym.bz;
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ _row["dcCk"] = dym.depotName;
+ _row["dcCkGuid"] = dym.depotId;
+ if (!string.IsNullOrEmpty(_orgId))
+ {
+ _row["dcOrg"] = _orgName;
+ _row["dcOrgGuid"] = _orgId;
+ _row["drOrg"] = _orgName;
+ _row["drOrgGuid"] = _orgId;
+ _row["drHz"] = _orgName;
+ _row["drHzGuid"] = _orgId;
+ _row["dcHz"] = _orgName;
+ _row["dcHzGuid"] = _orgId;
+ }
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -420,7 +491,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.FAPPORGID in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -602,10 +677,18 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ if (_inFieldValue <= 1)
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -631,9 +714,14 @@
gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
+
+ gvMx1.SetFocusedRowCellValue("dcCk", SelectedDataRow["depotName"]);
+ gvMx1.SetFocusedRowCellValue("dcCkGuid", SelectedDataRow["depotId"]);
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
}
/// <summary>
@@ -716,20 +804,21 @@
return;
var dr = gvMx1.GetDataRow(rowhandle);
var strOrgGuid = dr["dcOrgGuid"].ToString();
- //var strItemId = dr["itemId"].ToString();
+ var strItemId = dr["itemId"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("dcCk", lst[0].name);
gvMx1.SetFocusedRowCellValue("dcCkGuid", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
@@ -800,19 +889,21 @@
return;
var dr = gvMx1.GetDataRow(rowhandle);
var strOrgGuid = dr["drOrgGuid"].ToString();
+ var strItemId = dr["itemId"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("drCk", lst[0].name);
gvMx1.SetFocusedRowCellValue("drCkGuid", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
--
Gitblit v1.9.3