From e76b1ea33c510c75064f4f9a993ffd2564fca115 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 26 十二月 2022 08:56:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBillList.designer.cs | 195 +++++++++++++++++++++++++++++-------------------
1 files changed, 119 insertions(+), 76 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
index 55b90d4..060e7d2 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.designer.cs"
@@ -31,12 +31,13 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_StationOutBillList));
this.pPic = new System.Windows.Forms.Panel();
- this.label3 = new System.Windows.Forms.Label();
this.txtHOrderProcNO = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
this.txtHCenterID = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.chkWJieAn = new System.Windows.Forms.CheckBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lbljl = new System.Windows.Forms.Label();
this.lbldj = new System.Windows.Forms.Label();
@@ -72,7 +73,8 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.chkWJieAn = new System.Windows.Forms.CheckBox();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.fj = new System.Windows.Forms.ToolStripButton();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -96,89 +98,110 @@
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 50);
+ this.pPic.Location = new System.Drawing.Point(0, 62);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1246, 53);
+ this.pPic.Size = new System.Drawing.Size(1661, 66);
this.pPic.TabIndex = 15;
+ //
+ // txtHOrderProcNO
+ //
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(399, 19);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHOrderProcNO.Name = "txtHOrderProcNO";
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(215, 25);
+ this.txtHOrderProcNO.TabIndex = 17;
+ this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
+ //
+ // txtHCenterID
+ //
+ this.txtHCenterID.Location = new System.Drawing.Point(716, 19);
+ this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHCenterID.Name = "txtHCenterID";
+ this.txtHCenterID.Size = new System.Drawing.Size(215, 25);
+ this.txtHCenterID.TabIndex = 15;
+ this.txtHCenterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHCenterID_KeyDown);
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Location = new System.Drawing.Point(1033, 19);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(215, 25);
+ this.txtHBillNo.TabIndex = 9;
+ this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
+ //
+ // chkWJieAn
+ //
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(1275, 24);
+ this.chkWJieAn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.chkWJieAn.Name = "chkWJieAn";
+ this.chkWJieAn.Size = new System.Drawing.Size(74, 19);
+ this.chkWJieAn.TabIndex = 104;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(222, 19);
+ this.label3.Location = new System.Drawing.Point(296, 24);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(77, 12);
+ this.label3.Size = new System.Drawing.Size(97, 15);
this.label3.TabIndex = 18;
this.label3.Text = "璁㈠崟璺熻釜鍙凤細";
- //
- // txtHOrderProcNO
- //
- this.txtHOrderProcNO.Location = new System.Drawing.Point(299, 15);
- this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(162, 21);
- this.txtHOrderProcNO.TabIndex = 17;
- this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(472, 19);
+ this.label2.Location = new System.Drawing.Point(629, 24);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(65, 12);
+ this.label2.Size = new System.Drawing.Size(82, 15);
this.label2.TabIndex = 14;
this.label2.Text = "宸ヤ綔涓績锛�";
- //
- // txtHCenterID
- //
- this.txtHCenterID.Location = new System.Drawing.Point(537, 15);
- this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(162, 21);
- this.txtHCenterID.TabIndex = 15;
- this.txtHCenterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHCenterID_KeyDown);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(708, 19);
+ this.label1.Location = new System.Drawing.Point(944, 24);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(65, 12);
+ this.label1.Size = new System.Drawing.Size(82, 15);
this.label1.TabIndex = 8;
this.label1.Text = "娴佽浆鍗″彿锛�";
- //
- // txtHBillNo
- //
- this.txtHBillNo.Location = new System.Drawing.Point(775, 15);
- this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(162, 21);
- this.txtHBillNo.TabIndex = 9;
- this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
// panel1
//
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1049, 0);
+ this.panel1.Location = new System.Drawing.Point(1398, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(197, 53);
+ this.panel1.Size = new System.Drawing.Size(263, 66);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(24, 30);
+ this.lbljl.Location = new System.Drawing.Point(32, 38);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(15, 15);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(24, 12);
+ this.lbldj.Location = new System.Drawing.Point(32, 15);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 15);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -187,9 +210,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 15);
+ this.lblCaption.Location = new System.Drawing.Point(16, 19);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(142, 21);
+ this.lblCaption.Size = new System.Drawing.Size(180, 27);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "姹囨姤鎵弿鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -216,6 +240,8 @@
this.qsh,
this.toolStripSeparator6,
this.bzd,
+ this.toolStripSeparator10,
+ this.fj,
this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
@@ -227,7 +253,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(1246, 50);
+ this.Tool.Size = new System.Drawing.Size(1661, 62);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -241,7 +267,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 59);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -249,14 +275,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -291,7 +317,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// cx
//
@@ -324,7 +350,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -371,7 +397,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// sh
//
@@ -404,7 +430,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// bzd
//
@@ -423,7 +449,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -442,13 +468,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
//
@@ -458,7 +484,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;
@@ -468,7 +494,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
//
@@ -478,7 +504,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;
@@ -488,7 +514,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);
//
// timer1
//
@@ -506,11 +532,13 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 103);
+ this.grdMain.Location = new System.Drawing.Point(0, 128);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1246, 409);
+ this.grdMain.Size = new System.Drawing.Size(1661, 512);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -521,10 +549,12 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Location = new System.Drawing.Point(1029, 182);
+ 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(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -535,35 +565,46 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 512);
+ this.grdSum.Location = new System.Drawing.Point(0, 640);
+ 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(1246, 19);
+ this.grdSum.Size = new System.Drawing.Size(1661, 24);
this.grdSum.TabIndex = 47;
//
- // chkWJieAn
+ // toolStripSeparator10
//
- this.chkWJieAn.AutoSize = true;
- this.chkWJieAn.Location = new System.Drawing.Point(956, 19);
- this.chkWJieAn.Margin = new System.Windows.Forms.Padding(2);
- this.chkWJieAn.Name = "chkWJieAn";
- this.chkWJieAn.Size = new System.Drawing.Size(60, 16);
- this.chkWJieAn.TabIndex = 104;
- this.chkWJieAn.Text = "鏈粨妗�";
- this.chkWJieAn.UseVisualStyleBackColor = true;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ //
+ // fj
+ //
+ this.fj.AutoSize = false;
+ this.fj.Image = ((System.Drawing.Image)(resources.GetObject("fj.Image")));
+ this.fj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fj.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fj.Name = "fj";
+ this.fj.Size = new System.Drawing.Size(36, 47);
+ this.fj.Text = "闄勪欢";
+ this.fj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fj.Click += new System.EventHandler(this.fj_Click);
//
// MES_StationOutBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1246, 531);
+ this.ClientSize = new System.Drawing.Size(1661, 664);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MES_StationOutBillList";
this.Text = "姹囨姤鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -626,5 +667,7 @@
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
private System.Windows.Forms.CheckBox chkWJieAn;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.ToolStripButton fj;
}
}
\ No newline at end of file
--
Gitblit v1.9.1