From a472b96deaeb4d5ee3da12c040dc2c83c8099fe9 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 14 八月 2025 18:27:47 +0800
Subject: [PATCH] 1、来料检验申请增加需求单据号字段2、免检增加默认组织、新的对供应商的 维护校验3、新增底部汇总、保存刷新4、到货条码打印新增底部汇总、列表明细5、到货单按钮布局改变5、UtilityHelper类新增委托事件（列表显示明细）、快速配置GridView底部汇总（启用汇总行+设置列求和汇总）
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 183 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 178 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 5eb5e7b..0bc8584 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,6 +1,7 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +21,72 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesDepotsManager/";
+ private DevExpress.XtraEditors.ComboBoxEdit txt_DepotModel;
+ private string _kwModel;
+ /* public Frm_MesDepot()
+ {
+ InitializeComponent();
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_KW1{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ this.ucBtnPrint1.SetPrintButton(false);
+
+ }
+ */
+
+ /*******搴撲綅鏉＄爜妯℃澘鍒囨崲*****/
public Frm_MesDepot()
{
InitializeComponent();
@@ -31,9 +98,9 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -43,6 +110,110 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ // 鍒濆鍖杢xt_DepotModel鎺т欢
+ InitDepotModelControl();
+
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+
+ try
+ {
+ // 鏍规嵁閫夋嫨鐨勫�艰缃姤琛ㄦā鍨�
+ SetKwModelBySelectedValue();
+
+ // 楠岃瘉妯″瀷鏄惁鏈夋晥
+ if (string.IsNullOrEmpty(_kwModel))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶆ā鍨嬬被鍨�");
+ return;
+ }
+
+ // 浣跨敤鍔ㄦ�佹ā鍨嬪悕绉版瀯寤哄弬鏁�
+ string rptParameter = $"{_kwModel}{{"
+ + "100" // 閲嶆墦閮芥槸浼�100
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ this.ucBtnPrint1.SetPrintButton(false);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖杢xt_DepotModel鎺т欢锛堟煡鎵惧苟璧嬪�硷級
+ /// </summary>
+ private void InitDepotModelControl()
+ {
+ // 閫掑綊鏌ユ壘绐椾綋涓墍鏈夋帶浠讹紙鍖呮嫭瀛愬鍣級
+ Control[] foundControls = this.Controls.Find("txt_DepotModel", true);
+ if (foundControls != null && foundControls.Length > 0 && foundControls[0] is DevExpress.XtraEditors.ComboBoxEdit)
+ {
+ txt_DepotModel = (DevExpress.XtraEditors.ComboBoxEdit)foundControls[0];
+ }
+ else
+ {
+ System.Diagnostics.Debug.WriteLine("璀﹀憡锛氭湭鎵惧埌txt_DepotModel鎺т欢锛岃妫�鏌ユ帶浠禢ame鏄惁姝ｇ‘");
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁txt_DepotModel閫夋嫨鐨勫�艰缃甠kwModel
+ /// </summary>
+ private void SetKwModelBySelectedValue()
+ {
+ // 閲嶇疆妯″瀷鍊�
+ _kwModel = string.Empty;
+
+ // 妫�鏌ユ帶浠舵槸鍚﹀瓨鍦�
+ if (txt_DepotModel == null)
+ {
+ MsgHelper.ShowError("鏈壘鍒板簱浣嶆ā鍨嬮�夋嫨鎺т欢");
+ return;
+ }
+
+ // 鑾峰彇閫夋嫨鐨勫��
+ string selectedValue = txt_DepotModel.EditValue?.ToString().Trim() ?? string.Empty;
+ string selectedText = txt_DepotModel.Text?.Trim() ?? string.Empty;
+
+ // 鍒ゆ柇閫夋嫨鐨勫�煎苟璁剧疆瀵瑰簲鐨勬ā鍨�
+ // 杩欓噷鍚屾椂鍒ゆ柇EditValue鍜孴ext锛岀‘淇濆吋瀹规�э紙鏍规嵁瀹為檯鏁版嵁缁戝畾鎯呭喌璋冩暣锛�
+ if (selectedValue == "搴撲綅鐮侊紙灏忥級" || selectedText == "搴撲綅鐮侊紙灏忥級")
+ {
+ _kwModel = "rpt_KW";
+ }
+ else if (selectedValue == "搴撲綅鐮侊紙澶э級" || selectedText == "搴撲綅鐮侊紙澶э級")
+ {
+ _kwModel = "rpt_KW1";
+ }
+ else
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶇爜绫诲瀷锛堝皬/澶э級");
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -237,7 +408,9 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
+ var pgq = new PageQueryModel(curPage,
+ this.pageBar1.RowsCount,
+ "org.FNumber asc ,a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -295,7 +468,7 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
- {
+ {
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
--
Gitblit v1.9.3