From 274db11b6606fb03bf269c73d9aa1722e92d23a1 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 23 一月 2022 20:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/仓库管理/Gy_BarCodeBill_ChaiMa.Designer.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
index e925a68..9600db4 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
@@ -1,5 +1,5 @@
 锘�
-namespace WarM.浠撳簱绠$悊
+namespace WarM
 {
     partial class Gy_BarCodeBill_ChaiMa
     {
@@ -78,7 +78,7 @@
             this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
             this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.grdSum.Location = new System.Drawing.Point(4, 476);
+            this.grdSum.Location = new System.Drawing.Point(4, 512);
             this.grdSum.Margin = new System.Windows.Forms.Padding(4);
             this.grdSum.Name = "grdSum";
             this.grdSum.ReadOnly = true;
@@ -93,11 +93,11 @@
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 185);
+            this.tabControl1.Location = new System.Drawing.Point(0, 149);
             this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1356, 525);
+            this.tabControl1.Size = new System.Drawing.Size(1356, 561);
             this.tabControl1.TabIndex = 54;
             // 
             // tabPage1
@@ -108,9 +108,9 @@
             this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
-            this.tabPage1.Size = new System.Drawing.Size(1348, 496);
+            this.tabPage1.Size = new System.Drawing.Size(1348, 532);
             this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "椤�1";
+            this.tabPage1.Text = "鏉$爜淇℃伅";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // grdMain
@@ -128,7 +128,7 @@
             this.grdMain.ReadOnly = true;
             this.grdMain.RowHeadersWidth = 30;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(1340, 472);
+            this.grdMain.Size = new System.Drawing.Size(1340, 508);
             this.grdMain.TabIndex = 47;
             // 
             // tabPage2
@@ -139,9 +139,9 @@
             this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
-            this.tabPage2.Size = new System.Drawing.Size(1348, 496);
+            this.tabPage2.Size = new System.Drawing.Size(1348, 532);
             this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "椤�2";
+            this.tabPage2.Text = "鏂扮爜淇℃伅";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // grdMain_Pay
@@ -159,7 +159,7 @@
             this.grdMain_Pay.ReadOnly = true;
             this.grdMain_Pay.RowHeadersWidth = 30;
             this.grdMain_Pay.RowTemplate.Height = 23;
-            this.grdMain_Pay.Size = new System.Drawing.Size(1340, 464);
+            this.grdMain_Pay.Size = new System.Drawing.Size(1340, 500);
             this.grdMain_Pay.TabIndex = 49;
             // 
             // grdSum_Pay
@@ -169,7 +169,7 @@
             this.grdSum_Pay.BackgroundColor = System.Drawing.Color.Khaki;
             this.grdSum_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.grdSum_Pay.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.grdSum_Pay.Location = new System.Drawing.Point(4, 468);
+            this.grdSum_Pay.Location = new System.Drawing.Point(4, 504);
             this.grdSum_Pay.Margin = new System.Windows.Forms.Padding(4);
             this.grdSum_Pay.Name = "grdSum_Pay";
             this.grdSum_Pay.ReadOnly = true;
@@ -194,7 +194,7 @@
             // 
             this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
             this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdSourceBillNo.Location = new System.Drawing.Point(1332, 15);
+            this.cmdSourceBillNo.Location = new System.Drawing.Point(1152, 19);
             this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
             this.cmdSourceBillNo.Name = "cmdSourceBillNo";
             this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
@@ -206,29 +206,29 @@
             // 
             this.P1.BackColor = System.Drawing.Color.Lavender;
             this.P1.Controls.Add(this.gbUp);
-            this.P1.Controls.Add(this.cmdSourceBillNo);
             this.P1.Dock = System.Windows.Forms.DockStyle.Top;
             this.P1.Location = new System.Drawing.Point(0, 62);
             this.P1.Margin = new System.Windows.Forms.Padding(4);
             this.P1.Name = "P1";
-            this.P1.Size = new System.Drawing.Size(1356, 123);
+            this.P1.Size = new System.Drawing.Size(1356, 87);
             this.P1.TabIndex = 49;
             // 
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
             this.gbUp.Controls.Add(this.txtHMaker);
+            this.gbUp.Controls.Add(this.cmdSourceBillNo);
             this.gbUp.Controls.Add(this.label3);
             this.gbUp.Controls.Add(this.button1);
             this.gbUp.Controls.Add(this.label1);
             this.gbUp.Controls.Add(this.txtNum);
             this.gbUp.Controls.Add(this.txtHBillNo);
             this.gbUp.Controls.Add(this.label2);
-            this.gbUp.Location = new System.Drawing.Point(79, 15);
+            this.gbUp.Location = new System.Drawing.Point(4, 4);
             this.gbUp.Margin = new System.Windows.Forms.Padding(4);
             this.gbUp.Name = "gbUp";
             this.gbUp.Padding = new System.Windows.Forms.Padding(4);
-            this.gbUp.Size = new System.Drawing.Size(1189, 97);
+            this.gbUp.Size = new System.Drawing.Size(1189, 74);
             this.gbUp.TabIndex = 33;
             this.gbUp.TabStop = false;
             // 
@@ -400,7 +400,7 @@
             this.Controls.Add(this.Tool);
             this.Controls.Add(this.grdPrint);
             this.Name = "Gy_BarCodeBill_ChaiMa";
-            this.Text = "Gy_BarCodeBill_ChaiMa";
+            this.Text = "鏉$爜鎷嗙爜";
             this.Load += new System.EventHandler(this.Gy_BarCodeBill_ChaiMa_Load);
             ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
             this.tabControl1.ResumeLayout(false);

--
Gitblit v1.9.1