From d00b4284626da680659b4f013e5c17d5dbe4ccf7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 01 九月 2025 17:01:19 +0800
Subject: [PATCH] 合并分支
---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
index 6b3776e..e775084 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -325,6 +325,8 @@
txtHMoney.Text = DSet.Tables[0].Rows[0]["鏈崟閲戦"].ToString();
txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["淇＄敤宸"].ToString();
HInterID = DBUtility.ClsPub.isLong(DSet.Tables[0].Rows[0]["HInterID"]);
+ txtHMaker.Text = DSet.Tables[0].Rows[0]["鍒跺崟浜�"].ToString();
+ txtHChecker.Text = DSet.Tables[0].Rows[0]["瀹℃牳浜�"].ToString();
//杩斿洖鍩烘湰淇℃伅銆佺爜鍗曚俊鎭�
grdMain.DataSource = DSet.Tables[1].DefaultView;
@@ -401,6 +403,7 @@
else
{
cmbHBillStatus.Text="宸插鏍�";
+ txtHChecker.Text = HMaker.ToString();
sh.Enabled = false;
fsh.Enabled = true;
pic1.Visible = true;
@@ -423,6 +426,7 @@
if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
cmbHBillStatus.Text = "鍒涘缓";
+ txtHChecker.Text = "";
sh.Enabled = true;
fsh.Enabled = false;
pic1.Visible = false;
@@ -510,6 +514,8 @@
Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ Report.FieldByName("鍒跺崟浜�").AsString = txtHMaker.Text;
+ Report.FieldByName("瀹℃牳浜�").AsString = txtHChecker.Text;
}
catch (Exception e)
{
@@ -591,6 +597,8 @@
Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ Report.FieldByName("鍒跺崟浜�").AsString = txtHMaker.Text;
+ Report.FieldByName("瀹℃牳浜�").AsString = txtHChecker.Text;
}
catch (Exception e)
{
--
Gitblit v1.9.1