From 180e5879d508734f1ad395dba7f81e0d59a8627e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 一月 2026 08:38:07 +0800
Subject: [PATCH] 丸井客户条码标签生成模块修改，供应商编码根据物料带出
---
SCM/Gy_BarCodeBill_Cus.designer.cs | 315 ++++++++++++++++++--------------------------
SCM/Gy_BarCodeBill_Cus.cs | 36 ++--
SCM/Gy_BarCodeBill_Cus.resx | 14 +-
SCM/公用类/ClsPub1.cs | 4
4 files changed, 160 insertions(+), 209 deletions(-)
diff --git a/SCM/Gy_BarCodeBill_Cus.cs b/SCM/Gy_BarCodeBill_Cus.cs
index ca177a5..fab99fd 100644
--- a/SCM/Gy_BarCodeBill_Cus.cs
+++ b/SCM/Gy_BarCodeBill_Cus.cs
@@ -483,8 +483,11 @@
MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) + " 锛屼腑瀛樺湪鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负 0锛屼笉鍏佽鐢熸垚鏉＄爜锛�");
return false;
}
-
-
+ if (ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) != "" && ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupNumberCol].Value) == "")
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝瀹㈡埛闆朵欢鍙凤細" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value) + " 锛屽搴斾緵搴斿晢缂栫爜涓虹┖锛屼笉鍏佽鐢熸垚鏉＄爜锛�");
+ return false;
+ }
}
return true;
@@ -916,18 +919,18 @@
//璁剧疆鍙紪杈戝垪
string sAllowCol;
sAllowCol = HQtyCol.ToString() +
- "," + HCusModelCol.ToString() +
- "," + HMaterIDCol.ToString() +
- "," + HCusModelNameCol.ToString() +
- "," + HWorkLineNameCol.ToString() +
- "," + HSupNumberCol.ToString() +
- "," + HSupNameCol.ToString() +
- "," + HCode1Col.ToString() +
- "," + HCode2Col.ToString() +
- "," + HCode3Col.ToString() +
- "," + HBarCodeDateCol.ToString() +
- "," + HBackDataFlagCol.ToString() +
- "," + HMinQtyCol.ToString();
+ //"," + HCusModelCol.ToString() +
+ //"," + HMinQtyCol.ToString() +
+ //"," + HCusModelNameCol.ToString() +
+ //"," + HWorkLineNameCol.ToString() +
+ //"," + HSupNumberCol.ToString() +
+ //"," + HSupNameCol.ToString() +
+ //"," + HCode1Col.ToString() +
+ //"," + HCode2Col.ToString() +
+ //"," + HCode3Col.ToString() +
+ //"," + HBarCodeDateCol.ToString() +
+ //"," + HBackDataFlagCol.ToString() +
+ "," + HMaterIDCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
//
@@ -1173,7 +1176,6 @@
grdMain.Rows[sRow].Cells[HCode1Col].Value = "00";
grdMain.Rows[sRow].Cells[HCode2Col].Value ="000";
grdMain.Rows[sRow].Cells[HCode3Col].Value = "0000";
- grdMain.Rows[sRow].Cells[HSupNumberCol].Value = "VG509";
grdMain.Rows[sRow].Cells[HWorkLineNameCol].Value = "1";
grdMain.Rows[sRow].Cells[HBarCodeDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[sRow].Cells[HBackDataFlagCol].Value = "%";
@@ -1193,12 +1195,12 @@
if (oDs2 != null && oDs2.Tables[0].Rows.Count > 0)
{
grdMain.Rows[sRow].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(oDs2.Tables[0].Rows[0]["HPinfan"]);
-
+ grdMain.Rows[sRow].Cells[HSupNumberCol].Value = DBUtility.ClsPub.isStrNull(oDs2.Tables[0].Rows[0]["HSupNumber"]);
}
else
{
grdMain.Rows[sRow].Cells[HCusModelCol].Value = "";
-
+ grdMain.Rows[sRow].Cells[HSupNumberCol].Value = "";
}
//}
break;
diff --git a/SCM/Gy_BarCodeBill_Cus.designer.cs b/SCM/Gy_BarCodeBill_Cus.designer.cs
index 0be2cf9..ff1d856 100644
--- a/SCM/Gy_BarCodeBill_Cus.designer.cs
+++ b/SCM/Gy_BarCodeBill_Cus.designer.cs
@@ -141,7 +141,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(1356, 62);
+ this.Tool.Size = new System.Drawing.Size(1017, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -177,12 +177,13 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Visible = false;
//
// bc
//
@@ -215,7 +216,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -235,7 +236,7 @@
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -245,7 +246,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -255,7 +256,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -265,7 +266,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -275,16 +276,15 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
//
// lblCaption
//
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(668, 15);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(501, 12);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(110, 24);
+ this.lblCaption.Size = new System.Drawing.Size(89, 19);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
@@ -296,18 +296,16 @@
this.P1.Controls.Add(this.gbUp);
this.P1.Controls.Add(this.pb1);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1249, 208);
+ this.P1.Size = new System.Drawing.Size(937, 166);
this.P1.TabIndex = 31;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(417, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Location = new System.Drawing.Point(313, 3);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(104, 51);
+ this.pic1.Size = new System.Drawing.Size(78, 41);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -336,29 +334,28 @@
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(19, 49);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Location = new System.Drawing.Point(14, 39);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1189, 150);
+ this.gbUp.Size = new System.Drawing.Size(892, 120);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
// txtHCaseNo
//
- this.txtHCaseNo.Location = new System.Drawing.Point(525, 96);
- this.txtHCaseNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txtHCaseNo.Location = new System.Drawing.Point(394, 77);
+ this.txtHCaseNo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtHCaseNo.Name = "txtHCaseNo";
- this.txtHCaseNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHCaseNo.Size = new System.Drawing.Size(188, 21);
this.txtHCaseNo.TabIndex = 107;
this.txtHCaseNo.Visible = false;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(436, 101);
+ this.label5.Location = new System.Drawing.Point(327, 81);
+ this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(69, 15);
+ this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 106;
this.label5.Text = "绠� 鍙�";
this.label5.Visible = false;
@@ -368,10 +365,9 @@
this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHGroupID.Location = new System.Drawing.Point(356, 95);
- this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHGroupID.Location = new System.Drawing.Point(267, 76);
this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHGroupID.Size = new System.Drawing.Size(22, 22);
this.cmdHGroupID.TabIndex = 105;
this.cmdHGroupID.UseVisualStyleBackColor = false;
this.cmdHGroupID.Visible = false;
@@ -381,21 +377,19 @@
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(47, 101);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(35, 81);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(69, 15);
+ this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.TabIndex = 103;
this.label6.Text = "鐝� 缁�";
this.label6.Visible = false;
//
// txtHGroupID
//
- this.txtHGroupID.Location = new System.Drawing.Point(135, 96);
- this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHGroupID.Location = new System.Drawing.Point(101, 77);
this.txtHGroupID.Name = "txtHGroupID";
this.txtHGroupID.ReadOnly = true;
- this.txtHGroupID.Size = new System.Drawing.Size(220, 25);
+ this.txtHGroupID.Size = new System.Drawing.Size(166, 21);
this.txtHGroupID.TabIndex = 104;
this.txtHGroupID.Tag = "0";
this.txtHGroupID.Visible = false;
@@ -404,10 +398,10 @@
// chkAddModel
//
this.chkAddModel.AutoSize = true;
- this.chkAddModel.Location = new System.Drawing.Point(1056, 99);
- this.chkAddModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.chkAddModel.Location = new System.Drawing.Point(792, 79);
+ this.chkAddModel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkAddModel.Name = "chkAddModel";
- this.chkAddModel.Size = new System.Drawing.Size(89, 19);
+ this.chkAddModel.Size = new System.Drawing.Size(72, 16);
this.chkAddModel.TabIndex = 102;
this.chkAddModel.Text = "杩藉姞妯″紡";
this.chkAddModel.UseVisualStyleBackColor = true;
@@ -416,38 +410,37 @@
//
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
- this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
- this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(394, 17);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
- this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(188, 20);
this.cmbHWorksNumber.TabIndex = 100;
//
// label4
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(436, 26);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(327, 21);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 99;
this.label4.Text = "宸ュ巶浠ｇ爜";
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(901, 21);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHDate.Location = new System.Drawing.Point(676, 17);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHDate.Size = new System.Drawing.Size(188, 21);
this.dtpHDate.TabIndex = 94;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(812, 26);
+ this.label2.Location = new System.Drawing.Point(609, 21);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(69, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 93;
this.label2.Text = "鏃� 鏈�";
//
@@ -455,20 +448,18 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
- this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
+ this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
this.cmbHOrgID.TabIndex = 85;
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(47, 26);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(35, 21);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(69, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -478,20 +469,18 @@
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
- this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 59);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 47);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(812, 64);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(609, 51);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 80;
this.label1.Text = "鏉＄爜绫诲瀷";
//
@@ -500,10 +489,9 @@
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(1189, -9);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -512,10 +500,9 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 58);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 46);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
this.cmdSourceBillNo.TabIndex = 42;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -523,10 +510,9 @@
// txtHSourceBillNo
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 59);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 47);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
this.txtHSourceBillNo.TabIndex = 41;
this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
@@ -534,10 +520,9 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(436, 64);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(327, 51);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(68, 15);
+ this.label14.Size = new System.Drawing.Size(53, 12);
this.label14.TabIndex = 40;
this.label14.Text = "閫� 鍗� 鍙�";
//
@@ -546,29 +531,26 @@
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(135, 59);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbSourceBillType.Location = new System.Drawing.Point(101, 47);
this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
+ this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
this.cmbSourceBillType.TabIndex = 36;
//
// label10
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(47, 64);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(35, 51);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.Size = new System.Drawing.Size(53, 12);
this.label10.TabIndex = 35;
this.label10.Text = "婧愬崟绫诲瀷";
//
// pb1
//
- this.pb1.Location = new System.Drawing.Point(829, 15);
- this.pb1.Margin = new System.Windows.Forms.Padding(4);
+ this.pb1.Location = new System.Drawing.Point(643, 12);
this.pb1.Name = "pb1";
- this.pb1.Size = new System.Drawing.Size(341, 29);
+ this.pb1.Size = new System.Drawing.Size(256, 23);
this.pb1.TabIndex = 92;
//
// panel2
@@ -595,20 +577,18 @@
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(55, 634);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.panel2.Location = new System.Drawing.Point(41, 507);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1249, 116);
+ this.panel2.Size = new System.Drawing.Size(937, 93);
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(967, 59);
- this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -616,10 +596,9 @@
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(888, 62);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Location = new System.Drawing.Point(666, 50);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(67, 15);
+ this.label25.Size = new System.Drawing.Size(53, 12);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -627,10 +606,9 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
- this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -638,10 +616,9 @@
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(888, 15);
- this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Location = new System.Drawing.Point(666, 12);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(52, 15);
+ this.label27.Size = new System.Drawing.Size(41, 12);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -649,10 +626,9 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
- this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -660,10 +636,9 @@
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(671, 59);
- this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Location = new System.Drawing.Point(503, 47);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.Size = new System.Drawing.Size(53, 12);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -671,10 +646,9 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
- this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -682,10 +656,9 @@
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(671, 15);
- this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Location = new System.Drawing.Point(503, 12);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(52, 15);
+ this.label21.Size = new System.Drawing.Size(41, 12);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -693,10 +666,9 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
- this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -704,10 +676,9 @@
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(451, 62);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Location = new System.Drawing.Point(338, 50);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.Size = new System.Drawing.Size(53, 12);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -715,10 +686,9 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
- this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -726,10 +696,9 @@
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(451, 20);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(338, 16);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.Size = new System.Drawing.Size(41, 12);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -737,10 +706,9 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
- this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -748,10 +716,9 @@
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(233, 62);
- this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Location = new System.Drawing.Point(175, 50);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.Size = new System.Drawing.Size(53, 12);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -759,10 +726,9 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(312, 16);
- this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHChecker.Location = new System.Drawing.Point(234, 13);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(131, 19);
+ this.txtHChecker.Size = new System.Drawing.Size(98, 15);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -770,10 +736,9 @@
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(233, 20);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(175, 16);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -781,10 +746,9 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
- this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -792,10 +756,9 @@
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(16, 62);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(12, 50);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(67, 15);
+ this.label11.Size = new System.Drawing.Size(53, 12);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -803,10 +766,9 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(95, 16);
- this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMaker.Location = new System.Drawing.Point(71, 13);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(131, 19);
+ this.txtHMaker.Size = new System.Drawing.Size(98, 15);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -814,10 +776,9 @@
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(16, 20);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(12, 16);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -829,19 +790,17 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(0, 50);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(55, 688);
+ this.panel1.Size = new System.Drawing.Size(41, 550);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Location = new System.Drawing.Point(978, 50);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(52, 688);
+ this.panel3.Size = new System.Drawing.Size(39, 550);
this.panel3.TabIndex = 34;
//
// grdMain
@@ -853,13 +812,12 @@
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, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1233, 303);
+ this.grdMain.Size = new System.Drawing.Size(923, 240);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -876,25 +834,23 @@
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(55, 610);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(41, 488);
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(1249, 24);
+ this.grdSum.Size = new System.Drawing.Size(937, 19);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(809, 543);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -904,21 +860,19 @@
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(55, 270);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Location = new System.Drawing.Point(41, 216);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1249, 340);
+ this.tabControl1.Size = new System.Drawing.Size(937, 272);
this.tabControl1.TabIndex = 47;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1241, 311);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(929, 246);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -926,11 +880,10 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage2.Size = new System.Drawing.Size(1241, 311);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Size = new System.Drawing.Size(929, 246);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -944,13 +897,12 @@
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, 4);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub.Location = new System.Drawing.Point(3, 3);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1233, 303);
+ this.grdSub.Size = new System.Drawing.Size(923, 240);
this.grdSub.TabIndex = 45;
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
this.grdSub.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellEndEdit);
@@ -958,10 +910,9 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 25);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1241, 311);
+ this.tabPage3.Size = new System.Drawing.Size(929, 246);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -976,20 +927,19 @@
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);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1241, 311);
+ this.grdList.Size = new System.Drawing.Size(929, 246);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill_Cus
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1356, 750);
+ this.ClientSize = new System.Drawing.Size(1017, 600);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1000,7 +950,6 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_BarCodeBill_Cus";
this.Text = "瀹㈡埛鏍囩";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git a/SCM/Gy_BarCodeBill_Cus.resx b/SCM/Gy_BarCodeBill_Cus.resx
index b415aae..b255f79 100644
--- a/SCM/Gy_BarCodeBill_Cus.resx
+++ b/SCM/Gy_BarCodeBill_Cus.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
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -398,7 +398,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -407,7 +407,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -417,7 +417,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -432,7 +432,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs" "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
index 07ee99f..2462720 100644
--- "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
+++ "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
@@ -14,10 +14,10 @@
//public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx"; //闆呯惇璇�
//public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳 鍐呯綉
//public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳(涓嶇敤)
- //public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 澶栫綉
+ public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 澶栫綉
//public static string WEBSURL = "http://192.168.0.178:8099/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 鍐呯綉
//public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 鍐呯綉锛堜綔搴燂級
- public static string WEBSURL = "http://220.189.218.155:9010//WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂扮郴缁�
+ //public static string WEBSURL = "http://220.189.218.155:9010//WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂扮郴缁�
//public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx"; //闊╃數 澶栫綉JIT锛堜笉鐢級
//public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx"; //闊╃數 澶栫綉
//public static string WEBSURL = "http://192.168.10.60/WMSWEBS/WebService1.asmx"; //闊╃數 鍐呯綉瀹佹尝
--
Gitblit v1.9.1