From 0fd7f552d345c2988ad704dbfeace766428ab47b Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 28 十二月 2021 14:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 29 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 2d48dc9..8001f74 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -81,12 +81,14 @@
this.cmdHMaterID1 = new System.Windows.Forms.Button();
this.grdSub = new System.Windows.Forms.DataGridView();
this.button1 = new System.Windows.Forms.Button();
- this.璁㈠崟鏁伴噺 = new System.Windows.Forms.Label();
- this.txtHICMOQty = new System.Windows.Forms.TextBox();
+ this.鏁寸鏁伴噺 = new System.Windows.Forms.Label();
+ this.txtHZXQty = new System.Windows.Forms.TextBox();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
+ this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -342,6 +344,8 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.txtHSeOrderBillNo);
+ this.gbUp.Controls.Add(this.label9);
this.gbUp.Controls.Add(this.cmbHBarCodeType);
this.gbUp.Controls.Add(this.label8);
this.gbUp.Controls.Add(this.cmdHSaveBill);
@@ -373,7 +377,7 @@
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜",
"鎵规鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(826, 75);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(871, 77);
this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
@@ -384,7 +388,7 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(748, 82);
+ this.label8.Location = new System.Drawing.Point(793, 84);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(72, 16);
this.label8.TabIndex = 138;
@@ -394,7 +398,7 @@
//
this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill.Location = new System.Drawing.Point(1010, 66);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(1026, 66);
this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
this.cmdHSaveBill.Name = "cmdHSaveBill";
this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
@@ -407,10 +411,10 @@
//
this.dtpHEndDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate.Location = new System.Drawing.Point(478, 75);
+ this.dtpHEndDate.Location = new System.Drawing.Point(602, 76);
this.dtpHEndDate.Margin = new System.Windows.Forms.Padding(2);
this.dtpHEndDate.Name = "dtpHEndDate";
- this.dtpHEndDate.Size = new System.Drawing.Size(213, 30);
+ this.dtpHEndDate.Size = new System.Drawing.Size(154, 30);
this.dtpHEndDate.TabIndex = 102;
//
// label5
@@ -418,7 +422,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(399, 83);
+ this.label5.Location = new System.Drawing.Point(523, 84);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(72, 16);
this.label5.TabIndex = 101;
@@ -428,10 +432,10 @@
//
this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate.Location = new System.Drawing.Point(112, 77);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(213, 30);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -439,7 +443,7 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(33, 85);
+ this.label6.Location = new System.Drawing.Point(257, 85);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(72, 16);
this.label6.TabIndex = 99;
@@ -674,23 +678,23 @@
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
- // 璁㈠崟鏁伴噺
+ // 鏁寸鏁伴噺
//
- this.璁㈠崟鏁伴噺.AutoSize = true;
- this.璁㈠崟鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.璁㈠崟鏁伴噺.Location = new System.Drawing.Point(900, 190);
- this.璁㈠崟鏁伴噺.Name = "璁㈠崟鏁伴噺";
- this.璁㈠崟鏁伴噺.Size = new System.Drawing.Size(120, 27);
- this.璁㈠崟鏁伴噺.TabIndex = 148;
- this.璁㈠崟鏁伴噺.Text = "璁㈠崟鏁伴噺";
+ this.鏁寸鏁伴噺.AutoSize = true;
+ this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(900, 190);
+ this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
+ this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
+ this.鏁寸鏁伴噺.TabIndex = 148;
+ this.鏁寸鏁伴噺.Text = "鏁寸鏁伴噺";
//
- // txtHICMOQty
+ // txtHZXQty
//
- this.txtHICMOQty.Location = new System.Drawing.Point(900, 221);
- this.txtHICMOQty.Multiline = true;
- this.txtHICMOQty.Name = "txtHICMOQty";
- this.txtHICMOQty.Size = new System.Drawing.Size(112, 42);
- this.txtHICMOQty.TabIndex = 147;
+ this.txtHZXQty.Location = new System.Drawing.Point(900, 221);
+ this.txtHZXQty.Multiline = true;
+ this.txtHZXQty.Name = "txtHZXQty";
+ this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHZXQty.TabIndex = 147;
//
// tabControl1
//
@@ -738,6 +742,27 @@
this.grdList.Size = new System.Drawing.Size(866, 269);
this.grdList.TabIndex = 20;
//
+ // txtHSeOrderBillNo
+ //
+ this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
+ this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
+ this.txtHSeOrderBillNo.ReadOnly = true;
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
+ this.txtHSeOrderBillNo.TabIndex = 141;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(19, 85);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(88, 16);
+ this.label9.TabIndex = 140;
+ this.label9.Text = "閿�鍞鍗曞彿";
+ //
// Sc_ICMOToBarCode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -745,8 +770,8 @@
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.ClientSize = new System.Drawing.Size(1172, 869);
this.Controls.Add(this.tabControl1);
- this.Controls.Add(this.璁㈠崟鏁伴噺);
- this.Controls.Add(this.txtHICMOQty);
+ this.Controls.Add(this.鏁寸鏁伴噺);
+ this.Controls.Add(this.txtHZXQty);
this.Controls.Add(this.button1);
this.Controls.Add(this.grdSub);
this.Controls.Add(this.groupBox1);
@@ -831,12 +856,14 @@
private System.Windows.Forms.Button cmdHMaterID1;
private System.Windows.Forms.DataGridView grdSub;
private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Label 璁㈠崟鏁伴噺;
- private System.Windows.Forms.TextBox txtHICMOQty;
+ private System.Windows.Forms.Label 鏁寸鏁伴噺;
+ private System.Windows.Forms.TextBox txtHZXQty;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.DataGridView grdList;
private System.Windows.Forms.ToolStripButton cz;
+ private System.Windows.Forms.TextBox txtHSeOrderBillNo;
+ private System.Windows.Forms.Label label9;
}
}
\ No newline at end of file
--
Gitblit v1.9.1