From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 130 +++++++++++++++++++++++++++++++++++--------
1 files changed, 105 insertions(+), 25 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f0d6a28..f368b8f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -73,6 +74,8 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
}
catch (Exception ex)
{
@@ -102,6 +105,64 @@
};
frm.ShowDialog();
};
+
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_qt023.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨搴撳瓨缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_qt023.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
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["qd002"] = dym.itemNo;
+ _row["qd003"] = dym.itemName;
+ _row["qd004"] = dym.itemModel;
+ _row["qd009dw"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["qd007"] = dym.sl;
+ _row["qd010"] = dym.bz;
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ _row["depotName"] = dym.depotName;
+ _row["depotId"] = dym.depotId;
+ _row["kcQty"] = dym.kcQty;
+ _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)
@@ -279,7 +340,6 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
-
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
@@ -301,6 +361,7 @@
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
+ string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -317,16 +378,16 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
if (string.IsNullOrEmpty(inLyOrg))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
txt_qt024.Focus();
+ return;
+ }
+ if (txt_qtlx.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍑哄簱绫诲瀷锛�");
+ txt_qtlx.Focus();
return;
}
if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
@@ -334,12 +395,6 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
return;
}
- //if (txt_qt020.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
- // txt_qt020.Focus();
- // return;
- //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -353,6 +408,7 @@
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
+ qtlx = qtlx,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -395,7 +451,6 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -425,7 +480,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.qt023 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
@@ -441,7 +500,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -675,10 +735,18 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", 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());
@@ -695,12 +763,18 @@
gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("qd009dw", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
+
+ gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
+ gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
+ gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
-
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
/// <summary>
/// 鍒犻櫎鏄庣粏
@@ -758,24 +832,30 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
+
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ if (string.IsNullOrEmpty(strItemId))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ return;
+ }
var strOrgGuid = txt_qt023.GetId();
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("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3