From 02ba47f5a081fcfe6d7ea3a829769db5bf8b2c2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 七月 2023 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/报表分析/Kf_BarCodeOutInReport.designer.cs | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
index 8c70245..6ce5869 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
@@ -53,6 +53,7 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
this.txtHBillNo = new System.Windows.Forms.TextBox();
this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
this.cmbBillType = new System.Windows.Forms.ComboBox();
@@ -63,6 +64,7 @@
this.txtHSPName = new System.Windows.Forms.TextBox();
this.txtHWHName = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
@@ -72,8 +74,8 @@
this.label6 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.txtHMaker = new System.Windows.Forms.TextBox();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.label12 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -315,6 +317,8 @@
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Lavender;
+ this.groupBox1.Controls.Add(this.cmbHOrgID);
+ this.groupBox1.Controls.Add(this.label12);
this.groupBox1.Controls.Add(this.txtHSourceBillNo);
this.groupBox1.Controls.Add(this.txtHMaker);
this.groupBox1.Controls.Add(this.txtHBillNo);
@@ -350,6 +354,13 @@
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
this.txtHSourceBillNo.Size = new System.Drawing.Size(122, 21);
this.txtHSourceBillNo.TabIndex = 69;
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.Location = new System.Drawing.Point(804, 40);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(122, 21);
+ this.txtHMaker.TabIndex = 67;
//
// txtHBillNo
//
@@ -430,6 +441,16 @@
this.label9.Size = new System.Drawing.Size(65, 12);
this.label9.TabIndex = 68;
this.label9.Text = "婧愬崟鍗曞彿锛�";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.Location = new System.Drawing.Point(752, 44);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.TabIndex = 66;
+ this.label11.Text = "鍒跺崟浜猴細";
//
// label8
//
@@ -521,22 +542,24 @@
this.label3.TabIndex = 56;
this.label3.Text = "浠� 浣嶏細";
//
- // label11
+ // cmbHOrgID
//
- this.label11.AutoSize = true;
- this.label11.BackColor = System.Drawing.Color.Transparent;
- this.label11.Location = new System.Drawing.Point(752, 44);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
- this.label11.TabIndex = 66;
- this.label11.Text = "鍒跺崟浜猴細";
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(993, 40);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(122, 20);
+ this.cmbHOrgID.TabIndex = 87;
//
- // txtHMaker
+ // label12
//
- this.txtHMaker.Location = new System.Drawing.Point(804, 40);
- this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(122, 21);
- this.txtHMaker.TabIndex = 67;
+ this.label12.AutoSize = true;
+ this.label12.ForeColor = System.Drawing.Color.Black;
+ this.label12.Location = new System.Drawing.Point(931, 44);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(65, 12);
+ this.label12.TabIndex = 86;
+ this.label12.Text = "缁� 缁囷細";
//
// Kf_BarCodeOutInReport
//
@@ -610,5 +633,7 @@
private System.Windows.Forms.ToolStripButton dc;
public System.Windows.Forms.TextBox txtHMaker;
private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.ComboBox cmbHOrgID;
+ private System.Windows.Forms.Label label12;
}
}
\ No newline at end of file
--
Gitblit v1.9.1