From 027401bbe3ab0a557079228c7dd743295ee11e04 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 七月 2025 09:28:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/Frm_Show.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/LMES/Frm_Show.cs b/LMES/Frm_Show.cs
index 163629d..c883f2a 100644
--- a/LMES/Frm_Show.cs
+++ b/LMES/Frm_Show.cs
@@ -37,6 +37,7 @@
sb.CheckState = CheckState.Unchecked;
pz.CheckState = CheckState.Unchecked;
sup.CheckState = CheckState.Unchecked;
+ pay.CheckState = CheckState.Unchecked;
}
private void SetTool(ToolStripButton oBr)
@@ -83,8 +84,8 @@
private void SetPic()
{
- Image img = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/MainToolPic.jpg"); ;
- panel3.BackgroundImage = img;
+ //Image img = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/MainToolPic.jpg"); ;
+ //panel3.BackgroundImage = img;
}
private void Frm_Show_Load(object sender, EventArgs e)
@@ -184,7 +185,7 @@
{
DataSet oDs;
Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
- oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList '" + DBUtility.ClsPub.CurUserName.ToString()+"'", "h_p_OA_EmpMinMessageList");
if (oDs != null)
{
grdList1.DataSource = oDs.Tables[0].DefaultView;
@@ -195,7 +196,7 @@
}
//
- oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList '" + DBUtility.ClsPub.CurUserName.ToString() + "'", "h_p_OA_WorkBillList");
if (oDs == null)
{
return;
@@ -469,9 +470,17 @@
SetTool(sup);
}
-
+ private void pBarCodeEdit_Click(object sender, EventArgs e)
+ {
+ WarM.Sc_ICMOToBarCode oSc_ICMOToBarCode = new WarM.Sc_ICMOToBarCode();
+ oSc_ICMOToBarCode.ModCaption = "鏉＄爜蹇�熺敓鎴�";
+ oSc_ICMOToBarCode.ShowDialog();
+ }
-
-
+ private void pay_Click(object sender, EventArgs e)
+ {
+ ClearTool();
+ SetTool(pay);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1