From 01199f7867ebd763cfae62c093926a88689f5318 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 24 十一月 2023 11:20:11 +0800
Subject: [PATCH] 销售码单打印模块界面增加显示制单人、审核人
---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 8 ++++
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs | 98 ++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 84 insertions(+), 22 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)
{
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
index 77a4f80..c7bfce0 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.designer.cs"
@@ -41,6 +41,8 @@
this.tp = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.sh = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.fsh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.Billdy = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@@ -113,8 +115,10 @@
this.涓棿 = new System.Windows.Forms.Panel();
this.搴曢儴 = new System.Windows.Forms.Panel();
this.鍙充晶 = new System.Windows.Forms.Panel();
- this.fsh = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.TextBox();
+ this.label25 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -244,6 +248,25 @@
this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.sh.Click += new System.EventHandler(this.sh_Click);
//
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ //
+ // fsh
+ //
+ this.fsh.AutoSize = false;
+ this.fsh.Image = ((System.Drawing.Image)(resources.GetObject("fsh.Image")));
+ this.fsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsh.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fsh.Name = "fsh";
+ this.fsh.Size = new System.Drawing.Size(70, 47);
+ this.fsh.Text = "鍙嶅鏍稿崟鎹�";
+ this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsh.Click += new System.EventHandler(this.fsh_Click);
+ //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -332,7 +355,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1091, 377);
+ this.grdMain.Size = new System.Drawing.Size(1091, 361);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
@@ -402,6 +425,10 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.txtHChecker);
+ this.gbUp.Controls.Add(this.label25);
+ this.gbUp.Controls.Add(this.txtHMaker);
+ this.gbUp.Controls.Add(this.label24);
this.gbUp.Controls.Add(this.pic1);
this.gbUp.Controls.Add(this.txtHCreditDifference);
this.gbUp.Controls.Add(this.txtHCreditRating);
@@ -450,7 +477,7 @@
this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
this.gbUp.Location = new System.Drawing.Point(0, 0);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1105, 218);
+ this.gbUp.Size = new System.Drawing.Size(1105, 234);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -900,10 +927,10 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 218);
+ this.tabControl1.Location = new System.Drawing.Point(0, 234);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1105, 409);
+ this.tabControl1.Size = new System.Drawing.Size(1105, 393);
this.tabControl1.TabIndex = 149;
//
// tabPage1
@@ -912,7 +939,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1097, 383);
+ this.tabPage1.Size = new System.Drawing.Size(1097, 367);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍩烘湰淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1072,24 +1099,47 @@
this.鍙充晶.Size = new System.Drawing.Size(12, 627);
this.鍙充晶.TabIndex = 64;
//
- // fsh
+ // txtHMaker
//
- this.fsh.AutoSize = false;
- this.fsh.Image = ((System.Drawing.Image)(resources.GetObject("fsh.Image")));
- this.fsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.fsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.fsh.Name = "fsh";
- this.fsh.Size = new System.Drawing.Size(70, 47);
- this.fsh.Text = "鍙嶅鏍稿崟鎹�";
- this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.fsh.Click += new System.EventHandler(this.fsh_Click);
+ this.txtHMaker.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaker.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaker.Location = new System.Drawing.Point(95, 195);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.ReadOnly = true;
+ this.txtHMaker.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaker.TabIndex = 340;
//
- // toolStripSeparator6
+ // label24
//
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.label24.AutoSize = true;
+ this.label24.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label24.ForeColor = System.Drawing.Color.Black;
+ this.label24.Location = new System.Drawing.Point(52, 199);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(41, 12);
+ this.label24.TabIndex = 339;
+ this.label24.Text = "鍒跺崟浜�";
+ //
+ // txtHChecker
+ //
+ this.txtHChecker.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHChecker.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHChecker.Location = new System.Drawing.Point(302, 195);
+ this.txtHChecker.Name = "txtHChecker";
+ this.txtHChecker.ReadOnly = true;
+ this.txtHChecker.Size = new System.Drawing.Size(128, 21);
+ this.txtHChecker.TabIndex = 342;
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label25.ForeColor = System.Drawing.Color.Black;
+ this.label25.Location = new System.Drawing.Point(259, 199);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(41, 12);
+ this.label25.TabIndex = 341;
+ this.label25.Text = "瀹℃牳浜�";
//
// Kf_SellOutBill_BarCodeNote
//
@@ -1214,5 +1264,9 @@
private System.Windows.Forms.DataGridView grdTM;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripButton fsh;
+ private System.Windows.Forms.TextBox txtHChecker;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.TextBox txtHMaker;
+ private System.Windows.Forms.Label label24;
}
}
\ No newline at end of file
--
Gitblit v1.9.1