From 4b5aa5a917d81ed418145fdf778af635785797ff Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期一, 14 三月 2022 21:16:44 +0800
Subject: [PATCH] aobang条码生成模块
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 542 ++++++++++++++++++++------
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 297 ++++++++------
WarM/条码打印/Sc_ICMOToBarCode.resx | 8
WarM/条码打印/Gy_BarCodeBill.designer.cs | 284 +++++++-------
WarM/条码打印/Gy_BarCodeBill.resx | 32
5 files changed, 752 insertions(+), 411 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index bdf497c..c5abf71 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -164,7 +164,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1526, 74);
+ this.Tool.Size = new System.Drawing.Size(1356, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -214,7 +214,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// AddRow
//
@@ -262,7 +262,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// bc
//
@@ -281,7 +281,7 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// wxm
//
@@ -300,7 +300,7 @@
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// cz
//
@@ -319,7 +319,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// kc
//
@@ -338,13 +338,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -354,7 +354,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(86, 69);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -364,7 +364,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -374,7 +374,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(86, 69);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -384,7 +384,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// tb
//
@@ -404,7 +404,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gl
//
@@ -423,7 +423,7 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// BatchNo
//
@@ -442,7 +442,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 74);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -462,10 +462,10 @@
//
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(752, 18);
+ this.lblCaption.Location = new System.Drawing.Point(668, 15);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(133, 29);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
@@ -476,18 +476,18 @@
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(62, 74);
- this.P1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.P1.Location = new System.Drawing.Point(55, 62);
+ this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1406, 205);
+ this.P1.Size = new System.Drawing.Size(1249, 171);
this.P1.TabIndex = 31;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(469, 5);
- this.pic1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.pic1.Location = new System.Drawing.Point(417, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(117, 61);
+ this.pic1.Size = new System.Drawing.Size(104, 51);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -510,11 +510,11 @@
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(21, 59);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.gbUp.Location = new System.Drawing.Point(19, 49);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.gbUp.Size = new System.Drawing.Size(1338, 120);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1189, 100);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -522,38 +522,38 @@
//
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
- this.cmbHWorksNumber.Location = new System.Drawing.Point(591, 25);
- this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
+ this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
- this.cmbHWorksNumber.Size = new System.Drawing.Size(280, 26);
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
this.cmbHWorksNumber.TabIndex = 98;
//
// label4
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(490, 31);
+ this.label4.Location = new System.Drawing.Point(436, 26);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(80, 18);
+ this.label4.Size = new System.Drawing.Size(67, 15);
this.label4.TabIndex = 97;
this.label4.Text = "宸ュ巶浠ｇ爜";
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(1014, 25);
+ this.dtpHDate.Location = new System.Drawing.Point(901, 21);
this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(280, 28);
+ this.dtpHDate.Size = new System.Drawing.Size(249, 25);
this.dtpHDate.TabIndex = 96;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(914, 31);
+ this.label2.Location = new System.Drawing.Point(812, 26);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.Size = new System.Drawing.Size(69, 15);
this.label2.TabIndex = 95;
this.label2.Text = "鏃� 鏈�";
//
@@ -561,20 +561,20 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(152, 25);
- this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(280, 26);
+ this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
this.cmbHOrgID.TabIndex = 85;
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(53, 31);
+ this.label3.Location = new System.Drawing.Point(47, 26);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(80, 18);
+ this.label3.Size = new System.Drawing.Size(69, 15);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -582,20 +582,20 @@
//
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(1014, 70);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(280, 26);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(914, 74);
+ this.label1.Location = new System.Drawing.Point(812, 62);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(80, 18);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 80;
this.label1.Text = "鏉＄爜绫诲瀷";
//
@@ -604,10 +604,10 @@
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHEmpID.Location = new System.Drawing.Point(1338, -11);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(33, 34);
+ this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -616,10 +616,10 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(840, 67);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(33, 34);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
this.cmdSourceBillNo.TabIndex = 42;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -627,10 +627,10 @@
// txtHSourceBillNo
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(591, 70);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(247, 28);
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
this.txtHSourceBillNo.TabIndex = 41;
this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
@@ -638,10 +638,10 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(490, 74);
+ this.label14.Location = new System.Drawing.Point(436, 62);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(80, 18);
+ this.label14.Size = new System.Drawing.Size(68, 15);
this.label14.TabIndex = 40;
this.label14.Text = "閫� 鍗� 鍙�";
//
@@ -650,20 +650,20 @@
this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Location = new System.Drawing.Point(152, 70);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(280, 26);
+ this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
this.cmbSourceBillType.TabIndex = 36;
//
// label10
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(53, 74);
+ this.label10.Location = new System.Drawing.Point(47, 62);
this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(80, 18);
+ this.label10.Size = new System.Drawing.Size(67, 15);
this.label10.TabIndex = 35;
this.label10.Text = "婧愬崟绫诲瀷";
//
@@ -691,20 +691,20 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(62, 760);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel2.Location = new System.Drawing.Point(55, 633);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1406, 139);
+ this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(1088, 71);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -712,10 +712,10 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(999, 74);
+ this.label25.Location = new System.Drawing.Point(888, 62);
this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(80, 18);
+ this.label25.Size = new System.Drawing.Size(67, 15);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -723,10 +723,10 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(1088, 18);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(147, 23);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -734,10 +734,10 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(999, 18);
+ this.label27.Location = new System.Drawing.Point(888, 15);
this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(62, 18);
+ this.label27.Size = new System.Drawing.Size(52, 15);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -745,10 +745,10 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(843, 71);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -756,10 +756,10 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(755, 71);
+ this.label23.Location = new System.Drawing.Point(671, 59);
this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(80, 18);
+ this.label23.Size = new System.Drawing.Size(67, 15);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -767,10 +767,10 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(843, 18);
+ this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(147, 23);
+ this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -778,10 +778,10 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(755, 18);
+ this.label21.Location = new System.Drawing.Point(671, 15);
this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(62, 18);
+ this.label21.Size = new System.Drawing.Size(52, 15);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -789,10 +789,10 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(595, 71);
+ this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -800,10 +800,10 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(507, 74);
+ this.label19.Location = new System.Drawing.Point(451, 62);
this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(80, 18);
+ this.label19.Size = new System.Drawing.Size(67, 15);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -811,10 +811,10 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(594, 19);
+ this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(147, 23);
+ this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -822,10 +822,10 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(507, 24);
+ this.label17.Location = new System.Drawing.Point(451, 20);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(62, 18);
+ this.label17.Size = new System.Drawing.Size(52, 15);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -833,10 +833,10 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(351, 71);
+ this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -844,10 +844,10 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(262, 74);
+ this.label15.Location = new System.Drawing.Point(233, 62);
this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(80, 18);
+ this.label15.Size = new System.Drawing.Size(67, 15);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -855,10 +855,10 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(351, 19);
+ this.txtHChecker.Location = new System.Drawing.Point(312, 16);
this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(147, 23);
+ this.txtHChecker.Size = new System.Drawing.Size(131, 19);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -866,10 +866,10 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(262, 24);
+ this.label13.Location = new System.Drawing.Point(233, 20);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(62, 18);
+ this.label13.Size = new System.Drawing.Size(52, 15);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -877,10 +877,10 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(107, 71);
+ this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(147, 23);
+ this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -888,10 +888,10 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(18, 74);
+ this.label11.Location = new System.Drawing.Point(16, 62);
this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(80, 18);
+ this.label11.Size = new System.Drawing.Size(67, 15);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -899,10 +899,10 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(107, 19);
+ this.txtHMaker.Location = new System.Drawing.Point(95, 16);
this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(147, 23);
+ this.txtHMaker.Size = new System.Drawing.Size(131, 19);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -910,10 +910,10 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(18, 24);
+ this.label8.Location = new System.Drawing.Point(16, 20);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(62, 18);
+ this.label8.Size = new System.Drawing.Size(52, 15);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -925,19 +925,19 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 74);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel1.Location = new System.Drawing.Point(0, 62);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(62, 825);
+ this.panel1.Size = new System.Drawing.Size(55, 687);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1468, 74);
- this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel3.Location = new System.Drawing.Point(1304, 62);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(58, 825);
+ this.panel3.Size = new System.Drawing.Size(52, 687);
this.panel3.TabIndex = 34;
//
// grdMain
@@ -949,13 +949,13 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(4, 5);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1390, 410);
+ this.grdMain.Size = new System.Drawing.Size(1233, 339);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -972,25 +972,25 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(62, 731);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdSum.Location = new System.Drawing.Point(55, 609);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1406, 29);
+ this.grdSum.Size = new System.Drawing.Size(1249, 24);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1214, 815);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdPrint.Location = new System.Drawing.Point(1079, 679);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(37, 36);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -1000,21 +1000,21 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(62, 279);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabControl1.Location = new System.Drawing.Point(55, 233);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1406, 452);
+ this.tabControl1.Size = new System.Drawing.Size(1249, 376);
this.tabControl1.TabIndex = 47;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 28);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.tabPage1.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1241, 347);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1022,11 +1022,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 28);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.tabPage2.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(1241, 347);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -1040,13 +1040,13 @@
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdSub.Location = new System.Drawing.Point(4, 5);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdSub.Location = new System.Drawing.Point(4, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1390, 410);
+ this.grdSub.Size = new System.Drawing.Size(1233, 339);
this.grdSub.TabIndex = 45;
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
@@ -1055,10 +1055,10 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 28);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPage3.Location = new System.Drawing.Point(4, 25);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1398, 420);
+ this.tabPage3.Size = new System.Drawing.Size(1242, 348);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1073,20 +1073,20 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
- this.grdList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.grdList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1398, 420);
+ this.grdList.Size = new System.Drawing.Size(1242, 348);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1526, 899);
+ this.ClientSize = new System.Drawing.Size(1356, 749);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1097,7 +1097,7 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index 3150f0d..804bb7a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -360,7 +360,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
<data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
<data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -428,7 +428,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -443,7 +443,7 @@
<data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -458,7 +458,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -467,7 +467,7 @@
<data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -478,7 +478,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -493,7 +493,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -508,7 +508,7 @@
<data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -523,7 +523,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -537,7 +537,7 @@
<data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -547,7 +547,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index a704a01..5f5cfa8 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -69,7 +69,7 @@
// sFastSQL = sFastSQL + " and HMaterName like '%" + txtHMaterID.Text + "%'";
//}
string HMaterName = "";
- HMaterName = txtHMaterID.Text.Trim().ToString();
+ HMaterName = txtHMaterID.Text.Trim().ToString(); //鐗╂枡浠ｇ爜
//鏈哄彴
//if (txtHSourceID.Text.Trim() != "")
//{
@@ -113,7 +113,7 @@
}
//
grdMain.DataSource = DSet.Tables[0].DefaultView;
-
+
//鏍囧噯瑁呯
//for (int i = 0; i < grdMain.SelectedRows.Count; i++)
//{
@@ -129,15 +129,15 @@
//DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
//鐢荤嚎
GraphLine();
-
-
+
+
//
}
//
private void timer1_Tick(object sender, EventArgs e)
{
- timer1.Enabled=false;
+ timer1.Enabled = false;
initGrid();
Display();
}
@@ -204,6 +204,8 @@
this.Text = ModCaption;
//lblCaption.Text = ModCaption;
initGrid();
+ cmbHBarCodeType.SelectedIndex = 0;
+ dtpHBeginDate.Value = DateTime.Today;
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -243,7 +245,7 @@
//鍒犻櫎
private void Sub_DeleteBill()
{
- // //缂栬緫鏉冮檺
+ // //缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
@@ -331,7 +333,7 @@
//}
}
-
+
private void bclk_Click(object sender, EventArgs e)
{
@@ -365,7 +367,7 @@
private void Sub_CheckBill()
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
@@ -376,7 +378,7 @@
lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
if (lngBillKey == 0)
return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
+ DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -407,7 +409,7 @@
private void Sub_AbandonCheck()
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
@@ -418,7 +420,7 @@
lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
if (lngBillKey == 0)
return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
+ DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -757,7 +759,7 @@
private void cmdHSaveBill_Click(object sender, EventArgs e)
{
-
+
Display();
}
@@ -770,84 +772,31 @@
- private void button4_Click(object sender, EventArgs e)
+ //=======鐢熸垚 鍞竴鐮� 鍜� 鎵樻潯鐮� 銆佺粍鎵樺崟
+ private void Sub_SaveBarCode()//鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐�
{
- //1.鑾峰彇鐣岄潰涓婇潰鏁寸鏁伴噺妗嗚緭鍏ョ殑鏁伴噺 璧嬪�肩粰鍙橀噺 骞跺埛鏂扮綉鏍�
- double HBarCodeQty = 0;
- double HZXQty = 0;
- HZXQty = ClsPub.isDoule(txtHZXQty.Text);
- if (HZXQty ==0)
+ try
{
- MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
- return;
- }
- Display();
- //2.鑾峰彇缃戞牸閫変腑琛岀墿鏂橧D
- //int a = grdMain.CurrentRow.Index;
- //long HMaterID = 0;
- ////HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
- // if (HMaterID == 0)
- // {
- // MessageBox.Show("娌℃湁閫変腑浠讳綍璁板綍锛�");
- // return;
- // }
- //3.瀹氫箟鏄惁缁勬墭鐨勫彉閲�
- int Mul = 0;
- //4.鏍规嵁鍗曟嵁绫诲瀷鑾峰彇鏈鏉＄爜涓诲唴鐮丠InterID
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
-
- //鑾峰彇缃戞牸閲岄潰姣忎竴琛岃鍗曞搴旂殑璁㈠崟鏁伴噺
- double HDDQty = 0;
- HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
-
-
- //鑾峰彇褰撳墠绯荤粺鐧婚檰缁勭粐浠ｇ爜
- HOrgNumber = ClsPub.HOrgNumber;
-
-
-
-
- //鑷姩鍖归厤閫昏緫 鍒ゆ柇璁㈠崟鏁伴噺鏄惁澶т簬鏁寸鏁伴噺 濡傛灉璁㈠崟鏁伴噺澶т簬鏁寸鏁伴噺 鐩存帴鐢熸垚鍞竴鐮�
- //濡傛灉璁㈠崟鏁伴噺灏忎簬鏁寸鏁伴噺 鍒欏惊鐜敓鎴愬敮涓�鐮� 鐢熸垚瀵瑰簲鐨勬墭鏉＄爜
- if (HDDQty >= HZXQty)
- {
- HBarCodeQty = HZXQty;
- this.Sub_SaveBill_TTM();
- Display();
- Mul = Mul + 1;
- break;
- }
- else if(HDDQty < HZXQty)
- {
- HBarCodeQty = HDDQty;
- HZXQty = HZXQty - HDDQty;
- this.Sub_SaveBill_TTM();
- Mul = Mul + 1;
- continue;
- }
-
- //濡傛灉Mul>1 鏂板缁勬墭鍗曚富琛�
-
- }
-
- if (Mul > 1)
- {
- //HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
- DataSet DS1;
- HTTMNumber = HOrgNumber + HICMOBillNo;
- DS1 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- TLSH = ClsPub.isInt(DS1.Tables[0].Rows[0][0]);
- TLSH2 = TLSH.ToString();
- TTM = HTTMNumber + TLSH2;
- HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
-
+ string HMaterNumber = "";
+ string HBatchNo = "";
string HDate = "";
string HYear = "";
string HPeriod = "";
string HDay = "";
+ string HTMNumber = "";
+ string HOrgNumber = "";
+ DataSet Ds;
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ double HZXQty = 0; //瑁呯鏁伴噺
+ double HDDQty = 0; //璁㈠崟鏁伴噺
+ double HBQty = 0; //绠辨暟
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string WeiShu = ""; //灏炬暟
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ string TM = ""; //鏉＄爜
+
HDate = DateTime.Now.ToShortDateString();
HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
@@ -855,52 +804,343 @@
HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
HDay = HDay.Substring(HDay.Length - 2, 2);
- oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
- ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
- ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
- ") values ("
- + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
- + ", " + HBillNo_TTM.ToString() + ",1,''," + TTM.ToString() + ",0,0,0"
- + ",0,1,0,0,0,0,'','')");
+ //=============鏍规嵁鐣岄潰涓婂凡缁忓垎閰嶇殑鏁版嵁杩涜鏉＄爜鐢熸垚鍜屾墦鍗般��
+ //鑾峰彇鏈鐢熸垚鐨� 涓诲唴鐮�
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo); //缁勬墭鍗曞唴鐮�
+ string HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//缁勬墭鍗曞崟鍙�
+
+ //0 寮�鍚簨鍔�
+ oCn.BeginTran();
+ //00 鍏堢敓鎴� 鍞竴鐨� 鎵樻潯鐮�
+
+ //鐢熸垚涓�涓绠辩爜
+ string sPackStr = "ZXM" + HYear + HPeriod + HDay; //澶栫鐮� 鍓嶇紑
+ DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
+ string sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+
+ //1.寰幆缃戞牸锛屾牴鎹� 鏈鏁伴噺 鍒� 鐢熸垚 鍞竴鐮�
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value) > 0)
+ {
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
+ HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+
+ HOrgNumber = ClsPub.HOrgNumber;
+
+
+ //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+ HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+
+ HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ n = 0;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = HTMNumber + LSH2;
+ if (TM.Trim() == "")
+ {
+ MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID1 = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ HWei = WeiShu;
+ HBarCode = TM;
+ HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
+ HAuxPropID = 0;
+ HUnitID = 0;
+ HQty2 = HZXQty;
+ HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HSourceInterID")].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HSourceEntryID")].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ HSourceBillType = "3710";
+ HBarcodeQtys = 0;
+ HBarcodeNo = 0;
+ HSupID = 0;
+ HDeptID = 0;
+ HWhID = 0;
+ HSPID = 0;
+ HRemark = "";
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ HPinfan = "";
+ HMTONo = "";
+ HCusID = 0;
+ HCusType = "";
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
+ HWorkLineName = "";
+ HSeOrderBillNo = "";
+ HInnerBillNo = sPackBarCode;
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
+ }
+ }
+ //2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
+ //鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterID_TTM.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+
+
+
+
+
+
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+
+
+
+
+
+
+
+
+ //0缁撴潫浜嬪姟
+
+ //
+ Display();
+
}
-
-
- //3.鍏堝垽鏂墿鏂欐槸鍚︿竴鑷� 濡傛灉涓�鑷村紑濮嬪惊鐜綉鏍�
- for (int i = 0; i < grdMain.Rows.Count; i++)
+ catch(Exception e )
{
- //long HGrdMaterID = 0;
- //HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
- //if (HGrdMaterID == HMaterID)
- //{
- // double HDDQty = 0;
- // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
- // //濡傛灉寰幆鐨勮琛岃褰曠殑璁㈠崟鏁伴噺宸茬粡澶т簬绛変簬鏈瑁呯鏁伴噺 鍒欑洿鎺ョ敓鎴愬敮涓�鐮� 骞朵笖鍒锋柊缃戞牸 鍒锋柊鏉＄爜淇℃伅椤�
- // if (HDDQty >= HZXQty)
- // {
- // double HBarCodeQty = 0;
- // HBarCodeQty = HZXQty;
- // this.Sub_SaveBill();
- // Display();
- // }
- // //濡傛灉鏀硅璁板綍璁㈠崟鏁伴噺灏忎簬鏈瑁呯鏁伴噺 鍒欑户缁惊鐜� 璧扮敓鎴愭墭鏉＄爜鏂规硶
- // else
- // {
- // //鏌ュ嚭绗﹀悎鏉′欢鐨勯�変腑杩欐潯鏁伴噺璺熻绠辨暟閲忕殑宸紓鍊�
- // double HCYQty = 0;
- // HCYQty = HZXQty - DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ //鍥炴粴浜嬪姟
- // }
-
- //}
- //else
- //{
-
- //}
+ MessageBox.Show("鐢熸垚鏉＄爜澶辫触锛�" + e.Message);
+ Display();
}
+ }
+
+ private void button4_Click(object sender, EventArgs e)
+ {
+ //鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紙鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
+ //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
+ double HZXQty = 0;//鏁寸鏁伴噺
+ HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ if (HZXQty <= 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ return;
+ }
+ //2.鍒锋柊缃戞牸
+ Display();
+ //3.鎶婃暣绠辨暟閲� 鍒嗛厤鍒� 缃戞牸涓嬮潰鐨勬瘡涓�涓� 鐢熶骇璁㈠崟涓婂幓銆� 寰幆缃戞牸
+ for(int i =0;i<grdMain.Rows.Count;i++)
+ {
+ if(HZXQty>0)
+ {
+ if(HZXQty>DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
+ {
+ HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+ break;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+ Sub_SaveBarCode();
+ //
-
+
+
+ ////1.鑾峰彇鐣岄潰涓婇潰鏁寸鏁伴噺妗嗚緭鍏ョ殑鏁伴噺 璧嬪�肩粰鍙橀噺 骞跺埛鏂扮綉鏍�
+ //double HBarCodeQty = 0;
+ //double HZXQty = 0;
+ //HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ //if (HZXQty ==0)
+ //{
+ // MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ // return;
+ //}
+ //Display();
+ ////2.鑾峰彇缃戞牸閫変腑琛岀墿鏂橧D
+ ////int a = grdMain.CurrentRow.Index;
+ ////long HMaterID = 0;
+ //////HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
+ //// if (HMaterID == 0)
+ //// {
+ //// MessageBox.Show("娌℃湁閫変腑浠讳綍璁板綍锛�");
+ //// return;
+ //// }
+ ////3.瀹氫箟鏄惁缁勬墭鐨勫彉閲�
+ //int Mul = 0;
+ ////4.鏍规嵁鍗曟嵁绫诲瀷鑾峰彇鏈鏉＄爜涓诲唴鐮丠InterID
+ //HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+
+ // //鑾峰彇缃戞牸閲岄潰姣忎竴琛岃鍗曞搴旂殑璁㈠崟鏁伴噺
+ // double HDDQty = 0;
+ // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+
+
+ // //鑾峰彇褰撳墠绯荤粺鐧婚檰缁勭粐浠ｇ爜
+ // HOrgNumber = ClsPub.HOrgNumber;
+
+
+
+
+ // //鑷姩鍖归厤閫昏緫 鍒ゆ柇璁㈠崟鏁伴噺鏄惁澶т簬鏁寸鏁伴噺 濡傛灉璁㈠崟鏁伴噺澶т簬鏁寸鏁伴噺 鐩存帴鐢熸垚鍞竴鐮�
+ // //濡傛灉璁㈠崟鏁伴噺灏忎簬鏁寸鏁伴噺 鍒欏惊鐜敓鎴愬敮涓�鐮� 鐢熸垚瀵瑰簲鐨勬墭鏉＄爜
+ // if (HDDQty >= HZXQty)
+ // {
+ // HBarCodeQty = HZXQty;
+ // this.Sub_SaveBill_TTM();
+ // Display();
+ // Mul = Mul + 1;
+ // break;
+ // }
+ // else if(HDDQty < HZXQty)
+ // {
+ // HBarCodeQty = HDDQty;
+ // HZXQty = HZXQty - HDDQty;
+ // this.Sub_SaveBill_TTM();
+ // Mul = Mul + 1;
+ // continue;
+ // }
+
+ // //濡傛灉Mul>1 鏂板缁勬墭鍗曚富琛�
+
+ //}
+
+ //if (Mul > 1)
+ //{
+ // //HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+ // DataSet DS1;
+ // HTTMNumber = HOrgNumber + HICMOBillNo;
+ // DS1 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ // TLSH = ClsPub.isInt(DS1.Tables[0].Rows[0][0]);
+ // TLSH2 = TLSH.ToString();
+ // TTM = HTTMNumber + TLSH2;
+ // HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
+ // HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+
+ // string HDate = "";
+ // string HYear = "";
+ // string HPeriod = "";
+ // string HDay = "";
+ // HDate = DateTime.Now.ToShortDateString();
+ // HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+ // HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+ // HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ // HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+ // HDay = HDay.Substring(HDay.Length - 2, 2);
+
+ // oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
+ // ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
+ // ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
+ // ") values ("
+ // + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
+ // + ", " + HBillNo_TTM.ToString() + ",1,''," + TTM.ToString() + ",0,0,0"
+ // + ",0,1,0,0,0,0,'','')");
+ //}
+
+
+ ////3.鍏堝垽鏂墿鏂欐槸鍚︿竴鑷� 濡傛灉涓�鑷村紑濮嬪惊鐜綉鏍�
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // //long HGrdMaterID = 0;
+ // //HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
+ // //if (HGrdMaterID == HMaterID)
+ // //{
+ // // double HDDQty = 0;
+ // // HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ // // //濡傛灉寰幆鐨勮琛岃褰曠殑璁㈠崟鏁伴噺宸茬粡澶т簬绛変簬鏈瑁呯鏁伴噺 鍒欑洿鎺ョ敓鎴愬敮涓�鐮� 骞朵笖鍒锋柊缃戞牸 鍒锋柊鏉＄爜淇℃伅椤�
+ // // if (HDDQty >= HZXQty)
+ // // {
+ // // double HBarCodeQty = 0;
+ // // HBarCodeQty = HZXQty;
+ // // this.Sub_SaveBill();
+ // // Display();
+ // // }
+ // // //濡傛灉鏀硅璁板綍璁㈠崟鏁伴噺灏忎簬鏈瑁呯鏁伴噺 鍒欑户缁惊鐜� 璧扮敓鎴愭墭鏉＄爜鏂规硶
+ // // else
+ // // {
+ // // //鏌ュ嚭绗﹀悎鏉′欢鐨勯�変腑杩欐潯鏁伴噺璺熻绠辨暟閲忕殑宸紓鍊�
+ // // double HCYQty = 0;
+ // // HCYQty = HZXQty - DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+
+ // // }
+
+ // //}
+ // //else
+ // //{
+
+ // //}
+ //}
+
+
+
+
}
private void Sub_SaveBill()
@@ -1414,6 +1654,9 @@
{
this.txtHSourceID.Text = oWork.oModel.HName;
this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
+ //
+ Display();
+ //
}
else
{
@@ -1611,9 +1854,60 @@
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
}
+ //瓒呴鎵撳嵃
private void button7_Click(object sender, EventArgs e)
{
-
+ //鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紝骞朵笖鍏佽瓒呰繃璁㈠崟鏁伴噺 锛堝垎閰嶆椂 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
+ //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
+ double HZXQty = 0;//鏁寸鏁伴噺
+ HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ if (HZXQty <= 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+ return;
+ }
+ //2.鍒锋柊缃戞牸
+ Display();
+ //3.寰幆缃戞牸锛岀疮璁″叏閮ㄥ墿浣欐暟閲忥紝鍒ゆ柇鏄惁 鍓╀綑鏁伴噺 灏忎簬 鏈鏁伴噺锛涘鏋� 澶т簬鍒欐姤閿� 閫�鍑恒��
+ double sumLeftQty = 0;
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if ( DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value)>0)
+ {
+ sumLeftQty = sumLeftQty + DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ else
+ {
+ }
+ }
+ if(sumLeftQty>= HZXQty )
+ {
+ MessageBox.Show("鍓╀綑鏁伴噺澶т簬鏈鏁伴噺锛屼笉鑳借秴棰濇墦鍗帮紝璇风敤鏅�氭墦鍗板姛鑳姐��");
+ return;
+ }
+ //4.鎶婃暣绠辨暟閲� 鍒嗛厤鍒� 缃戞牸涓嬮潰鐨勬瘡涓�涓� 鐢熶骇璁㈠崟涓婂幓銆� 寰幆缃戞牸
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
+ {
+ if (i == grdMain.Rows.Count - 1)
+ {
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+ }
+ else
+ {
+ HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ }
+ }
+ else
+ {
+ //grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
+ break;
+ }
+ }
+ Sub_SaveBarCode();
+ //
}
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index cb35bc7..51aa034 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -119,7 +119,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1172, 50);
+ this.Tool.Size = new System.Drawing.Size(1563, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -141,13 +141,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator9
//
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, 62);
//
// mrlk
//
@@ -157,7 +157,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(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -167,7 +167,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, 62);
//
// bclk
//
@@ -177,7 +177,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(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -187,7 +187,7 @@
//
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, 62);
//
// cz
//
@@ -218,12 +218,13 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdMain.Location = new System.Drawing.Point(4, 6);
+ this.grdMain.Location = new System.Drawing.Point(5, 8);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(866, 263);
+ this.grdMain.Size = new System.Drawing.Size(1155, 329);
this.grdMain.TabIndex = 19;
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -233,9 +234,10 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(19, 35);
+ this.label1.Location = new System.Drawing.Point(25, 44);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(88, 16);
+ this.label1.Size = new System.Drawing.Size(109, 20);
this.label1.TabIndex = 46;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -243,10 +245,11 @@
//
this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.ReadOnly = true;
- this.txtHICMOBillNo.Size = new System.Drawing.Size(166, 30);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 36);
this.txtHICMOBillNo.TabIndex = 47;
//
// label2
@@ -254,9 +257,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(312, 34);
+ this.label2.Location = new System.Drawing.Point(416, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(40, 16);
+ this.label2.Size = new System.Drawing.Size(49, 20);
this.label2.TabIndex = 49;
this.label2.Text = "鏈哄彴";
//
@@ -264,18 +268,20 @@
//
this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceID.Location = new System.Drawing.Point(364, 28);
+ this.txtHSourceID.Location = new System.Drawing.Point(485, 35);
+ this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceID.Name = "txtHSourceID";
this.txtHSourceID.ReadOnly = true;
- this.txtHSourceID.Size = new System.Drawing.Size(166, 30);
+ this.txtHSourceID.Size = new System.Drawing.Size(220, 36);
this.txtHSourceID.TabIndex = 50;
//
// cmdHSourceID
//
this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
- this.cmdHSourceID.Location = new System.Drawing.Point(527, 27);
+ this.cmdHSourceID.Location = new System.Drawing.Point(703, 34);
+ this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHSourceID.Name = "cmdHSourceID";
- this.cmdHSourceID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHSourceID.Size = new System.Drawing.Size(43, 40);
this.cmdHSourceID.TabIndex = 51;
this.cmdHSourceID.UseVisualStyleBackColor = true;
this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -285,9 +291,10 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(599, 34);
+ this.label3.Location = new System.Drawing.Point(799, 42);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(40, 16);
+ this.label3.Size = new System.Drawing.Size(49, 20);
this.label3.TabIndex = 52;
this.label3.Text = "鑱屽憳";
//
@@ -295,18 +302,20 @@
//
this.txtHEmpID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEmpID.Location = new System.Drawing.Point(651, 28);
+ this.txtHEmpID.Location = new System.Drawing.Point(868, 35);
+ this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHEmpID.Name = "txtHEmpID";
this.txtHEmpID.ReadOnly = true;
- this.txtHEmpID.Size = new System.Drawing.Size(166, 30);
+ this.txtHEmpID.Size = new System.Drawing.Size(220, 36);
this.txtHEmpID.TabIndex = 53;
//
// cmdHEmpID
//
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
- this.cmdHEmpID.Location = new System.Drawing.Point(814, 27);
+ this.cmdHEmpID.Location = new System.Drawing.Point(1089, 34);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHEmpID.Size = new System.Drawing.Size(43, 40);
this.cmdHEmpID.TabIndex = 54;
this.cmdHEmpID.UseVisualStyleBackColor = true;
this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -316,30 +325,36 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(875, 34);
+ this.label4.Location = new System.Drawing.Point(1167, 42);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(40, 16);
+ this.label4.Size = new System.Drawing.Size(49, 20);
this.label4.TabIndex = 55;
this.label4.Text = "鐗╂枡";
+ this.label4.Visible = false;
//
// txtHMaterID
//
this.txtHMaterID.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(927, 28);
+ this.txtHMaterID.Location = new System.Drawing.Point(1236, 35);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.ReadOnly = true;
- this.txtHMaterID.Size = new System.Drawing.Size(166, 30);
+ this.txtHMaterID.Size = new System.Drawing.Size(220, 36);
this.txtHMaterID.TabIndex = 56;
+ this.txtHMaterID.Visible = false;
//
// cmdHMaterID
//
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
- this.cmdHMaterID.Location = new System.Drawing.Point(1090, 27);
+ this.cmdHMaterID.Location = new System.Drawing.Point(1453, 34);
+ this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID.TabIndex = 57;
this.cmdHMaterID.UseVisualStyleBackColor = true;
+ this.cmdHMaterID.Visible = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
//
// gbUp
@@ -363,9 +378,11 @@
this.gbUp.Controls.Add(this.txtHEmpID);
this.gbUp.Controls.Add(this.label2);
this.gbUp.Controls.Add(this.cmdHEmpID);
- this.gbUp.Location = new System.Drawing.Point(11, 55);
+ this.gbUp.Location = new System.Drawing.Point(15, 69);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1149, 126);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Size = new System.Drawing.Size(1532, 158);
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
@@ -373,10 +390,11 @@
//
this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(149, 99);
+ this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
this.txtHSeOrderBillNo.ReadOnly = true;
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(163, 36);
this.txtHSeOrderBillNo.TabIndex = 141;
//
// label9
@@ -384,9 +402,10 @@
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(19, 85);
+ this.label9.Location = new System.Drawing.Point(25, 106);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(88, 16);
+ this.label9.Size = new System.Drawing.Size(109, 20);
this.label9.TabIndex = 140;
this.label9.Text = "閿�鍞鍗曞彿";
//
@@ -395,12 +414,11 @@
this.cmbHBarCodeType.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
- "鍞竴鏉＄爜",
- "鎵规鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(642, 79);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+ "鍞竴鏉＄爜"});
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(856, 99);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(185, 33);
this.cmbHBarCodeType.TabIndex = 139;
//
// label8
@@ -408,9 +426,10 @@
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(557, 86);
+ this.label8.Location = new System.Drawing.Point(743, 108);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(72, 16);
+ this.label8.Size = new System.Drawing.Size(89, 20);
this.label8.TabIndex = 138;
this.label8.Text = "鏉＄爜绫诲瀷";
//
@@ -418,10 +437,10 @@
//
this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill.Location = new System.Drawing.Point(862, 68);
- this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill.Location = new System.Drawing.Point(1149, 85);
+ this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill.Name = "cmdHSaveBill";
- this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill.TabIndex = 137;
this.cmdHSaveBill.Text = "鏌ヨ";
this.cmdHSaveBill.UseVisualStyleBackColor = false;
@@ -431,10 +450,10 @@
//
this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
- this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate.Location = new System.Drawing.Point(448, 96);
+ this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate.Name = "dtpHBeginDate";
- this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
+ this.dtpHBeginDate.Size = new System.Drawing.Size(204, 36);
this.dtpHBeginDate.TabIndex = 100;
//
// label6
@@ -442,9 +461,10 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(257, 85);
+ this.label6.Location = new System.Drawing.Point(343, 106);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(72, 16);
+ this.label6.Size = new System.Drawing.Size(89, 20);
this.label6.TabIndex = 99;
this.label6.Text = "鏃� 鏈�";
//
@@ -452,10 +472,10 @@
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(1036, 189);
- this.button4.Margin = new System.Windows.Forms.Padding(2);
+ this.button4.Location = new System.Drawing.Point(1381, 236);
+ this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(112, 50);
+ this.button4.Size = new System.Drawing.Size(149, 62);
this.button4.TabIndex = 138;
this.button4.Text = "鐢熸垚鏉＄爜";
this.button4.UseVisualStyleBackColor = false;
@@ -465,34 +485,38 @@
//
this.button5.BackColor = System.Drawing.Color.White;
this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button5.Location = new System.Drawing.Point(1036, 247);
- this.button5.Margin = new System.Windows.Forms.Padding(2);
+ this.button5.Location = new System.Drawing.Point(1381, 309);
+ this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(112, 42);
+ this.button5.Size = new System.Drawing.Size(149, 52);
this.button5.TabIndex = 139;
this.button5.Text = "棰勮";
this.button5.UseVisualStyleBackColor = false;
+ this.button5.Visible = false;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button6
//
this.button6.BackColor = System.Drawing.Color.White;
this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button6.Location = new System.Drawing.Point(1036, 296);
- this.button6.Margin = new System.Windows.Forms.Padding(2);
+ this.button6.Location = new System.Drawing.Point(1381, 370);
+ this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(112, 44);
+ this.button6.Size = new System.Drawing.Size(149, 55);
this.button6.TabIndex = 140;
this.button6.Text = "鎵撳嵃";
this.button6.UseVisualStyleBackColor = false;
+ this.button6.Visible = false;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// txtHMiniQty
//
- this.txtHMiniQty.Location = new System.Drawing.Point(898, 296);
+ this.txtHMiniQty.Location = new System.Drawing.Point(1197, 370);
+ this.txtHMiniQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMiniQty.Multiline = true;
this.txtHMiniQty.Name = "txtHMiniQty";
- this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHMiniQty.ReadOnly = true;
+ this.txtHMiniQty.Size = new System.Drawing.Size(148, 52);
this.txtHMiniQty.TabIndex = 141;
this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
//
@@ -500,9 +524,10 @@
//
this.鏍囧噯瑁呯.AutoSize = true;
this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏍囧噯瑁呯.Location = new System.Drawing.Point(894, 265);
+ this.鏍囧噯瑁呯.Location = new System.Drawing.Point(1192, 331);
+ this.鏍囧噯瑁呯.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
- this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
+ this.鏍囧噯瑁呯.Size = new System.Drawing.Size(151, 34);
this.鏍囧噯瑁呯.TabIndex = 142;
this.鏍囧噯瑁呯.Text = "鏍囧噯瑁呯";
//
@@ -510,19 +535,23 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(883, 349);
+ this.label7.Location = new System.Drawing.Point(1177, 436);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(174, 27);
+ this.label7.Size = new System.Drawing.Size(219, 34);
this.label7.TabIndex = 144;
this.label7.Text = "鏈鐢熸垚鏁伴噺";
+ this.label7.Visible = false;
//
// txtHBQty
//
- this.txtHBQty.Location = new System.Drawing.Point(901, 380);
+ this.txtHBQty.Location = new System.Drawing.Point(1201, 475);
+ this.txtHBQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBQty.Multiline = true;
this.txtHBQty.Name = "txtHBQty";
- this.txtHBQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHBQty.Size = new System.Drawing.Size(148, 52);
this.txtHBQty.TabIndex = 143;
+ this.txtHBQty.Visible = false;
this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
//
// groupBox1
@@ -538,9 +567,11 @@
this.groupBox1.Controls.Add(this.txtHMaterID1);
this.groupBox1.Controls.Add(this.label13);
this.groupBox1.Controls.Add(this.cmdHMaterID1);
- this.groupBox1.Location = new System.Drawing.Point(10, 485);
+ this.groupBox1.Location = new System.Drawing.Point(13, 606);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(1148, 126);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(1531, 158);
this.groupBox1.TabIndex = 140;
this.groupBox1.TabStop = false;
//
@@ -548,10 +579,10 @@
//
this.cmdHSaveBill1.BackColor = System.Drawing.Color.White;
this.cmdHSaveBill1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHSaveBill1.Location = new System.Drawing.Point(771, 35);
- this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHSaveBill1.Location = new System.Drawing.Point(1028, 44);
+ this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cmdHSaveBill1.Name = "cmdHSaveBill1";
- this.cmdHSaveBill1.Size = new System.Drawing.Size(112, 50);
+ this.cmdHSaveBill1.Size = new System.Drawing.Size(149, 62);
this.cmdHSaveBill1.TabIndex = 137;
this.cmdHSaveBill1.Text = "鏌ヨ";
this.cmdHSaveBill1.UseVisualStyleBackColor = false;
@@ -561,10 +592,10 @@
//
this.dtpHEndDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHEndDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEndDate1.Location = new System.Drawing.Point(478, 75);
- this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHEndDate1.Location = new System.Drawing.Point(637, 94);
+ this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHEndDate1.Name = "dtpHEndDate1";
- this.dtpHEndDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHEndDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHEndDate1.TabIndex = 102;
//
// label10
@@ -572,9 +603,10 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(399, 83);
+ this.label10.Location = new System.Drawing.Point(532, 104);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(72, 16);
+ this.label10.Size = new System.Drawing.Size(89, 20);
this.label10.TabIndex = 101;
this.label10.Text = "缁撴潫鏃ユ湡";
//
@@ -582,10 +614,10 @@
//
this.dtpHBeginDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHBeginDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBeginDate1.Location = new System.Drawing.Point(112, 77);
- this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHBeginDate1.Location = new System.Drawing.Point(149, 96);
+ this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dtpHBeginDate1.Name = "dtpHBeginDate1";
- this.dtpHBeginDate1.Size = new System.Drawing.Size(213, 30);
+ this.dtpHBeginDate1.Size = new System.Drawing.Size(283, 36);
this.dtpHBeginDate1.TabIndex = 100;
//
// label11
@@ -593,9 +625,10 @@
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(33, 85);
+ this.label11.Location = new System.Drawing.Point(44, 106);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(72, 16);
+ this.label11.Size = new System.Drawing.Size(89, 20);
this.label11.TabIndex = 99;
this.label11.Text = "寮�濮嬫棩鏈�";
//
@@ -604,9 +637,10 @@
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(427, 35);
+ this.label12.Location = new System.Drawing.Point(569, 44);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(40, 16);
+ this.label12.Size = new System.Drawing.Size(49, 20);
this.label12.TabIndex = 55;
this.label12.Text = "鐗╂枡";
//
@@ -614,20 +648,22 @@
//
this.txtHICMOBillNo1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHICMOBillNo1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo1.Location = new System.Drawing.Point(112, 29);
+ this.txtHICMOBillNo1.Location = new System.Drawing.Point(149, 36);
+ this.txtHICMOBillNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo1.Name = "txtHICMOBillNo1";
this.txtHICMOBillNo1.ReadOnly = true;
- this.txtHICMOBillNo1.Size = new System.Drawing.Size(214, 30);
+ this.txtHICMOBillNo1.Size = new System.Drawing.Size(284, 36);
this.txtHICMOBillNo1.TabIndex = 47;
//
// txtHMaterID1
//
this.txtHMaterID1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHMaterID1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID1.Location = new System.Drawing.Point(477, 29);
+ this.txtHMaterID1.Location = new System.Drawing.Point(636, 36);
+ this.txtHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHMaterID1.Name = "txtHMaterID1";
this.txtHMaterID1.ReadOnly = true;
- this.txtHMaterID1.Size = new System.Drawing.Size(184, 30);
+ this.txtHMaterID1.Size = new System.Drawing.Size(244, 36);
this.txtHMaterID1.TabIndex = 56;
//
// label13
@@ -635,18 +671,20 @@
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(19, 35);
+ this.label13.Location = new System.Drawing.Point(25, 44);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(88, 16);
+ this.label13.Size = new System.Drawing.Size(109, 20);
this.label13.TabIndex = 46;
this.label13.Text = "鐢熶骇璁㈠崟鍙�";
//
// cmdHMaterID1
//
this.cmdHMaterID1.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID1.Image")));
- this.cmdHMaterID1.Location = new System.Drawing.Point(660, 27);
+ this.cmdHMaterID1.Location = new System.Drawing.Point(880, 34);
+ this.cmdHMaterID1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHMaterID1.Name = "cmdHMaterID1";
- this.cmdHMaterID1.Size = new System.Drawing.Size(32, 32);
+ this.cmdHMaterID1.Size = new System.Drawing.Size(43, 40);
this.cmdHMaterID1.TabIndex = 57;
this.cmdHMaterID1.UseVisualStyleBackColor = true;
this.cmdHMaterID1.Click += new System.EventHandler(this.cmdHMaterID1_Click);
@@ -657,21 +695,23 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub.Location = new System.Drawing.Point(9, 618);
+ this.grdSub.Location = new System.Drawing.Point(12, 772);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 51;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(866, 228);
+ this.grdSub.Size = new System.Drawing.Size(1155, 285);
this.grdSub.TabIndex = 145;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(901, 688);
- this.button1.Margin = new System.Windows.Forms.Padding(2);
+ this.button1.Location = new System.Drawing.Point(1200, 782);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(112, 50);
+ this.button1.Size = new System.Drawing.Size(149, 62);
this.button1.TabIndex = 146;
this.button1.Text = "琛ユ墦鏉＄爜";
this.button1.UseVisualStyleBackColor = false;
@@ -681,37 +721,41 @@
//
this.鏁寸鏁伴噺.AutoSize = true;
this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.鏁寸鏁伴噺.Location = new System.Drawing.Point(900, 190);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(1200, 238);
+ this.鏁寸鏁伴噺.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
- this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
+ this.鏁寸鏁伴噺.Size = new System.Drawing.Size(151, 34);
this.鏁寸鏁伴噺.TabIndex = 148;
- this.鏁寸鏁伴噺.Text = "鏁寸鏁伴噺";
+ this.鏁寸鏁伴噺.Text = "鏈鏁伴噺";
//
// txtHZXQty
//
- this.txtHZXQty.Location = new System.Drawing.Point(900, 221);
+ this.txtHZXQty.Location = new System.Drawing.Point(1200, 276);
+ this.txtHZXQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHZXQty.Multiline = true;
this.txtHZXQty.Name = "txtHZXQty";
- this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
+ this.txtHZXQty.Size = new System.Drawing.Size(148, 52);
this.txtHZXQty.TabIndex = 147;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(9, 181);
+ this.tabControl1.Location = new System.Drawing.Point(12, 226);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(879, 298);
+ this.tabControl1.Size = new System.Drawing.Size(1172, 372);
this.tabControl1.TabIndex = 149;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(871, 272);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1164, 343);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -719,10 +763,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdList);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(871, 272);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(1164, 343);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -733,22 +778,23 @@
this.grdList.AllowUserToDeleteRows = false;
this.grdList.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdList.Location = new System.Drawing.Point(3, 3);
+ this.grdList.Location = new System.Drawing.Point(4, 4);
this.grdList.Margin = new System.Windows.Forms.Padding(0);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 51;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(866, 269);
+ this.grdList.Size = new System.Drawing.Size(1155, 336);
this.grdList.TabIndex = 20;
//
// button2
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(900, 436);
- this.button2.Margin = new System.Windows.Forms.Padding(2);
+ this.button2.Location = new System.Drawing.Point(1200, 545);
+ this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(112, 44);
+ this.button2.Size = new System.Drawing.Size(149, 55);
this.button2.TabIndex = 150;
this.button2.Text = "涓婁竴涓墿鏂�";
this.button2.UseVisualStyleBackColor = false;
@@ -758,10 +804,10 @@
//
this.button3.BackColor = System.Drawing.Color.White;
this.button3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1036, 378);
- this.button3.Margin = new System.Windows.Forms.Padding(2);
+ this.button3.Location = new System.Drawing.Point(1381, 472);
+ this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(112, 44);
+ this.button3.Size = new System.Drawing.Size(149, 55);
this.button3.TabIndex = 151;
this.button3.Text = "涓嬩竴涓墿鏂�";
this.button3.UseVisualStyleBackColor = false;
@@ -771,10 +817,10 @@
//
this.button7.BackColor = System.Drawing.Color.White;
this.button7.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button7.Location = new System.Drawing.Point(1036, 436);
- this.button7.Margin = new System.Windows.Forms.Padding(2);
+ this.button7.Location = new System.Drawing.Point(1381, 545);
+ this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(112, 44);
+ this.button7.Size = new System.Drawing.Size(149, 55);
this.button7.TabIndex = 152;
this.button7.Text = "瓒呴鐢熶骇";
this.button7.UseVisualStyleBackColor = false;
@@ -782,10 +828,10 @@
//
// Sc_ICMOToBarCode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
- this.ClientSize = new System.Drawing.Size(1172, 869);
+ this.ClientSize = new System.Drawing.Size(1563, 1055);
this.Controls.Add(this.button7);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
@@ -804,6 +850,7 @@
this.Controls.Add(this.button4);
this.Controls.Add(this.gbUp);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ICMOToBarCode";
this.Text = "蹇�熺敓鎴愭潯鐮�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
index 19878a1..646138a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
@@ -360,7 +360,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -370,7 +370,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
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -385,7 +385,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -400,7 +400,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
--
Gitblit v1.9.1