From d019f02c99ce57fd3c5b244989a8f5e23a9ed471 Mon Sep 17 00:00:00 2001
From: jinghz <jinghz@oceic.com>
Date: 星期一, 27 十一月 2023 15:46:32 +0800
Subject: [PATCH] 促销价
---
NETERP/Program.cs | 2
WarM/仓库管理/Kf_SellOutBill.cs | 11
BaseSet/公用资料/公用基础资料/Gy_Material.designer.cs | 763 ++++++++++++++++++++++++++++-------------------
BaseSet/公用资料/公用基础资料/Gy_Material.cs | 2
BaseSet/公用资料/公用基础资料/Gy_Material.resx | 126 +++---
DAL/基础资料/公用基础资料/ClsGy_Material_View.cs | 1
Model/基础资料/基础资料/ClsGy_Material_Model.cs | 1
DAL/基础资料/公用基础资料/ClsGy_Material_Ctl.cs | 5
8 files changed, 534 insertions(+), 377 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.cs"
index 3a71a10..aec32db 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.cs"
@@ -681,6 +681,7 @@
txtHKeepDays.Text = oGroupHlp.omodel.HKeepDays.ToString();
txtHPlanPrice.Text = oGroupHlp.omodel.HPlanPrice.ToString();
txtHstdPrice.Text = oGroupHlp.omodel.HstdPrice.ToString();
+ txtHRatePrice.Text = oGroupHlp.omodel.HRatePrice.ToString();
txtHQtyMin.Text = oGroupHlp.omodel.HQtyMin.ToString();
txtHQtyMax.Text = oGroupHlp.omodel.HQtyMax.ToString();
txtHVersion.Text = oGroupHlp.omodel.HVersion;
@@ -785,6 +786,7 @@
oGroup.oModel.HSafeStock = DBUtility.ClsPub.isDoule(txtHSafeStock.Text);
oGroup.oModel.HOrderPrice = DBUtility.ClsPub.isDoule(txtHOrderPrice.Text);
oGroup.oModel.HSalePrice = DBUtility.ClsPub.isDoule(txtHSalePrice.Text);
+ oGroup.oModel.HRatePrice = DBUtility.ClsPub.isDoule(txtHRatePrice.Text);
oGroup.oModel.HKeepDays = DBUtility.ClsPub.isDoule(txtHKeepDays.Text);
oGroup.oModel.HPlanPrice = DBUtility.ClsPub.isDoule(txtHPlanPrice.Text);
oGroup.oModel.HstdPrice = DBUtility.ClsPub.isDoule(txtHstdPrice.Text);
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.designer.cs"
index 01d4d03..c14c1c2 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.designer.cs"
@@ -57,6 +57,16 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.label45 = new System.Windows.Forms.Label();
+ this.txtHQuery5 = new System.Windows.Forms.TextBox();
+ this.label43 = new System.Windows.Forms.Label();
+ this.txtHQuery4 = new System.Windows.Forms.TextBox();
+ this.label44 = new System.Windows.Forms.Label();
+ this.txtHQuery3 = new System.Windows.Forms.TextBox();
+ this.label42 = new System.Windows.Forms.Label();
+ this.txtHQuery2 = new System.Windows.Forms.TextBox();
+ this.label41 = new System.Windows.Forms.Label();
+ this.txtHQuery1 = new System.Windows.Forms.TextBox();
this.label36 = new System.Windows.Forms.Label();
this.txtHLastPOPrice = new System.Windows.Forms.TextBox();
this.label35 = new System.Windows.Forms.Label();
@@ -156,21 +166,14 @@
this.label40 = new System.Windows.Forms.Label();
this.btnOK = new System.Windows.Forms.Button();
this.txtHMaterNumber = new System.Windows.Forms.TextBox();
- this.label41 = new System.Windows.Forms.Label();
- this.txtHQuery1 = new System.Windows.Forms.TextBox();
- this.label42 = new System.Windows.Forms.Label();
- this.txtHQuery2 = new System.Windows.Forms.TextBox();
- this.label43 = new System.Windows.Forms.Label();
- this.txtHQuery4 = new System.Windows.Forms.TextBox();
- this.label44 = new System.Windows.Forms.Label();
- this.txtHQuery3 = new System.Windows.Forms.TextBox();
- this.label45 = new System.Windows.Forms.Label();
- this.txtHQuery5 = new System.Windows.Forms.TextBox();
+ this.txtHRatePrice = new System.Windows.Forms.TextBox();
+ this.label46 = new System.Windows.Forms.Label();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -208,7 +211,7 @@
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(1086, 50);
+ this.ToolBar.Size = new System.Drawing.Size(2172, 100);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 13;
this.ToolBar.Text = "toolStrip1";
@@ -243,7 +246,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 100);
//
// xz
//
@@ -291,7 +294,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 100);
//
// cx
//
@@ -324,7 +327,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 100);
//
// fz
//
@@ -357,13 +360,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 100);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 100);
//
// mrlk
//
@@ -373,7 +376,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(114, 94);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -383,7 +386,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 100);
//
// bclk
//
@@ -393,7 +396,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(114, 94);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -403,7 +406,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 100);
//
// tc
//
@@ -422,7 +425,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 100);
//
// imageList1
//
@@ -437,9 +440,10 @@
this.stTab.Controls.Add(this.tabPage2);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
+ this.stTab.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(925, 620);
+ this.stTab.Size = new System.Drawing.Size(1850, 1240);
this.stTab.TabIndex = 15;
//
// tabPage1
@@ -447,10 +451,11 @@
this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(8, 39);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(917, 594);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage1.Size = new System.Drawing.Size(1834, 1193);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
//
@@ -461,12 +466,14 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(6, 6);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersVisible = false;
+ this.grdMain.RowHeadersWidth = 82;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(909, 586);
+ this.grdMain.Size = new System.Drawing.Size(1820, 1179);
this.grdMain.TabIndex = 0;
this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
@@ -476,6 +483,8 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHRatePrice);
+ this.tabPage2.Controls.Add(this.label46);
this.tabPage2.Controls.Add(this.label45);
this.tabPage2.Controls.Add(this.txtHQuery5);
this.tabPage2.Controls.Add(this.label43);
@@ -569,87 +578,192 @@
this.tabPage2.Controls.Add(this.label2);
this.tabPage2.Controls.Add(this.txtHNumber);
this.tabPage2.Controls.Add(this.label1);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(8, 39);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(917, 594);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage2.Size = new System.Drawing.Size(1834, 1193);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // label45
+ //
+ this.label45.AutoSize = true;
+ this.label45.Location = new System.Drawing.Point(976, 812);
+ this.label45.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label45.Name = "label45";
+ this.label45.Size = new System.Drawing.Size(118, 24);
+ this.label45.TabIndex = 292;
+ this.label45.Text = "杈呭姪杩囨护5";
+ //
+ // txtHQuery5
+ //
+ this.txtHQuery5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQuery5.Location = new System.Drawing.Point(1096, 804);
+ this.txtHQuery5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.txtHQuery5.Name = "txtHQuery5";
+ this.txtHQuery5.Size = new System.Drawing.Size(282, 35);
+ this.txtHQuery5.TabIndex = 291;
+ //
+ // label43
+ //
+ this.label43.AutoSize = true;
+ this.label43.Location = new System.Drawing.Point(520, 812);
+ this.label43.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label43.Name = "label43";
+ this.label43.Size = new System.Drawing.Size(118, 24);
+ this.label43.TabIndex = 290;
+ this.label43.Text = "杈呭姪杩囨护4";
+ //
+ // txtHQuery4
+ //
+ this.txtHQuery4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQuery4.Location = new System.Drawing.Point(640, 804);
+ this.txtHQuery4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.txtHQuery4.Name = "txtHQuery4";
+ this.txtHQuery4.Size = new System.Drawing.Size(282, 35);
+ this.txtHQuery4.TabIndex = 289;
+ //
+ // label44
+ //
+ this.label44.AutoSize = true;
+ this.label44.Location = new System.Drawing.Point(60, 812);
+ this.label44.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label44.Name = "label44";
+ this.label44.Size = new System.Drawing.Size(118, 24);
+ this.label44.TabIndex = 288;
+ this.label44.Text = "杈呭姪杩囨护3";
+ //
+ // txtHQuery3
+ //
+ this.txtHQuery3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQuery3.Location = new System.Drawing.Point(180, 804);
+ this.txtHQuery3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.txtHQuery3.Name = "txtHQuery3";
+ this.txtHQuery3.Size = new System.Drawing.Size(282, 35);
+ this.txtHQuery3.TabIndex = 287;
+ //
+ // label42
+ //
+ this.label42.AutoSize = true;
+ this.label42.Location = new System.Drawing.Point(976, 760);
+ this.label42.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label42.Name = "label42";
+ this.label42.Size = new System.Drawing.Size(118, 24);
+ this.label42.TabIndex = 286;
+ this.label42.Text = "杈呭姪杩囨护2";
+ //
+ // txtHQuery2
+ //
+ this.txtHQuery2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQuery2.Location = new System.Drawing.Point(1096, 752);
+ this.txtHQuery2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.txtHQuery2.Name = "txtHQuery2";
+ this.txtHQuery2.Size = new System.Drawing.Size(282, 35);
+ this.txtHQuery2.TabIndex = 285;
+ //
+ // label41
+ //
+ this.label41.AutoSize = true;
+ this.label41.Location = new System.Drawing.Point(520, 758);
+ this.label41.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label41.Name = "label41";
+ this.label41.Size = new System.Drawing.Size(118, 24);
+ this.label41.TabIndex = 284;
+ this.label41.Text = "杈呭姪杩囨护1";
+ //
+ // txtHQuery1
+ //
+ this.txtHQuery1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQuery1.Location = new System.Drawing.Point(640, 750);
+ this.txtHQuery1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.txtHQuery1.Name = "txtHQuery1";
+ this.txtHQuery1.Size = new System.Drawing.Size(282, 35);
+ this.txtHQuery1.TabIndex = 283;
//
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(7, 378);
+ this.label36.Location = new System.Drawing.Point(14, 756);
+ this.label36.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(77, 12);
+ this.label36.Size = new System.Drawing.Size(154, 24);
this.label36.TabIndex = 282;
this.label36.Text = "鏈�鏂伴噰璐崟浠�";
//
// txtHLastPOPrice
//
this.txtHLastPOPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHLastPOPrice.Location = new System.Drawing.Point(90, 374);
+ this.txtHLastPOPrice.Location = new System.Drawing.Point(180, 748);
+ this.txtHLastPOPrice.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHLastPOPrice.Name = "txtHLastPOPrice";
- this.txtHLastPOPrice.Size = new System.Drawing.Size(143, 21);
+ this.txtHLastPOPrice.Size = new System.Drawing.Size(282, 35);
this.txtHLastPOPrice.TabIndex = 281;
//
// label35
//
this.label35.AutoSize = true;
- this.label35.Location = new System.Drawing.Point(260, 90);
+ this.label35.Location = new System.Drawing.Point(520, 180);
+ this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(59, 12);
+ this.label35.Size = new System.Drawing.Size(118, 24);
this.label35.TabIndex = 280;
this.label35.Text = "闄勫姞灞炴��2";
//
// txtHSubjoin2
//
this.txtHSubjoin2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSubjoin2.Location = new System.Drawing.Point(320, 86);
+ this.txtHSubjoin2.Location = new System.Drawing.Point(640, 172);
+ this.txtHSubjoin2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSubjoin2.Name = "txtHSubjoin2";
- this.txtHSubjoin2.Size = new System.Drawing.Size(143, 21);
+ this.txtHSubjoin2.Size = new System.Drawing.Size(282, 35);
this.txtHSubjoin2.TabIndex = 279;
//
// label34
//
this.label34.AutoSize = true;
- this.label34.Location = new System.Drawing.Point(488, 90);
+ this.label34.Location = new System.Drawing.Point(976, 180);
+ this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(53, 12);
+ this.label34.Size = new System.Drawing.Size(106, 24);
this.label34.TabIndex = 278;
this.label34.Text = "棰� 鑹�";
//
// txtHColor
//
this.txtHColor.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHColor.Location = new System.Drawing.Point(548, 86);
+ this.txtHColor.Location = new System.Drawing.Point(1096, 172);
+ this.txtHColor.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHColor.Name = "txtHColor";
- this.txtHColor.Size = new System.Drawing.Size(143, 21);
+ this.txtHColor.Size = new System.Drawing.Size(282, 35);
this.txtHColor.TabIndex = 277;
//
// label33
//
this.label33.AutoSize = true;
- this.label33.Location = new System.Drawing.Point(30, 89);
+ this.label33.Location = new System.Drawing.Point(60, 178);
+ this.label33.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(29, 12);
+ this.label33.Size = new System.Drawing.Size(58, 24);
this.label33.TabIndex = 276;
this.label33.Text = "浜у湴";
//
// txtHSubjoin
//
this.txtHSubjoin.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSubjoin.Location = new System.Drawing.Point(90, 85);
+ this.txtHSubjoin.Location = new System.Drawing.Point(180, 170);
+ this.txtHSubjoin.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSubjoin.Name = "txtHSubjoin";
- this.txtHSubjoin.Size = new System.Drawing.Size(143, 21);
+ this.txtHSubjoin.Size = new System.Drawing.Size(282, 35);
this.txtHSubjoin.TabIndex = 275;
//
// txtHSPGroupID
//
this.txtHSPGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSPGroupID.Location = new System.Drawing.Point(90, 149);
+ this.txtHSPGroupID.Location = new System.Drawing.Point(180, 298);
+ this.txtHSPGroupID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSPGroupID.Name = "txtHSPGroupID";
- this.txtHSPGroupID.Size = new System.Drawing.Size(120, 21);
+ this.txtHSPGroupID.Size = new System.Drawing.Size(236, 35);
this.txtHSPGroupID.TabIndex = 273;
this.txtHSPGroupID.Tag = "0";
this.txtHSPGroupID.TextChanged += new System.EventHandler(this.txtHSPGroupID_TextChanged);
@@ -659,9 +773,10 @@
this.cmdHSPGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSPGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSPGroupID.Image")));
this.cmdHSPGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSPGroupID.Location = new System.Drawing.Point(211, 148);
+ this.cmdHSPGroupID.Location = new System.Drawing.Point(422, 296);
+ this.cmdHSPGroupID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHSPGroupID.Name = "cmdHSPGroupID";
- this.cmdHSPGroupID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHSPGroupID.Size = new System.Drawing.Size(44, 44);
this.cmdHSPGroupID.TabIndex = 274;
this.cmdHSPGroupID.UseVisualStyleBackColor = false;
this.cmdHSPGroupID.Click += new System.EventHandler(this.cmdHSPGroupID_Click);
@@ -670,9 +785,10 @@
//
this.label31.AutoSize = true;
this.label31.ForeColor = System.Drawing.Color.Black;
- this.label31.Location = new System.Drawing.Point(26, 153);
+ this.label31.Location = new System.Drawing.Point(52, 306);
+ this.label31.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(65, 12);
+ this.label31.Size = new System.Drawing.Size(130, 24);
this.label31.TabIndex = 272;
this.label31.Text = "榛樿浠撲綅缁�";
//
@@ -681,9 +797,10 @@
this.cmdHSPID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSPID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSPID.Image")));
this.cmdHSPID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSPID.Location = new System.Drawing.Point(441, 148);
+ this.cmdHSPID.Location = new System.Drawing.Point(882, 296);
+ this.cmdHSPID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHSPID.Name = "cmdHSPID";
- this.cmdHSPID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHSPID.Size = new System.Drawing.Size(44, 44);
this.cmdHSPID.TabIndex = 271;
this.cmdHSPID.UseVisualStyleBackColor = false;
this.cmdHSPID.Click += new System.EventHandler(this.cmdHSPID_Click);
@@ -692,18 +809,20 @@
//
this.label32.AutoSize = true;
this.label32.ForeColor = System.Drawing.Color.Black;
- this.label32.Location = new System.Drawing.Point(260, 153);
+ this.label32.Location = new System.Drawing.Point(520, 306);
+ this.label32.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(53, 12);
+ this.label32.Size = new System.Drawing.Size(106, 24);
this.label32.TabIndex = 269;
this.label32.Text = "榛樿浠撲綅";
//
// txtHSPID
//
this.txtHSPID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSPID.Location = new System.Drawing.Point(320, 149);
+ this.txtHSPID.Location = new System.Drawing.Point(640, 298);
+ this.txtHSPID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSPID.Name = "txtHSPID";
- this.txtHSPID.Size = new System.Drawing.Size(120, 21);
+ this.txtHSPID.Size = new System.Drawing.Size(236, 35);
this.txtHSPID.TabIndex = 270;
this.txtHSPID.Tag = "0";
this.txtHSPID.TextChanged += new System.EventHandler(this.txtHSPID_TextChanged);
@@ -711,9 +830,10 @@
// txtHSecUnitID
//
this.txtHSecUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSecUnitID.Location = new System.Drawing.Point(548, 182);
+ this.txtHSecUnitID.Location = new System.Drawing.Point(1096, 364);
+ this.txtHSecUnitID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSecUnitID.Name = "txtHSecUnitID";
- this.txtHSecUnitID.Size = new System.Drawing.Size(120, 21);
+ this.txtHSecUnitID.Size = new System.Drawing.Size(236, 35);
this.txtHSecUnitID.TabIndex = 267;
this.txtHSecUnitID.Tag = "0";
this.txtHSecUnitID.TextChanged += new System.EventHandler(this.txtHSecUnitID_TextChanged);
@@ -721,9 +841,10 @@
// txtHRoutingID
//
this.txtHRoutingID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRoutingID.Location = new System.Drawing.Point(90, 182);
+ this.txtHRoutingID.Location = new System.Drawing.Point(180, 364);
+ this.txtHRoutingID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHRoutingID.Name = "txtHRoutingID";
- this.txtHRoutingID.Size = new System.Drawing.Size(120, 21);
+ this.txtHRoutingID.Size = new System.Drawing.Size(236, 35);
this.txtHRoutingID.TabIndex = 255;
this.txtHRoutingID.Tag = "0";
this.txtHRoutingID.TextChanged += new System.EventHandler(this.txtHRoutingID_TextChanged);
@@ -731,9 +852,10 @@
// txtHUnitGroupID
//
this.txtHUnitGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitGroupID.Location = new System.Drawing.Point(548, 56);
+ this.txtHUnitGroupID.Location = new System.Drawing.Point(1096, 112);
+ this.txtHUnitGroupID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHUnitGroupID.Name = "txtHUnitGroupID";
- this.txtHUnitGroupID.Size = new System.Drawing.Size(120, 21);
+ this.txtHUnitGroupID.Size = new System.Drawing.Size(236, 35);
this.txtHUnitGroupID.TabIndex = 236;
this.txtHUnitGroupID.Tag = "0";
this.txtHUnitGroupID.TextChanged += new System.EventHandler(this.txtHUnitGroupID_TextChanged);
@@ -741,19 +863,21 @@
// txtHQtyMin
//
this.txtHQtyMin.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQtyMin.Location = new System.Drawing.Point(90, 312);
+ this.txtHQtyMin.Location = new System.Drawing.Point(180, 624);
+ this.txtHQtyMin.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHQtyMin.Name = "txtHQtyMin";
- this.txtHQtyMin.Size = new System.Drawing.Size(143, 21);
+ this.txtHQtyMin.Size = new System.Drawing.Size(282, 35);
this.txtHQtyMin.TabIndex = 220;
//
// txtHUnitID
//
this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitID.Location = new System.Drawing.Point(320, 56);
+ this.txtHUnitID.Location = new System.Drawing.Point(640, 112);
+ this.txtHUnitID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHUnitID.Name = "txtHUnitID";
this.txtHUnitID.ReadOnly = true;
- this.txtHUnitID.Size = new System.Drawing.Size(120, 21);
+ this.txtHUnitID.Size = new System.Drawing.Size(236, 35);
this.txtHUnitID.TabIndex = 192;
this.txtHUnitID.Tag = "0";
this.txtHUnitID.TextChanged += new System.EventHandler(this.txtHUnitID_TextChanged);
@@ -763,9 +887,10 @@
this.cmdHSecUnitID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSecUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSecUnitID.Image")));
this.cmdHSecUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSecUnitID.Location = new System.Drawing.Point(669, 181);
+ this.cmdHSecUnitID.Location = new System.Drawing.Point(1338, 362);
+ this.cmdHSecUnitID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHSecUnitID.Name = "cmdHSecUnitID";
- this.cmdHSecUnitID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHSecUnitID.Size = new System.Drawing.Size(44, 44);
this.cmdHSecUnitID.TabIndex = 268;
this.cmdHSecUnitID.UseVisualStyleBackColor = false;
this.cmdHSecUnitID.Click += new System.EventHandler(this.cmdHSecUnitID_Click);
@@ -774,9 +899,10 @@
//
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.Color.Black;
- this.label22.Location = new System.Drawing.Point(472, 186);
+ this.label22.Location = new System.Drawing.Point(944, 372);
+ this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(77, 12);
+ this.label22.Size = new System.Drawing.Size(154, 24);
this.label22.TabIndex = 266;
this.label22.Text = "杈呭姪璁￠噺鍗曚綅";
//
@@ -785,9 +911,10 @@
this.cmdHPropertyTypeID.BackColor = System.Drawing.Color.Transparent;
this.cmdHPropertyTypeID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHPropertyTypeID.Image")));
this.cmdHPropertyTypeID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHPropertyTypeID.Location = new System.Drawing.Point(669, 343);
+ this.cmdHPropertyTypeID.Location = new System.Drawing.Point(1338, 686);
+ this.cmdHPropertyTypeID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHPropertyTypeID.Name = "cmdHPropertyTypeID";
- this.cmdHPropertyTypeID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHPropertyTypeID.Size = new System.Drawing.Size(44, 44);
this.cmdHPropertyTypeID.TabIndex = 265;
this.cmdHPropertyTypeID.UseVisualStyleBackColor = false;
this.cmdHPropertyTypeID.Click += new System.EventHandler(this.cmdHPropertyTypeID_Click);
@@ -796,18 +923,20 @@
//
this.label25.AutoSize = true;
this.label25.ForeColor = System.Drawing.Color.Black;
- this.label25.Location = new System.Drawing.Point(488, 348);
+ this.label25.Location = new System.Drawing.Point(976, 696);
+ this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(53, 12);
+ this.label25.Size = new System.Drawing.Size(106, 24);
this.label25.TabIndex = 263;
this.label25.Text = "杈呭姪灞炴��";
//
// txtHPropertyTypeID
//
this.txtHPropertyTypeID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPropertyTypeID.Location = new System.Drawing.Point(548, 344);
+ this.txtHPropertyTypeID.Location = new System.Drawing.Point(1096, 688);
+ this.txtHPropertyTypeID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHPropertyTypeID.Name = "txtHPropertyTypeID";
- this.txtHPropertyTypeID.Size = new System.Drawing.Size(120, 21);
+ this.txtHPropertyTypeID.Size = new System.Drawing.Size(236, 35);
this.txtHPropertyTypeID.TabIndex = 264;
this.txtHPropertyTypeID.Tag = "0";
this.txtHPropertyTypeID.TextChanged += new System.EventHandler(this.txtHPropertyTypeID_TextChanged);
@@ -817,9 +946,10 @@
this.cmdHBomID.BackColor = System.Drawing.Color.Transparent;
this.cmdHBomID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBomID.Image")));
this.cmdHBomID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBomID.Location = new System.Drawing.Point(441, 181);
+ this.cmdHBomID.Location = new System.Drawing.Point(882, 362);
+ this.cmdHBomID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHBomID.Name = "cmdHBomID";
- this.cmdHBomID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBomID.Size = new System.Drawing.Size(44, 44);
this.cmdHBomID.TabIndex = 262;
this.cmdHBomID.UseVisualStyleBackColor = false;
this.cmdHBomID.Click += new System.EventHandler(this.cmdHBomID_Click);
@@ -828,18 +958,20 @@
//
this.label30.AutoSize = true;
this.label30.ForeColor = System.Drawing.Color.Black;
- this.label30.Location = new System.Drawing.Point(260, 186);
+ this.label30.Location = new System.Drawing.Point(520, 372);
+ this.label30.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(47, 12);
+ this.label30.Size = new System.Drawing.Size(94, 24);
this.label30.TabIndex = 260;
this.label30.Text = "榛樿BOM";
//
// txtHBomID
//
this.txtHBomID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBomID.Location = new System.Drawing.Point(320, 182);
+ this.txtHBomID.Location = new System.Drawing.Point(640, 364);
+ this.txtHBomID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHBomID.Name = "txtHBomID";
- this.txtHBomID.Size = new System.Drawing.Size(120, 21);
+ this.txtHBomID.Size = new System.Drawing.Size(236, 35);
this.txtHBomID.TabIndex = 261;
this.txtHBomID.Tag = "0";
this.txtHBomID.TextChanged += new System.EventHandler(this.txtHBomID_TextChanged);
@@ -849,9 +981,10 @@
this.cmdHWhID.BackColor = System.Drawing.Color.Transparent;
this.cmdHWhID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWhID.Image")));
this.cmdHWhID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWhID.Location = new System.Drawing.Point(669, 116);
+ this.cmdHWhID.Location = new System.Drawing.Point(1338, 232);
+ this.cmdHWhID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHWhID.Name = "cmdHWhID";
- this.cmdHWhID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWhID.Size = new System.Drawing.Size(44, 44);
this.cmdHWhID.TabIndex = 259;
this.cmdHWhID.UseVisualStyleBackColor = false;
this.cmdHWhID.Click += new System.EventHandler(this.cmdHWhID_Click);
@@ -860,18 +993,20 @@
//
this.label21.AutoSize = true;
this.label21.ForeColor = System.Drawing.Color.Black;
- this.label21.Location = new System.Drawing.Point(488, 121);
+ this.label21.Location = new System.Drawing.Point(976, 242);
+ this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(53, 12);
+ this.label21.Size = new System.Drawing.Size(106, 24);
this.label21.TabIndex = 257;
this.label21.Text = "榛樿浠撳簱";
//
// txtHWhID
//
this.txtHWhID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWhID.Location = new System.Drawing.Point(548, 117);
+ this.txtHWhID.Location = new System.Drawing.Point(1096, 234);
+ this.txtHWhID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHWhID.Name = "txtHWhID";
- this.txtHWhID.Size = new System.Drawing.Size(120, 21);
+ this.txtHWhID.Size = new System.Drawing.Size(236, 35);
this.txtHWhID.TabIndex = 258;
this.txtHWhID.Tag = "0";
this.txtHWhID.TextChanged += new System.EventHandler(this.txtHWhID_TextChanged);
@@ -881,9 +1016,10 @@
this.cmdHRoutingID.BackColor = System.Drawing.Color.Transparent;
this.cmdHRoutingID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHRoutingID.Image")));
this.cmdHRoutingID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHRoutingID.Location = new System.Drawing.Point(211, 181);
+ this.cmdHRoutingID.Location = new System.Drawing.Point(422, 362);
+ this.cmdHRoutingID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHRoutingID.Name = "cmdHRoutingID";
- this.cmdHRoutingID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHRoutingID.Size = new System.Drawing.Size(44, 44);
this.cmdHRoutingID.TabIndex = 256;
this.cmdHRoutingID.UseVisualStyleBackColor = false;
this.cmdHRoutingID.Click += new System.EventHandler(this.cmdHRoutingID_Click);
@@ -892,121 +1028,135 @@
//
this.label20.AutoSize = true;
this.label20.ForeColor = System.Drawing.Color.Black;
- this.label20.Location = new System.Drawing.Point(14, 186);
+ this.label20.Location = new System.Drawing.Point(28, 372);
+ this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(77, 12);
+ this.label20.Size = new System.Drawing.Size(154, 24);
this.label20.TabIndex = 254;
this.label20.Text = "榛樿宸ヨ壓璺嚎";
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(672, 284);
+ this.label19.Location = new System.Drawing.Point(1344, 306);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(17, 12);
+ this.label19.Size = new System.Drawing.Size(34, 24);
this.label19.TabIndex = 253;
this.label19.Text = "澶�";
//
// txtHQtyMax
//
this.txtHQtyMax.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQtyMax.Location = new System.Drawing.Point(320, 312);
+ this.txtHQtyMax.Location = new System.Drawing.Point(644, 621);
+ this.txtHQtyMax.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHQtyMax.Name = "txtHQtyMax";
- this.txtHQtyMax.Size = new System.Drawing.Size(143, 21);
+ this.txtHQtyMax.Size = new System.Drawing.Size(282, 35);
this.txtHQtyMax.TabIndex = 244;
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(260, 348);
+ this.label8.Location = new System.Drawing.Point(520, 696);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.Size = new System.Drawing.Size(106, 24);
this.label8.TabIndex = 252;
this.label8.Text = "鑻辨枃瑙勬牸";
//
// txtHEngModel
//
this.txtHEngModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEngModel.Location = new System.Drawing.Point(320, 344);
+ this.txtHEngModel.Location = new System.Drawing.Point(640, 688);
+ this.txtHEngModel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHEngModel.Name = "txtHEngModel";
- this.txtHEngModel.Size = new System.Drawing.Size(143, 21);
+ this.txtHEngModel.Size = new System.Drawing.Size(282, 35);
this.txtHEngModel.TabIndex = 251;
//
// label29
//
this.label29.AutoSize = true;
- this.label29.Location = new System.Drawing.Point(30, 348);
+ this.label29.Location = new System.Drawing.Point(60, 696);
+ this.label29.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(53, 12);
+ this.label29.Size = new System.Drawing.Size(106, 24);
this.label29.TabIndex = 249;
this.label29.Text = "鑻辨枃鍚嶇О";
//
// txtHEngName
//
this.txtHEngName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEngName.Location = new System.Drawing.Point(90, 344);
+ this.txtHEngName.Location = new System.Drawing.Point(180, 688);
+ this.txtHEngName.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHEngName.Name = "txtHEngName";
- this.txtHEngName.Size = new System.Drawing.Size(143, 21);
+ this.txtHEngName.Size = new System.Drawing.Size(282, 35);
this.txtHEngName.TabIndex = 248;
//
// label27
//
this.label27.AutoSize = true;
- this.label27.Location = new System.Drawing.Point(30, 284);
+ this.label27.Location = new System.Drawing.Point(60, 568);
+ this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(53, 12);
+ this.label27.Size = new System.Drawing.Size(106, 24);
this.label27.TabIndex = 247;
this.label27.Text = "璁″垝鍗曚环";
//
// txtHPlanPrice
//
this.txtHPlanPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanPrice.Location = new System.Drawing.Point(90, 280);
+ this.txtHPlanPrice.Location = new System.Drawing.Point(180, 560);
+ this.txtHPlanPrice.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHPlanPrice.Name = "txtHPlanPrice";
- this.txtHPlanPrice.Size = new System.Drawing.Size(143, 21);
+ this.txtHPlanPrice.Size = new System.Drawing.Size(282, 35);
this.txtHPlanPrice.TabIndex = 246;
//
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(256, 316);
+ this.label26.Location = new System.Drawing.Point(516, 629);
+ this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(65, 12);
+ this.label26.Size = new System.Drawing.Size(130, 24);
this.label26.TabIndex = 245;
this.label26.Text = "鏈�澶ц璐ч噺";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(488, 316);
+ this.label11.Location = new System.Drawing.Point(976, 632);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.Size = new System.Drawing.Size(106, 24);
this.label11.TabIndex = 241;
this.label11.Text = "鐗� 鏈� 鍙�";
//
// txtHVersion
//
this.txtHVersion.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHVersion.Location = new System.Drawing.Point(548, 312);
+ this.txtHVersion.Location = new System.Drawing.Point(1096, 624);
+ this.txtHVersion.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHVersion.Name = "txtHVersion";
- this.txtHVersion.Size = new System.Drawing.Size(143, 21);
+ this.txtHVersion.Size = new System.Drawing.Size(282, 35);
this.txtHVersion.TabIndex = 240;
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(260, 220);
+ this.label10.Location = new System.Drawing.Point(520, 440);
+ this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.Size = new System.Drawing.Size(106, 24);
this.label10.TabIndex = 239;
this.label10.Text = "鏈�楂樺簱瀛�";
//
// txtHHighStock
//
this.txtHHighStock.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHHighStock.Location = new System.Drawing.Point(320, 216);
+ this.txtHHighStock.Location = new System.Drawing.Point(640, 432);
+ this.txtHHighStock.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHHighStock.Name = "txtHHighStock";
- this.txtHHighStock.Size = new System.Drawing.Size(143, 21);
+ this.txtHHighStock.Size = new System.Drawing.Size(282, 35);
this.txtHHighStock.TabIndex = 238;
//
// cmdHUnitGroupID
@@ -1014,9 +1164,10 @@
this.cmdHUnitGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHUnitGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitGroupID.Image")));
this.cmdHUnitGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHUnitGroupID.Location = new System.Drawing.Point(669, 55);
+ this.cmdHUnitGroupID.Location = new System.Drawing.Point(1338, 110);
+ this.cmdHUnitGroupID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHUnitGroupID.Name = "cmdHUnitGroupID";
- this.cmdHUnitGroupID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHUnitGroupID.Size = new System.Drawing.Size(44, 44);
this.cmdHUnitGroupID.TabIndex = 237;
this.cmdHUnitGroupID.UseVisualStyleBackColor = false;
this.cmdHUnitGroupID.Click += new System.EventHandler(this.cmdHUnitGroupID_Click);
@@ -1025,9 +1176,10 @@
//
this.label24.AutoSize = true;
this.label24.ForeColor = System.Drawing.Color.Black;
- this.label24.Location = new System.Drawing.Point(484, 60);
+ this.label24.Location = new System.Drawing.Point(968, 120);
+ this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(65, 12);
+ this.label24.Size = new System.Drawing.Size(130, 24);
this.label24.TabIndex = 235;
this.label24.Text = "璁￠噺鍗曚綅缁�";
//
@@ -1036,9 +1188,10 @@
this.cmdHMaterClsID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterClsID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterClsID.Image")));
this.cmdHMaterClsID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterClsID.Location = new System.Drawing.Point(211, 116);
+ this.cmdHMaterClsID.Location = new System.Drawing.Point(422, 232);
+ this.cmdHMaterClsID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHMaterClsID.Name = "cmdHMaterClsID";
- this.cmdHMaterClsID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHMaterClsID.Size = new System.Drawing.Size(44, 44);
this.cmdHMaterClsID.TabIndex = 234;
this.cmdHMaterClsID.UseVisualStyleBackColor = false;
this.cmdHMaterClsID.Click += new System.EventHandler(this.cmdHMaterClsID_Click);
@@ -1047,9 +1200,10 @@
//
this.label23.AutoSize = true;
this.label23.ForeColor = System.Drawing.Color.Black;
- this.label23.Location = new System.Drawing.Point(30, 121);
+ this.label23.Location = new System.Drawing.Point(60, 242);
+ this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(53, 12);
+ this.label23.Size = new System.Drawing.Size(106, 24);
this.label23.TabIndex = 232;
this.label23.Text = "鐗╂枡鍒嗙被";
//
@@ -1057,10 +1211,11 @@
//
this.txtHMaterClsID.BackColor = System.Drawing.Color.Beige;
this.txtHMaterClsID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterClsID.Location = new System.Drawing.Point(90, 117);
+ this.txtHMaterClsID.Location = new System.Drawing.Point(180, 234);
+ this.txtHMaterClsID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHMaterClsID.Name = "txtHMaterClsID";
this.txtHMaterClsID.ReadOnly = true;
- this.txtHMaterClsID.Size = new System.Drawing.Size(120, 21);
+ this.txtHMaterClsID.Size = new System.Drawing.Size(236, 35);
this.txtHMaterClsID.TabIndex = 233;
this.txtHMaterClsID.Tag = "0";
this.txtHMaterClsID.TextChanged += new System.EventHandler(this.txtHMaterClsID_TextChanged);
@@ -1068,112 +1223,125 @@
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(26, 316);
+ this.label18.Location = new System.Drawing.Point(52, 632);
+ this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(65, 12);
+ this.label18.Size = new System.Drawing.Size(130, 24);
this.label18.TabIndex = 221;
this.label18.Text = "鏈�灏忓寘瑁呴噺";
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(260, 284);
+ this.label17.Location = new System.Drawing.Point(520, 568);
+ this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(53, 12);
+ this.label17.Size = new System.Drawing.Size(106, 24);
this.label17.TabIndex = 219;
this.label17.Text = "鏍囧噯鎴愭湰";
//
// txtHstdPrice
//
this.txtHstdPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHstdPrice.Location = new System.Drawing.Point(320, 280);
+ this.txtHstdPrice.Location = new System.Drawing.Point(640, 560);
+ this.txtHstdPrice.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHstdPrice.Name = "txtHstdPrice";
- this.txtHstdPrice.Size = new System.Drawing.Size(143, 21);
+ this.txtHstdPrice.Size = new System.Drawing.Size(282, 35);
this.txtHstdPrice.TabIndex = 218;
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(488, 220);
+ this.label16.Location = new System.Drawing.Point(976, 440);
+ this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(53, 12);
+ this.label16.Size = new System.Drawing.Size(106, 24);
this.label16.TabIndex = 217;
this.label16.Text = "鏈�浣庡簱瀛�";
//
// txtHLowStock
//
this.txtHLowStock.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHLowStock.Location = new System.Drawing.Point(548, 216);
+ this.txtHLowStock.Location = new System.Drawing.Point(1096, 432);
+ this.txtHLowStock.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHLowStock.Name = "txtHLowStock";
- this.txtHLowStock.Size = new System.Drawing.Size(143, 21);
+ this.txtHLowStock.Size = new System.Drawing.Size(282, 35);
this.txtHLowStock.TabIndex = 216;
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(30, 252);
+ this.label15.Location = new System.Drawing.Point(60, 504);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(53, 12);
+ this.label15.Size = new System.Drawing.Size(106, 24);
this.label15.TabIndex = 215;
this.label15.Text = "瀹夊叏搴撳瓨";
//
// txtHSafeStock
//
this.txtHSafeStock.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSafeStock.Location = new System.Drawing.Point(90, 248);
+ this.txtHSafeStock.Location = new System.Drawing.Point(180, 496);
+ this.txtHSafeStock.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSafeStock.Name = "txtHSafeStock";
- this.txtHSafeStock.Size = new System.Drawing.Size(143, 21);
+ this.txtHSafeStock.Size = new System.Drawing.Size(282, 35);
this.txtHSafeStock.TabIndex = 214;
//
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(260, 252);
+ this.label14.Location = new System.Drawing.Point(520, 504);
+ this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.Size = new System.Drawing.Size(106, 24);
this.label14.TabIndex = 213;
this.label14.Text = "閲囪喘鍗曚环";
//
// txtHOrderPrice
//
this.txtHOrderPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderPrice.Location = new System.Drawing.Point(320, 248);
+ this.txtHOrderPrice.Location = new System.Drawing.Point(640, 496);
+ this.txtHOrderPrice.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHOrderPrice.Name = "txtHOrderPrice";
- this.txtHOrderPrice.Size = new System.Drawing.Size(143, 21);
+ this.txtHOrderPrice.Size = new System.Drawing.Size(282, 35);
this.txtHOrderPrice.TabIndex = 212;
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(488, 252);
+ this.label13.Location = new System.Drawing.Point(976, 504);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(53, 12);
+ this.label13.Size = new System.Drawing.Size(106, 24);
this.label13.TabIndex = 211;
this.label13.Text = "閿�鍞崟浠�";
//
// txtHSalePrice
//
this.txtHSalePrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSalePrice.Location = new System.Drawing.Point(548, 248);
+ this.txtHSalePrice.Location = new System.Drawing.Point(1096, 496);
+ this.txtHSalePrice.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSalePrice.Name = "txtHSalePrice";
- this.txtHSalePrice.Size = new System.Drawing.Size(143, 21);
+ this.txtHSalePrice.Size = new System.Drawing.Size(282, 35);
this.txtHSalePrice.TabIndex = 210;
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(488, 284);
+ this.label12.Location = new System.Drawing.Point(976, 306);
+ this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(53, 12);
+ this.label12.Size = new System.Drawing.Size(106, 24);
this.label12.TabIndex = 209;
this.label12.Text = "淇� 璐� 鏈�";
//
// txtHKeepDays
//
this.txtHKeepDays.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHKeepDays.Location = new System.Drawing.Point(548, 280);
+ this.txtHKeepDays.Location = new System.Drawing.Point(1096, 298);
+ this.txtHKeepDays.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHKeepDays.Name = "txtHKeepDays";
- this.txtHKeepDays.Size = new System.Drawing.Size(120, 21);
+ this.txtHKeepDays.Size = new System.Drawing.Size(236, 35);
this.txtHKeepDays.TabIndex = 208;
//
// cmdHMaterTypeID
@@ -1181,9 +1349,10 @@
this.cmdHMaterTypeID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterTypeID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterTypeID.Image")));
this.cmdHMaterTypeID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterTypeID.Location = new System.Drawing.Point(441, 116);
+ this.cmdHMaterTypeID.Location = new System.Drawing.Point(882, 232);
+ this.cmdHMaterTypeID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHMaterTypeID.Name = "cmdHMaterTypeID";
- this.cmdHMaterTypeID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHMaterTypeID.Size = new System.Drawing.Size(44, 44);
this.cmdHMaterTypeID.TabIndex = 202;
this.cmdHMaterTypeID.UseVisualStyleBackColor = false;
this.cmdHMaterTypeID.Visible = false;
@@ -1193,9 +1362,10 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(260, 121);
+ this.label9.Location = new System.Drawing.Point(520, 242);
+ this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.Size = new System.Drawing.Size(106, 24);
this.label9.TabIndex = 200;
this.label9.Text = "鐗╂枡灞炴��";
this.label9.Visible = false;
@@ -1203,9 +1373,10 @@
// txtHMaterTypeID
//
this.txtHMaterTypeID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterTypeID.Location = new System.Drawing.Point(320, 117);
+ this.txtHMaterTypeID.Location = new System.Drawing.Point(640, 234);
+ this.txtHMaterTypeID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHMaterTypeID.Name = "txtHMaterTypeID";
- this.txtHMaterTypeID.Size = new System.Drawing.Size(120, 21);
+ this.txtHMaterTypeID.Size = new System.Drawing.Size(236, 35);
this.txtHMaterTypeID.TabIndex = 201;
this.txtHMaterTypeID.Tag = "0";
this.txtHMaterTypeID.Visible = false;
@@ -1214,35 +1385,39 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(488, 28);
+ this.label7.Location = new System.Drawing.Point(976, 56);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.Size = new System.Drawing.Size(106, 24);
this.label7.TabIndex = 197;
this.label7.Text = "瑙勬牸鍨嬪彿";
//
// txtHModel
//
this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel.Location = new System.Drawing.Point(548, 24);
+ this.txtHModel.Location = new System.Drawing.Point(1096, 48);
+ this.txtHModel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHModel.Name = "txtHModel";
- this.txtHModel.Size = new System.Drawing.Size(143, 21);
+ this.txtHModel.Size = new System.Drawing.Size(282, 35);
this.txtHModel.TabIndex = 196;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(30, 220);
+ this.label6.Location = new System.Drawing.Point(60, 440);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.Size = new System.Drawing.Size(106, 24);
this.label6.TabIndex = 195;
this.label6.Text = "鎹� 绠� 鐜�";
//
// txtHSecUnitRate
//
this.txtHSecUnitRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSecUnitRate.Location = new System.Drawing.Point(90, 216);
+ this.txtHSecUnitRate.Location = new System.Drawing.Point(180, 432);
+ this.txtHSecUnitRate.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHSecUnitRate.Name = "txtHSecUnitRate";
- this.txtHSecUnitRate.Size = new System.Drawing.Size(143, 21);
+ this.txtHSecUnitRate.Size = new System.Drawing.Size(282, 35);
this.txtHSecUnitRate.TabIndex = 194;
//
// cmdHUnitID
@@ -1250,9 +1425,10 @@
this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHUnitID.Location = new System.Drawing.Point(441, 55);
+ this.cmdHUnitID.Location = new System.Drawing.Point(882, 110);
+ this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdHUnitID.Name = "cmdHUnitID";
- this.cmdHUnitID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHUnitID.Size = new System.Drawing.Size(44, 44);
this.cmdHUnitID.TabIndex = 193;
this.cmdHUnitID.UseVisualStyleBackColor = false;
this.cmdHUnitID.Click += new System.EventHandler(this.cmdHUnitID_Click);
@@ -1261,9 +1437,10 @@
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(256, 60);
+ this.label28.Location = new System.Drawing.Point(512, 120);
+ this.label28.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(65, 12);
+ this.label28.Size = new System.Drawing.Size(130, 24);
this.label28.TabIndex = 191;
this.label28.Text = "涓昏閲忓崟浣�";
//
@@ -1271,25 +1448,28 @@
//
this.txtHName.BackColor = System.Drawing.Color.Beige;
this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHName.Location = new System.Drawing.Point(320, 24);
+ this.txtHName.Location = new System.Drawing.Point(640, 48);
+ this.txtHName.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHName.Name = "txtHName";
- this.txtHName.Size = new System.Drawing.Size(143, 21);
+ this.txtHName.Size = new System.Drawing.Size(282, 35);
this.txtHName.TabIndex = 18;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(30, 60);
+ this.label4.Location = new System.Drawing.Point(60, 120);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(106, 24);
this.label4.TabIndex = 17;
this.label4.Text = "鍔� 璁� 鐮�";
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(575, 508);
+ this.cmdCancel.Location = new System.Drawing.Point(1150, 1016);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(52, 23);
+ this.cmdCancel.Size = new System.Drawing.Size(104, 46);
this.cmdCancel.TabIndex = 16;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -1297,9 +1477,10 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(517, 508);
+ this.cmdOK.Location = new System.Drawing.Point(1034, 1016);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(52, 23);
+ this.cmdOK.Size = new System.Drawing.Size(104, 46);
this.cmdOK.TabIndex = 15;
this.cmdOK.Text = "淇� 瀛�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -1308,9 +1489,10 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(168, 511);
+ this.chkHStopflag.Location = new System.Drawing.Point(336, 1022);
+ this.chkHStopflag.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.chkHStopflag.Name = "chkHStopflag";
- this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
+ this.chkHStopflag.Size = new System.Drawing.Size(138, 28);
this.chkHStopflag.TabIndex = 12;
this.chkHStopflag.Text = "绂佺敤鏍囧織";
this.chkHStopflag.UseVisualStyleBackColor = true;
@@ -1318,35 +1500,39 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(90, 431);
+ this.txtHRemark.Location = new System.Drawing.Point(180, 862);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(601, 66);
+ this.txtHRemark.Size = new System.Drawing.Size(1198, 128);
this.txtHRemark.TabIndex = 10;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(30, 433);
+ this.label5.Location = new System.Drawing.Point(60, 866);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.Size = new System.Drawing.Size(106, 24);
this.label5.TabIndex = 9;
this.label5.Text = "澶� 娉�";
//
// txtHHelpCode
//
this.txtHHelpCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHHelpCode.Location = new System.Drawing.Point(90, 56);
+ this.txtHHelpCode.Location = new System.Drawing.Point(180, 112);
+ this.txtHHelpCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHHelpCode.Name = "txtHHelpCode";
- this.txtHHelpCode.Size = new System.Drawing.Size(143, 21);
+ this.txtHHelpCode.Size = new System.Drawing.Size(282, 35);
this.txtHHelpCode.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(260, 28);
+ this.label2.Location = new System.Drawing.Point(520, 56);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(106, 24);
this.label2.TabIndex = 2;
this.label2.Text = "鐗╂枡鍚嶇О";
//
@@ -1354,17 +1540,19 @@
//
this.txtHNumber.BackColor = System.Drawing.Color.Beige;
this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHNumber.Location = new System.Drawing.Point(90, 24);
+ this.txtHNumber.Location = new System.Drawing.Point(180, 48);
+ this.txtHNumber.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHNumber.Name = "txtHNumber";
- this.txtHNumber.Size = new System.Drawing.Size(143, 21);
+ this.txtHNumber.Size = new System.Drawing.Size(282, 35);
this.txtHNumber.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(30, 28);
+ this.label1.Location = new System.Drawing.Point(60, 56);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(106, 24);
this.label1.TabIndex = 0;
this.label1.Text = "鐗╂枡浠ｇ爜";
//
@@ -1376,7 +1564,8 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 91);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 182);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -1387,8 +1576,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(1086, 620);
- this.splitContainer1.SplitterDistance = 157;
+ this.splitContainer1.Size = new System.Drawing.Size(2172, 1240);
+ this.splitContainer1.SplitterDistance = 314;
+ this.splitContainer1.SplitterWidth = 8;
this.splitContainer1.TabIndex = 16;
//
// tv
@@ -1401,7 +1591,8 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 23);
+ this.tv.Location = new System.Drawing.Point(0, 42);
+ this.tv.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.tv.Name = "tv";
treeNode1.ForeColor = System.Drawing.Color.Black;
treeNode1.Name = "tjbb";
@@ -1411,7 +1602,7 @@
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode1});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(157, 597);
+ this.tv.Size = new System.Drawing.Size(314, 1198);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -1422,16 +1613,18 @@
this.panel1.Controls.Add(this.label3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(157, 23);
+ this.panel1.Size = new System.Drawing.Size(314, 42);
this.panel1.TabIndex = 15;
//
// cmdLoadTree
//
this.cmdLoadTree.Dock = System.Windows.Forms.DockStyle.Right;
- this.cmdLoadTree.Location = new System.Drawing.Point(113, 0);
+ this.cmdLoadTree.Location = new System.Drawing.Point(230, 0);
+ this.cmdLoadTree.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.cmdLoadTree.Name = "cmdLoadTree";
- this.cmdLoadTree.Size = new System.Drawing.Size(40, 19);
+ this.cmdLoadTree.Size = new System.Drawing.Size(80, 38);
this.cmdLoadTree.TabIndex = 1;
this.cmdLoadTree.Text = "鍒锋柊";
this.cmdLoadTree.UseVisualStyleBackColor = true;
@@ -1440,9 +1633,10 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(0, 3);
+ this.label3.Location = new System.Drawing.Point(0, 6);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(53, 12);
+ this.label3.Size = new System.Drawing.Size(106, 24);
this.label3.TabIndex = 0;
this.label3.Text = "鐗╂枡璧勬枡";
//
@@ -1459,74 +1653,84 @@
this.groupBox1.Controls.Add(this.btnOK);
this.groupBox1.Controls.Add(this.txtHMaterNumber);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 50);
+ this.groupBox1.Location = new System.Drawing.Point(0, 100);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1086, 41);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.groupBox1.Size = new System.Drawing.Size(2172, 82);
this.groupBox1.TabIndex = 52;
this.groupBox1.TabStop = false;
//
// label37
//
this.label37.AutoSize = true;
- this.label37.Location = new System.Drawing.Point(552, 14);
+ this.label37.Location = new System.Drawing.Point(1104, 28);
+ this.label37.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(29, 12);
+ this.label37.Size = new System.Drawing.Size(58, 24);
this.label37.TabIndex = 17;
this.label37.Text = "浜у湴";
//
// txtHCD
//
- this.txtHCD.Location = new System.Drawing.Point(587, 17);
+ this.txtHCD.Location = new System.Drawing.Point(1174, 34);
+ this.txtHCD.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHCD.Name = "txtHCD";
- this.txtHCD.Size = new System.Drawing.Size(85, 21);
+ this.txtHCD.Size = new System.Drawing.Size(166, 35);
this.txtHCD.TabIndex = 18;
//
// label38
//
this.label38.AutoSize = true;
- this.label38.Location = new System.Drawing.Point(380, 14);
+ this.label38.Location = new System.Drawing.Point(760, 28);
+ this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(53, 12);
+ this.label38.Size = new System.Drawing.Size(106, 24);
this.label38.TabIndex = 9;
this.label38.Text = "瑙勬牸鍨嬪彿";
//
// txtHMaterModel
//
- this.txtHMaterModel.Location = new System.Drawing.Point(439, 11);
+ this.txtHMaterModel.Location = new System.Drawing.Point(878, 22);
+ this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHMaterModel.Name = "txtHMaterModel";
- this.txtHMaterModel.Size = new System.Drawing.Size(109, 21);
+ this.txtHMaterModel.Size = new System.Drawing.Size(214, 35);
this.txtHMaterModel.TabIndex = 10;
//
// label39
//
this.label39.AutoSize = true;
- this.label39.Location = new System.Drawing.Point(192, 17);
+ this.label39.Location = new System.Drawing.Point(384, 34);
+ this.label39.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(53, 12);
+ this.label39.Size = new System.Drawing.Size(106, 24);
this.label39.TabIndex = 7;
this.label39.Text = "鐗╂枡鍚嶇О";
//
// txtHMaterName
//
- this.txtHMaterName.Location = new System.Drawing.Point(251, 17);
+ this.txtHMaterName.Location = new System.Drawing.Point(502, 34);
+ this.txtHMaterName.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHMaterName.Name = "txtHMaterName";
- this.txtHMaterName.Size = new System.Drawing.Size(117, 21);
+ this.txtHMaterName.Size = new System.Drawing.Size(230, 35);
this.txtHMaterName.TabIndex = 8;
//
// label40
//
this.label40.AutoSize = true;
- this.label40.Location = new System.Drawing.Point(9, 14);
+ this.label40.Location = new System.Drawing.Point(18, 28);
+ this.label40.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(53, 12);
+ this.label40.Size = new System.Drawing.Size(106, 24);
this.label40.TabIndex = 0;
this.label40.Text = "鐗╂枡浠ｇ爜";
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(690, 11);
+ this.btnOK.Location = new System.Drawing.Point(1380, 22);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(73, 24);
+ this.btnOK.Size = new System.Drawing.Size(146, 48);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -1534,110 +1738,46 @@
//
// txtHMaterNumber
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(73, 14);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(146, 28);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(113, 21);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(222, 35);
this.txtHMaterNumber.TabIndex = 1;
//
- // label41
+ // txtHRatePrice
//
- this.label41.AutoSize = true;
- this.label41.Location = new System.Drawing.Point(260, 379);
- this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(59, 12);
- this.label41.TabIndex = 284;
- this.label41.Text = "杈呭姪杩囨护1";
+ this.txtHRatePrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHRatePrice.Location = new System.Drawing.Point(1100, 560);
+ this.txtHRatePrice.Margin = new System.Windows.Forms.Padding(6);
+ this.txtHRatePrice.Name = "txtHRatePrice";
+ this.txtHRatePrice.Size = new System.Drawing.Size(282, 35);
+ this.txtHRatePrice.TabIndex = 293;
//
- // txtHQuery1
+ // label46
//
- this.txtHQuery1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQuery1.Location = new System.Drawing.Point(320, 375);
- this.txtHQuery1.Name = "txtHQuery1";
- this.txtHQuery1.Size = new System.Drawing.Size(143, 21);
- this.txtHQuery1.TabIndex = 283;
- //
- // label42
- //
- this.label42.AutoSize = true;
- this.label42.Location = new System.Drawing.Point(488, 380);
- this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(59, 12);
- this.label42.TabIndex = 286;
- this.label42.Text = "杈呭姪杩囨护2";
- //
- // txtHQuery2
- //
- this.txtHQuery2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQuery2.Location = new System.Drawing.Point(548, 376);
- this.txtHQuery2.Name = "txtHQuery2";
- this.txtHQuery2.Size = new System.Drawing.Size(143, 21);
- this.txtHQuery2.TabIndex = 285;
- //
- // label43
- //
- this.label43.AutoSize = true;
- this.label43.Location = new System.Drawing.Point(260, 406);
- this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(59, 12);
- this.label43.TabIndex = 290;
- this.label43.Text = "杈呭姪杩囨护4";
- //
- // txtHQuery4
- //
- this.txtHQuery4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQuery4.Location = new System.Drawing.Point(320, 402);
- this.txtHQuery4.Name = "txtHQuery4";
- this.txtHQuery4.Size = new System.Drawing.Size(143, 21);
- this.txtHQuery4.TabIndex = 289;
- //
- // label44
- //
- this.label44.AutoSize = true;
- this.label44.Location = new System.Drawing.Point(30, 406);
- this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(59, 12);
- this.label44.TabIndex = 288;
- this.label44.Text = "杈呭姪杩囨护3";
- //
- // txtHQuery3
- //
- this.txtHQuery3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQuery3.Location = new System.Drawing.Point(90, 402);
- this.txtHQuery3.Name = "txtHQuery3";
- this.txtHQuery3.Size = new System.Drawing.Size(143, 21);
- this.txtHQuery3.TabIndex = 287;
- //
- // label45
- //
- this.label45.AutoSize = true;
- this.label45.Location = new System.Drawing.Point(488, 406);
- this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(59, 12);
- this.label45.TabIndex = 292;
- this.label45.Text = "杈呭姪杩囨护5";
- //
- // txtHQuery5
- //
- this.txtHQuery5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQuery5.Location = new System.Drawing.Point(548, 402);
- this.txtHQuery5.Name = "txtHQuery5";
- this.txtHQuery5.Size = new System.Drawing.Size(143, 21);
- this.txtHQuery5.TabIndex = 291;
+ this.label46.AutoSize = true;
+ this.label46.Location = new System.Drawing.Point(972, 568);
+ this.label46.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label46.Name = "label46";
+ this.label46.Size = new System.Drawing.Size(106, 24);
+ this.label46.TabIndex = 294;
+ this.label46.Text = "淇冮攢鍗曚环";
//
// Gy_Material
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(1086, 711);
+ this.ClientSize = new System.Drawing.Size(2172, 1422);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Name = "Gy_Material";
this.Text = "鐗╂枡璁剧疆";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- this.Load += new System.EventHandler(this.Gy_Material_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_Material_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_Material_Load);
this.ToolBar.ResumeLayout(false);
this.ToolBar.PerformLayout();
this.stTab.ResumeLayout(false);
@@ -1647,6 +1787,7 @@
this.tabPage2.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
@@ -1793,5 +1934,7 @@
private System.Windows.Forms.TextBox txtHQuery2;
private System.Windows.Forms.Label label41;
private System.Windows.Forms.TextBox txtHQuery1;
+ private System.Windows.Forms.TextBox txtHRatePrice;
+ private System.Windows.Forms.Label label46;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.resx"
index 19ad766..593a9af 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ToolBar.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -253,7 +253,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -262,7 +262,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -275,7 +275,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -289,7 +289,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
@@ -303,7 +303,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
@@ -316,7 +316,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -328,7 +328,7 @@
<data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -341,7 +341,7 @@
<data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
@@ -352,7 +352,7 @@
<data name="jc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -363,7 +363,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -378,7 +378,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -393,66 +393,66 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
gg==
</value>
</data>
- <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>112, 17</value>
</metadata>
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAaQBAQGkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAawBAQGsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAT8BigH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQ
- AbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/AQoBkAG5Af8BCgGQAbkB/wEKAZABuQH/
- AQoBkAG5Af8DAAn/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/
- AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AwAB/wMAAf+AAAT/
- AQABPwGKAf8B0QH2Av8BUQHaAfQB/wFGAdMB8QH/ATsBywHvAf8BMQHEAe0B/wEnAb4B6wH/AR0BuAHo
- Af8BEQGwAecB/wEHAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQoBkAG5Af8DAAn/AQABPwGK
- Af8B0QH2Av8BJgG+AesB/wEgAbkB6QH/ARgBtAHnAf8BEAGwAeYB/wEJAasB5AH/AQIBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQoBkAG5Af8BAAE/AYoB/wMAAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AVcB3gH1
- Af8BTAHWAfMB/wFCAdAB8QH/ATcByQHuAf8BLQHCAewB/wEiAbwB6gH/ARgBtAHnAf8BDQGtAeUB/wED
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/ATEBxQHuAf8BKwHB
- AesB/wEkAbwB6wH/ARwBtwHoAf8BFQGyAecB/wENAa4B5QH/AQYBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQoBkAG5Af8DAAH/AQABPwGKAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AYEB4QH3Af8BUwHaAfQB/wFI
- AdQB8gH/AT0BzAHvAf8BMwHGAe4B/wEpAcAB6wH/AR4BuQHpAf8BFAGyAeYB/wEJAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/ATYByAHuAf8BLwHEAewB/wEoAb8B6wH/
- ASEBuwHqAf8BGgG2AegB/wESAbAB5wH/AQsBrAHlAf8BBAGnAeMB/wEAAaMB4gH/AQABPwGKAf8DAAH/
- AQABPwGKAf8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AYYB5QH3Af8BWQHfAfUB/wFOAdgB8wH/AUQB0QHx
- Af8BOQHKAe8B/wEvAcQB7QH/ASUBvQHqAf8BGgG2AegB/wEPAa8B5QH/AQQBqAHjAf8BAAGiAeEB/wEK
- AZABuQH/AwAB/wEAAT8BigH/AdEB9gL/AUIBzwHxAf8BOwHLAe8B/wEzAccB7gH/AS0BwgHsAf8BJgG9
- AeoB/wEeAbkB6QH/ARcBtAHnAf8BEAGwAeYB/wEIAaoB5QH/AQoBkAG5Af8DAAH/AQoBkAG5Af8BCgGQ
- AbkB/wMAAf+AAAT/AQABPwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVUB3AH1Af8BSwHVAfIB/wE/
- Ac4B8AH/ATUByAHuAf8BKwHBAewB/wEhAboB6gH/ARUBswHnAf8BCwGsAeUB/wEBAaYB4wH/AQoBkAG5
- Af8DAAH/AQABPwGKAf8B0QH2Av8BRwHTAfIB/wE/Ac4B8AH/ATgBygHuAf8BMQHFAe0B/wErAcEB6wH/
- ASMBvAHqAf8BHAG3AegB/wEUAbIB5gH/AQ0BrgHlAf8BCgGQAbkB/wMAAf8BCgGQAbkB/wEKAZABuQH/
- AwAB/4AABP8BAAE/AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWwHgAfYB/wFRAdkB8wH/AUYB0wHy
- Af8BOwHLAe8B/wExAcUB7QH/AScBvgHrAf8BHQG4AekB/wERAbAB5gH/AQYBqQHkAf8BCgGQAbkB/wMA
- Af8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEA
- AT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BCgGQAbkB/wE4AckB7gH/AQoBkAG5
- Af8DAAH/gAAE/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVgB3gH1Af8BTAHW
- AfMB/wFCAc8B8QH/ATcByQHvAf8BLQHCAewB/wEjAbsB6QH/ARgBtQHnAf8BDQGtAeYB/wEKAZABuQH/
- AwAF/wEAAT8BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFY
- Ad0B9QH/AVIB2gHzAf8BTAHXAfMB/wFHAdMB8QH/AUEBzwHxAf8BOwHLAe8B/wEKAZABuQH/AwAB/4AA
- BP8BAAE/AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEKAZABuQH/AwAF/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFbAeAB9gH/AVYB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BCgGQAbkB/wMAAf+AAAT/AQABPwGKAf8BHQGoAdMB/wEdAagB0wH/AR0BqAHTAf8BHQGo
- AdMB/wEdAagB0wH/AR0BqAHTAf8BHQGoAdMB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/
- AQABPwGKAf8BAAE/AYoJ/wEAAT8BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/
- AYoF/4AACP8BAAE/AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT8BigH/AwAh/wEAAT8BigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPwGKHf+AAAz/AQABPwGKAf8BAAE/AYoB/wEA
- AT8BigH/AQABPwGKAf8BAAE/AYoB/wMAKf8BAAE/AYoB/wEAAT8BigH/AQABPwGKAf8BAAE/AYoB/wEA
- AT8BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAT4BigH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQ
+ AbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/
+ AQkBkAG5Af8DAAn/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
+ AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AwAB/wMAAf+AAAT/
+ AQABPgGKAf8B0QH2Av8BUAHaAfQB/wFFAdMB8QH/AToBywHvAf8BMAHEAe0B/wEmAb4B6wH/ARwBuAHo
+ Af8BEAGwAecB/wEGAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQkBkAG5Af8DAAn/AQABPgGK
+ Af8B0QH2Av8BJQG+AesB/wEfAbkB6QH/ARcBtAHnAf8BDwGwAeYB/wEIAasB5AH/AQEBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQkBkAG5Af8BAAE+AYoB/wMAAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AVYB3gH1
+ Af8BSwHWAfMB/wFBAdAB8QH/ATYByQHuAf8BLAHCAewB/wEhAbwB6gH/ARcBtAHnAf8BDAGtAeUB/wEC
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATABxQHuAf8BKgHB
+ AesB/wEjAbwB6wH/ARsBtwHoAf8BFAGyAecB/wEMAa4B5QH/AQUBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQkBkAG5Af8DAAH/AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYEB4QH3Af8BUgHaAfQB/wFH
+ AdQB8gH/ATwBzAHvAf8BMgHGAe4B/wEoAcAB6wH/AR0BuQHpAf8BEwGyAeYB/wEIAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATUByAHuAf8BLgHEAewB/wEnAb8B6wH/
+ ASABuwHqAf8BGQG2AegB/wERAbAB5wH/AQoBrAHlAf8BAwGnAeMB/wEAAaMB4gH/AQABPgGKAf8DAAH/
+ AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYYB5QH3Af8BWAHfAfUB/wFNAdgB8wH/AUMB0QHx
+ Af8BOAHKAe8B/wEuAcQB7QH/ASQBvQHqAf8BGQG2AegB/wEOAa8B5QH/AQMBqAHjAf8BAAGiAeEB/wEJ
+ AZABuQH/AwAB/wEAAT4BigH/AdEB9gL/AUEBzwHxAf8BOgHLAe8B/wEyAccB7gH/ASwBwgHsAf8BJQG9
+ AeoB/wEdAbkB6QH/ARYBtAHnAf8BDwGwAeYB/wEHAaoB5QH/AQkBkAG5Af8DAAH/AQkBkAG5Af8BCQGQ
+ AbkB/wMAAf+AAAT/AQABPgGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVQB3AH1Af8BSgHVAfIB/wE+
+ Ac4B8AH/ATQByAHuAf8BKgHBAewB/wEgAboB6gH/ARQBswHnAf8BCgGsAeUB/wEAAaYB4wH/AQkBkAG5
+ Af8DAAH/AQABPgGKAf8B0QH2Av8BRgHTAfIB/wE+Ac4B8AH/ATcBygHuAf8BMAHFAe0B/wEqAcEB6wH/
+ ASIBvAHqAf8BGwG3AegB/wETAbIB5gH/AQwBrgHlAf8BCQGQAbkB/wMAAf8BCQGQAbkB/wEJAZABuQH/
+ AwAB/4AABP8BAAE+AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWgHgAfYB/wFQAdkB8wH/AUUB0wHy
+ Af8BOgHLAe8B/wEwAcUB7QH/ASYBvgHrAf8BHAG4AekB/wEQAbAB5gH/AQUBqQHkAf8BCQGQAbkB/wMA
+ Af8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BCQGQAbkB/wE3AckB7gH/AQkBkAG5
+ Af8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVcB3gH1Af8BSwHW
+ AfMB/wFBAc8B8QH/ATYByQHvAf8BLAHCAewB/wEiAbsB6QH/ARcBtQHnAf8BDAGtAeYB/wEJAZABuQH/
+ AwAF/wEAAT4BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFX
+ Ad0B9QH/AVEB2gHzAf8BSwHXAfMB/wFGAdMB8QH/AUABzwHxAf8BOgHLAe8B/wEJAZABuQH/AwAB/4AA
+ BP8BAAE+AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFaAeAB9gH/AVUB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCQGQAbkB/wMAAf+AAAT/AQABPgGKAf8BHAGoAdMB/wEcAagB0wH/ARwBqAHTAf8BHAGo
+ AdMB/wEcAagB0wH/ARwBqAHTAf8BHAGoAdMB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
+ AQABPgGKAf8BAAE+AYoJ/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+
+ AYoF/4AACP8BAAE+AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT4BigH/AwAh/wEAAT4BigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPgGKHf+AAAz/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BigH/AQABPgGKAf8BAAE+AYoB/wMAKf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
+ AT4BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<data name="cmdHSPGroupID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -620,10 +620,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>225, 17</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>33</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Ctl.cs"
index cf0b4f8..64728b8 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Ctl.cs"
@@ -23,7 +23,7 @@
",HLevel,HEndFlag,HStopflag,HRemark" +
",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" +
",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
- ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
+ ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice,HRatePrice" +
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax,HUnitName" +
",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID"+
",HQuery1,HQuery2,HQuery3,HQuery4,HQuery5) " +
@@ -31,7 +31,7 @@
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
- ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
+ ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" + "," + oModel.HRatePrice.ToString() + "" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() + ",'" + oModel.HUnitName + "'" +
",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() +
",'" + oModel.HQuery1 + "','" + oModel.HQuery2 + "','" + oModel.HQuery3 + "','" + oModel.HQuery4 + "','" + oModel.HQuery5 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -82,6 +82,7 @@
",HKeepDays=" + oModel.HKeepDays.ToString() +
",HPlanPrice=" + oModel.HPlanPrice.ToString() +
",HstdPrice=" + oModel.HstdPrice.ToString() +
+ ",HRatePrice=" + oModel.HRatePrice.ToString() +
",HQtyMin=" + oModel.HQtyMin.ToString() +
",HQtyMax=" + oModel.HQtyMax.ToString() +
",HVersion='" + oModel.HVersion + "'" +
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_View.cs"
index 2a7eb28..cf842f1 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_View.cs"
@@ -272,6 +272,7 @@
omodel.HSalePrice = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSalePrice"]);
omodel.HKeepDays = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HKeepDays"]);
omodel.HPlanPrice = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPlanPrice"]);
+ omodel.HRatePrice = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HRatePrice"]);
omodel.HstdPrice = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HstdPrice"]);
omodel.HQtyMin = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HQtyMin"]);
omodel.HQtyMax = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HQtyMax"]);
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
index 80f8d88..a918f04 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
@@ -22,6 +22,7 @@
public double HSafeStock;// dec(18,8) --安全库存
public double HOrderPrice;// dec(18,8) --采购单价
public double HSalePrice;// dec(18,8) --销售单价
+ public double HRatePrice;// dec(18,8) --促销单价
public double HKeepDays;// dec(18,8)--保质期（天）
public double HPlanPrice;// dec(18,8) --计划单价
public double HstdPrice;// dec(18,8) --标准成本
diff --git a/NETERP/Program.cs b/NETERP/Program.cs
index 37e13bf..fc38740 100644
--- a/NETERP/Program.cs
+++ b/NETERP/Program.cs
@@ -18,7 +18,7 @@
Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
Pub_Class.ClsPub.SetIPAddress();
DBUtility.ClsPub.SetIPAddress();
- DBUtility.ClsPub.VersionNum = "12.1";///
+ DBUtility.ClsPub.VersionNum = "12.1";//
Pub_Class.ClsPub.VersionNum = "12.1";//
//===================================================================
//try
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill.cs"
index 6793713..f41a23e 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill.cs"
@@ -1771,7 +1771,16 @@
}
grdMain.Rows[sRow + i].Cells[HQtyCol].Value = 1;
grdMain.Rows[sRow + i].Cells[HPriceCol].Value = oMatePriceCus.GetMatePriceByCus(oMater.omodel.HItemID, DBUtility.ClsPub.isLong(this.txtHSupID.Tag));
- grdMain.Rows[sRow + i].Cells[HSalePriceCol].Value = oMater.omodel.HSalePrice.ToString();
+ if(this.ModCaption=="闆跺敭1" && oMater.omodel.HRatePrice>0)
+ {
+ grdMain.Rows[sRow + i].Cells[HSalePriceCol].Value = oMater.omodel.HRatePrice.ToString();//鑾峰彇淇冮攢浠�
+ }
+ else
+ {
+ grdMain.Rows[sRow + i].Cells[HSalePriceCol].Value = oMater.omodel.HSalePrice.ToString();
+ }
+
+
if (DBUtility.ClsPub.isDoule(grdMain.Rows[sRow + i].Cells[HPriceCol].Value) == 0)
{
grdMain.Rows[sRow + i].Cells[HPriceCol].Value = grdMain.Rows[sRow + i].Cells[HSalePriceCol].Value;
--
Gitblit v1.9.1