From 494c68c9ad1cc3b085c27e87865269c4593c24e8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 09:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBillList.designer.cs | 180 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 111 insertions(+), 69 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 62042df..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,17 +31,21 @@
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();
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dc = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@@ -69,9 +73,8 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.fj = new System.Windows.Forms.ToolStripButton();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -85,79 +88,91 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.pPic.Controls.Add(this.label3);
this.pPic.Controls.Add(this.txtHOrderProcNO);
- this.pPic.Controls.Add(this.label2);
this.pPic.Controls.Add(this.txtHCenterID);
- this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.label3);
+ this.pPic.Controls.Add(this.label2);
+ this.pPic.Controls.Add(this.label1);
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, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
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(293, 18);
+ 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(97, 15);
this.label3.TabIndex = 18;
this.label3.Text = "璁㈠崟璺熻釜鍙凤細";
//
- // txtHOrderProcNO
- //
- this.txtHOrderProcNO.Location = new System.Drawing.Point(399, 13);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(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);
- //
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(630, 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(82, 15);
this.label2.TabIndex = 14;
this.label2.Text = "宸ヤ綔涓績锛�";
//
- // txtHCenterID
- //
- this.txtHCenterID.Location = new System.Drawing.Point(720, 15);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(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);
- //
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(944, 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(82, 15);
this.label1.TabIndex = 8;
this.label1.Text = "娴佽浆鍗″彿锛�";
- //
- // txtHBillNo
- //
- this.txtHBillNo.Location = new System.Drawing.Point(1034, 15);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(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);
//
// panel1
//
@@ -165,7 +180,7 @@
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(1398, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(263, 66);
this.panel1.TabIndex = 7;
@@ -225,6 +240,8 @@
this.qsh,
this.toolStripSeparator6,
this.bzd,
+ this.toolStripSeparator10,
+ this.fj,
this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
@@ -240,6 +257,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ 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(53, 59);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ 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(136, 26);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// dc
//
@@ -488,9 +533,10 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ 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(1661, 512);
this.grdMain.TabIndex = 19;
@@ -504,8 +550,9 @@
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ 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(33, 30);
this.grdPrint.TabIndex = 8;
@@ -519,41 +566,33 @@
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grdSum.Location = new System.Drawing.Point(0, 640);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ 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(1661, 24);
this.grdSum.TabIndex = 47;
//
- // toolStripDropDownButton1
+ // toolStripSeparator10
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- 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(53, 59);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
- // eXCELToolStripMenuItem
+ // fj
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(181, 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(181, 26);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ 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
//
@@ -565,7 +604,7 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MES_StationOutBillList";
this.Text = "姹囨姤鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -627,5 +666,8 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
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