From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index a071de3..03e98f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -32,6 +32,7 @@
toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -105,8 +106,8 @@
_row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
_row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
_row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
- _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
- _row["fEntrynote"] = dym.entryNote; ;
+ _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
+ _row["fEntrynote"] = dym.entryNote; ;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -126,6 +127,8 @@
frm.ShowDialog();
};
}
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -525,6 +528,12 @@
}
}
+
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
+
/// <summary>
/// 璐㈠姟瀹℃牳
/// </summary>
@@ -581,14 +590,16 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
case 30:
strMsg = "璐㈠姟瀹℃牳";
break;
case 31:
strMsg = "璐㈠姟鍙嶅鏍�";
break;
- }
- ;
+ };
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
@@ -712,6 +723,6 @@
frm.ShowDialog();
}
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3