From 055b64bfcdcb83aafa2986566df3fba49ed2eb98 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 四月 2022 14:02:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationEntrustInBillList.designer.cs | 218 ++++++------
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8
WorkM/流转卡管理/MES_StationOutBillList_Bad.cs | 9
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
WorkM/流转卡管理/MES_StationOutBillList.cs | 6
WorkM/流转卡管理/MES_StationEntrustOutBillList.cs | 6
WorkM/流转卡管理/MES_StationInBillList.cs | 6
WorkM/流转卡管理/MES_StationEntrustOutBillList.resx | 34 +-
WorkM/流转卡管理/MES_StationInBillList.resx | 28
WorkM/流转卡管理/MES_StationEntrustInBillList.cs | 5
WorkM/流转卡管理/MES_StationInBillList.designer.cs | 149 ++++----
WorkM/流转卡管理/MES_StationEntrustOutBillList.designer.cs | 269 +++++++--------
WorkM/流转卡管理/MES_StationEntrustInBillList.resx | 38 +-
WorkM/流转卡管理/MES_StationOutBillList.resx | 28
WorkM/流转卡管理/MES_StationOutBillList.designer.cs | 177 +++++-----
15 files changed, 504 insertions(+), 479 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 53e96b7..4a18d08 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -164,6 +164,10 @@
{
omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
@@ -440,6 +444,10 @@
{
omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
+ {
+ omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index c7e69f1..4d9f633 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -28,6 +28,7 @@
public string Kf_MateOutBill_MulSourceBill; //多源单模式
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
//生产退料
public string Kf_MateOutBackBill_AutoCheck;
public string Kf_MateOutBackBill_ERPMode;
@@ -110,6 +111,7 @@
public string Kf_MoveStockBill_MulSourceBill; //多源单模式
public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致
public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
+ public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
//补料单
public string Kf_MateReplenishOutBill_AutoCheck;
public string Kf_MateReplenishOutBill_ERPMode;
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
index b105873..ec5b2b8 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
@@ -52,6 +52,10 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
if (frmCondition.SqlStr.Trim().Length == 0)
{
@@ -202,6 +206,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
index 51d39ff..5835a09 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.designer.cs"
@@ -47,6 +47,9 @@
this.label4 = 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.yc = new System.Windows.Forms.ToolStripButton();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -82,9 +85,7 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdSub1 = new System.Windows.Forms.DataGridView();
this.grdSumPrint = 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.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -100,30 +101,29 @@
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.btnOK);
this.pPic.Controls.Add(this.txtHOrderProcNO);
+ this.pPic.Controls.Add(this.txtHMaterID);
+ this.pPic.Controls.Add(this.txtHLotNo);
+ this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.btnOK);
this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.label3);
- this.pPic.Controls.Add(this.txtHMaterID);
this.pPic.Controls.Add(this.label2);
- this.pPic.Controls.Add(this.txtHLotNo);
this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBillNo);
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.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1686, 66);
+ this.pPic.Size = new System.Drawing.Size(1264, 53);
this.pPic.TabIndex = 15;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1283, 17);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Location = new System.Drawing.Point(885, 12);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(83, 30);
+ this.btnOK.Size = new System.Drawing.Size(62, 24);
this.btnOK.TabIndex = 31;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -131,10 +131,9 @@
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(555, 17);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(339, 14);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(119, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(90, 21);
this.txtHOrderProcNO.TabIndex = 27;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -142,10 +141,9 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(448, 17);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(263, 18);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.TabIndex = 26;
this.label5.Text = "璁㈠崟璺熻釜鍙凤細";
//
@@ -153,19 +151,17 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(682, 17);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(436, 18);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 23;
- this.label3.Text = "浜у搧锛�";
+ this.label3.Text = "浜� 鍝侊細";
//
// txtHMaterID
//
- this.txtHMaterID.Location = new System.Drawing.Point(737, 17);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(489, 14);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(119, 25);
+ this.txtHMaterID.Size = new System.Drawing.Size(90, 21);
this.txtHMaterID.TabIndex = 22;
this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
//
@@ -173,19 +169,17 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(864, 17);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(587, 18);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 16;
this.label2.Text = "鍗曟嵁鍙凤細";
//
// txtHLotNo
//
- this.txtHLotNo.Location = new System.Drawing.Point(1156, 17);
- this.txtHLotNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHLotNo.Location = new System.Drawing.Point(789, 14);
this.txtHLotNo.Name = "txtHLotNo";
- this.txtHLotNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHLotNo.Size = new System.Drawing.Size(90, 21);
this.txtHLotNo.TabIndex = 17;
this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
//
@@ -193,19 +187,17 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(1066, 17);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(731, 18);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 14;
this.label1.Text = "娴佽浆鍗″彿锛�";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(939, 17);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(639, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(90, 21);
this.txtHBillNo.TabIndex = 15;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -216,37 +208,33 @@
this.panel1.Controls.Add(this.txtHInnerBillNo);
this.panel1.Controls.Add(this.label4);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1401, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1050, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(285, 66);
+ this.panel1.Size = new System.Drawing.Size(214, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// txtHInnerBillNo
//
- this.txtHInnerBillNo.Location = new System.Drawing.Point(175, 19);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(131, 15);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(119, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(90, 21);
this.txtHInnerBillNo.TabIndex = 25;
this.txtHInnerBillNo.Visible = false;
this.txtHInnerBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHInnerBillNo_KeyDown);
@@ -255,10 +243,9 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(85, 24);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(64, 19);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(82, 15);
+ this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 24;
this.label4.Text = "閫佽揣鍗曞彿锛�";
this.label4.Visible = false;
@@ -269,10 +256,9 @@
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(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "濮斿鍙戝嚭鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -316,10 +302,38 @@
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(1686, 62);
+ this.Tool.Size = new System.Drawing.Size(1264, 50);
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(45, 47);
+ 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(112, 22);
+ 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.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// dc
//
@@ -382,7 +396,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -415,7 +429,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -463,7 +477,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
//
// fahuo
//
@@ -498,7 +512,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -534,7 +548,7 @@
// 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;
//
// gb
@@ -570,7 +584,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -589,13 +603,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -605,7 +619,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;
@@ -615,7 +629,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -625,7 +639,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;
@@ -635,7 +649,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -653,12 +667,11 @@
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, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1686, 676);
+ this.grdMain.Size = new System.Drawing.Size(1264, 540);
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);
@@ -669,11 +682,10 @@
// grdPrint
//
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.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
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 = 8;
this.grdPrint.Visible = false;
//
@@ -684,70 +696,50 @@
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, 804);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 643);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1686, 24);
+ this.grdSum.Size = new System.Drawing.Size(1264, 19);
this.grdSum.TabIndex = 47;
//
// grdSub1
//
this.grdSub1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub1.Location = new System.Drawing.Point(1076, 499);
- this.grdSub1.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub1.Location = new System.Drawing.Point(807, 399);
this.grdSub1.Name = "grdSub1";
this.grdSub1.RowTemplate.Height = 23;
- this.grdSub1.Size = new System.Drawing.Size(89, 75);
+ this.grdSub1.Size = new System.Drawing.Size(67, 60);
this.grdSub1.TabIndex = 49;
this.grdSub1.Visible = false;
//
// grdSumPrint
//
this.grdSumPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSumPrint.Location = new System.Drawing.Point(905, 400);
- this.grdSumPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSumPrint.Location = new System.Drawing.Point(679, 320);
this.grdSumPrint.Name = "grdSumPrint";
this.grdSumPrint.RowTemplate.Height = 23;
- this.grdSumPrint.Size = new System.Drawing.Size(260, 116);
+ this.grdSumPrint.Size = new System.Drawing.Size(195, 93);
this.grdSumPrint.TabIndex = 50;
this.grdSumPrint.Visible = false;
//
- // toolStripDropDownButton1
+ // chkWJieAn
//
- 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(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.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(957, 18);
+ 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 = 106;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// MES_StationEntrustInBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1686, 828);
+ this.ClientSize = new System.Drawing.Size(1264, 662);
this.Controls.Add(this.grdSumPrint);
this.Controls.Add(this.grdSub1);
this.Controls.Add(this.grdMain);
@@ -755,7 +747,6 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustInBillList";
this.Text = "濮斿鍙戝嚭鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -832,5 +823,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
index 4a40898..af7d8c0 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.resx"
@@ -3917,7 +3917,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3949,7 +3949,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
@@ -3959,7 +3959,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
@@ -3972,7 +3972,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3984,7 +3984,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3998,7 +3998,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4012,7 +4012,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4026,7 +4026,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4036,7 +4036,7 @@
<data name="fahuo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4046,7 +4046,7 @@
<data name="fhdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4056,7 +4056,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4069,7 +4069,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4082,7 +4082,7 @@
<data name="gb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4092,7 +4092,7 @@
<data name="hf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
@@ -4104,7 +4104,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
@@ -4114,7 +4114,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
@@ -4129,7 +4129,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/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
index f683154..602f3a2 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.cs"
@@ -51,6 +51,11 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by 鏃ユ湡 desc,鍗曟嵁鍙� desc ";
@@ -200,6 +205,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
index e8c41ea..224bd49 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.designer.cs"
@@ -31,15 +31,16 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_StationEntrustOutBillList));
this.pPic = new System.Windows.Forms.Panel();
- this.btnOK = new System.Windows.Forms.Button();
this.txtHOrderProcNO = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
this.txtHLotNo = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
this.txtHMaterID = new System.Windows.Forms.TextBox();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.chkWJieAn = new System.Windows.Forms.CheckBox();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
- this.txtHBillNo = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.lbljl = new System.Windows.Forms.Label();
this.lbldj = new System.Windows.Forms.Label();
@@ -47,6 +48,9 @@
this.txtHInnerBillNo = new System.Windows.Forms.TextBox();
this.label4 = 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.yc = new System.Windows.Forms.ToolStripButton();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -78,9 +82,6 @@
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdSub1 = 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.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -95,141 +96,140 @@
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.btnOK);
this.pPic.Controls.Add(this.txtHOrderProcNO);
- this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.txtHLotNo);
- this.pPic.Controls.Add(this.label3);
this.pPic.Controls.Add(this.txtHMaterID);
+ this.pPic.Controls.Add(this.txtHBillNo);
+ this.pPic.Controls.Add(this.chkWJieAn);
+ this.pPic.Controls.Add(this.btnOK);
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.label3);
this.pPic.Controls.Add(this.label2);
this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBillNo);
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.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1637, 66);
+ this.pPic.Size = new System.Drawing.Size(1228, 53);
this.pPic.TabIndex = 15;
+ //
+ // txtHOrderProcNO
+ //
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(338, 18);
+ this.txtHOrderProcNO.Name = "txtHOrderProcNO";
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(95, 21);
+ this.txtHOrderProcNO.TabIndex = 29;
+ //
+ // txtHLotNo
+ //
+ this.txtHLotNo.Location = new System.Drawing.Point(812, 18);
+ this.txtHLotNo.Name = "txtHLotNo";
+ this.txtHLotNo.Size = new System.Drawing.Size(95, 21);
+ this.txtHLotNo.TabIndex = 19;
+ this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
+ //
+ // txtHMaterID
+ //
+ this.txtHMaterID.Location = new System.Drawing.Point(496, 18);
+ this.txtHMaterID.Name = "txtHMaterID";
+ this.txtHMaterID.Size = new System.Drawing.Size(95, 21);
+ this.txtHMaterID.TabIndex = 20;
+ this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Location = new System.Drawing.Point(654, 18);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.Size = new System.Drawing.Size(95, 21);
+ this.txtHBillNo.TabIndex = 13;
+ this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
+ //
+ // chkWJieAn
+ //
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(997, 22);
+ 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 = 105;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1118, 20);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Location = new System.Drawing.Point(911, 16);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(97, 30);
+ this.btnOK.Size = new System.Drawing.Size(73, 24);
this.btnOK.TabIndex = 30;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
- // txtHOrderProcNO
- //
- this.txtHOrderProcNO.Location = new System.Drawing.Point(353, 21);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
- this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(125, 25);
- this.txtHOrderProcNO.TabIndex = 29;
- //
// label5
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(247, 26);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(263, 22);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.TabIndex = 28;
this.label5.Text = "璁㈠崟璺熻釜鍙凤細";
- //
- // txtHLotNo
- //
- this.txtHLotNo.Location = new System.Drawing.Point(985, 23);
- this.txtHLotNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHLotNo.Name = "txtHLotNo";
- this.txtHLotNo.Size = new System.Drawing.Size(125, 25);
- this.txtHLotNo.TabIndex = 19;
- this.txtHLotNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHLotNo_KeyDown);
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(488, 24);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(439, 22);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.TabIndex = 21;
- this.label3.Text = "浜у搧锛�";
- //
- // txtHMaterID
- //
- this.txtHMaterID.Location = new System.Drawing.Point(550, 21);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
- this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(125, 25);
- this.txtHMaterID.TabIndex = 20;
- this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
+ this.label3.Text = "浜� 鍝侊細";
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(689, 25);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(602, 22);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 18;
this.label2.Text = "鍗曟嵁鍙凤細";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(910, 26);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(754, 22);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 12;
this.label1.Text = "娴佽浆鍗″彿锛�";
- //
- // txtHBillNo
- //
- this.txtHBillNo.Location = new System.Drawing.Point(770, 21);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(125, 25);
- this.txtHBillNo.TabIndex = 13;
- 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(1352, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1014, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(285, 66);
+ this.panel1.Size = new System.Drawing.Size(214, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -238,20 +238,18 @@
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(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "濮斿鎺ユ敹鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// txtHInnerBillNo
//
- this.txtHInnerBillNo.Location = new System.Drawing.Point(901, 285);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(676, 228);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(125, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(95, 21);
this.txtHInnerBillNo.TabIndex = 27;
this.txtHInnerBillNo.Visible = false;
this.txtHInnerBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHInnerBillNo_KeyDown);
@@ -260,10 +258,9 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(830, 163);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(622, 130);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(82, 15);
+ this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 26;
this.label4.Text = "閫佽揣鍗曞彿锛�";
this.label4.Visible = false;
@@ -304,10 +301,38 @@
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(1637, 62);
+ this.Tool.Size = new System.Drawing.Size(1228, 50);
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(45, 47);
+ 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(112, 22);
+ 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.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// dc
//
@@ -370,7 +395,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator2.Visible = false;
//
// cx
@@ -404,7 +429,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// sc
//
@@ -452,7 +477,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -487,7 +512,7 @@
// 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;
//
// zf
@@ -523,7 +548,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -542,13 +567,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -558,7 +583,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;
@@ -568,7 +593,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -578,7 +603,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;
@@ -588,7 +613,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -606,12 +631,11 @@
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, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1637, 507);
+ this.grdMain.Size = new System.Drawing.Size(1228, 405);
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);
@@ -622,11 +646,10 @@
// grdPrint
//
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.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
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 = 8;
this.grdPrint.Visible = false;
//
@@ -637,59 +660,29 @@
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, 635);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 508);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1637, 24);
+ this.grdSum.Size = new System.Drawing.Size(1228, 19);
this.grdSum.TabIndex = 47;
//
// grdSub1
//
this.grdSub1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub1.Location = new System.Drawing.Point(725, 471);
- this.grdSub1.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub1.Location = new System.Drawing.Point(544, 377);
this.grdSub1.Name = "grdSub1";
this.grdSub1.RowTemplate.Height = 23;
- this.grdSub1.Size = new System.Drawing.Size(61, 50);
+ this.grdSub1.Size = new System.Drawing.Size(46, 40);
this.grdSub1.TabIndex = 48;
this.grdSub1.Visible = false;
//
- // 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(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);
- //
// MES_StationEntrustOutBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1637, 659);
+ this.ClientSize = new System.Drawing.Size(1228, 527);
this.Controls.Add(this.grdSub1);
this.Controls.Add(this.txtHInnerBillNo);
this.Controls.Add(this.grdMain);
@@ -698,7 +691,6 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_StationEntrustOutBillList";
this.Text = "濮斿鎺ユ敹鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -771,5 +763,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
index ebc663d..0ef4c9a 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBillList.resx"
@@ -3917,7 +3917,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3949,7 +3949,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
@@ -3959,7 +3959,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
@@ -3972,7 +3972,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3984,7 +3984,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3998,7 +3998,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4012,7 +4012,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4026,7 +4026,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4036,7 +4036,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4049,7 +4049,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4062,7 +4062,7 @@
<data name="zf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHASURBVDhPjVK5TgJRFH0fYOkH2Blrez/AWGioVDQkgiKK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVDhPjVK5TgJRFH0fYOkH2Blrez/AWGioVDQkgiKK
4kJQjLjgEpe4JhpDb2NjLF06QoxRtDJ0WqAhLigIwzAMc51735sZicR4kpP77nLO3Jd57CcWtiKAnN84
gNDaPkyv7lUl9oJLuyBkHFhArOxEKP4HFSaGAaK7fxxUPeYVrSqlEp/z+Gcsg0B4k1d1tHa4wNbVB212
1y9ivb1nELrdI+D0BiyD8dl1EqtljeJfmFzcrrw/YjS0Ss2iokL8/hHuEhYxV0oqyEW+O84KmQVfcJma
@@ -4076,7 +4076,7 @@
<data name="zc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -4090,7 +4090,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
@@ -4100,7 +4100,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
@@ -4115,7 +4115,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/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
index b4e0cac..a1de99a 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.cs"
@@ -47,6 +47,11 @@
string sSql = "";
string sWhere = "";
+ if ( chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -154,6 +159,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
index 97dfe71..4dcbf6c 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.designer.cs"
@@ -57,6 +57,7 @@
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.sh = new System.Windows.Forms.ToolStripButton();
this.qsh = new System.Windows.Forms.ToolStripButton();
+ this.fsqc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -70,7 +71,7 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.fsqc = new System.Windows.Forms.ToolStripButton();
+ this.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -84,38 +85,36 @@
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.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1525, 66);
+ this.pPic.Size = new System.Drawing.Size(1144, 53);
this.pPic.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(303, 19);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(232, 18);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(77, 12);
this.label3.TabIndex = 14;
this.label3.Text = "璁㈠崟璺熻釜鍙凤細";
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(407, 14);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(305, 14);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(153, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(142, 21);
this.txtHOrderProcNO.TabIndex = 15;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -123,38 +122,34 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(565, 19);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(450, 18);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 12;
this.label2.Text = "宸ヤ綔涓績锛�";
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(660, 15);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(512, 14);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(188, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(142, 21);
this.txtHCenterID.TabIndex = 13;
this.txtHCenterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHCenterID_KeyDown);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(872, 20);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(660, 18);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 10;
this.label1.Text = "娴佽浆鍗″彿锛�";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(959, 17);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(719, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(208, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(142, 21);
this.txtHBillNo.TabIndex = 11;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -163,29 +158,26 @@
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(1281, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(961, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(244, 66);
+ this.panel1.Size = new System.Drawing.Size(183, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -194,10 +186,9 @@
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(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "杩涚珯鎵弿鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -234,7 +225,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(1525, 62);
+ this.Tool.Size = new System.Drawing.Size(1144, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -248,7 +239,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(53, 59);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -256,14 +247,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
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.Size = new System.Drawing.Size(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -299,7 +290,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -332,7 +323,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -380,7 +371,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -412,10 +403,24 @@
this.qsh.Visible = false;
this.qsh.Click += new System.EventHandler(this.qsh_Click);
//
+ // fsqc
+ //
+ this.fsqc.AutoSize = false;
+ this.fsqc.Image = ((System.Drawing.Image)(resources.GetObject("fsqc.Image")));
+ this.fsqc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsqc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsqc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.fsqc.Name = "fsqc";
+ this.fsqc.Size = new System.Drawing.Size(36, 47);
+ this.fsqc.Text = "棣栦欢";
+ this.fsqc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsqc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsqc.Click += new System.EventHandler(this.fsqc_Click);
+ //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -434,13 +439,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -450,7 +455,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;
@@ -460,7 +465,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -470,7 +475,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;
@@ -480,7 +485,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -498,13 +503,12 @@
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, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1525, 512);
+ this.grdMain.Size = new System.Drawing.Size(1144, 409);
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);
@@ -515,12 +519,11 @@
// grdPrint
//
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.Location = new System.Drawing.Point(772, 146);
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 = 8;
this.grdPrint.Visible = false;
//
@@ -531,41 +534,36 @@
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, 640);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
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(1525, 24);
+ this.grdSum.Size = new System.Drawing.Size(1144, 19);
this.grdSum.TabIndex = 47;
//
- // fsqc
+ // chkWJieAn
//
- this.fsqc.AutoSize = false;
- this.fsqc.Image = ((System.Drawing.Image)(resources.GetObject("fsqc.Image")));
- this.fsqc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsqc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.fsqc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.fsqc.Name = "fsqc";
- this.fsqc.Size = new System.Drawing.Size(36, 47);
- this.fsqc.Text = "棣栦欢";
- this.fsqc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsqc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.fsqc.Click += new System.EventHandler(this.fsqc_Click);
+ this.chkWJieAn.AutoSize = true;
+ this.chkWJieAn.Location = new System.Drawing.Point(872, 18);
+ 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 = 103;
+ this.chkWJieAn.Text = "鏈粨妗�";
+ this.chkWJieAn.UseVisualStyleBackColor = true;
//
// MES_StationInBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1525, 664);
+ this.ClientSize = new System.Drawing.Size(1144, 531);
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);
this.Name = "MES_StationInBillList";
this.Text = "杩涚珯鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -626,5 +624,6 @@
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
private System.Windows.Forms.ToolStripButton fsqc;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
index 9ce4a7e..0571554 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBillList.resx"
@@ -3917,7 +3917,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,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
@@ -3952,7 +3952,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3964,7 +3964,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3978,7 +3978,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -3992,7 +3992,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4002,7 +4002,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4016,7 +4016,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4029,7 +4029,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4042,7 +4042,7 @@
<data name="fsqc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4056,7 +4056,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
@@ -4066,7 +4066,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
@@ -4081,7 +4081,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/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index efa4015..2bb87a6 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -47,6 +47,11 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -153,6 +158,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
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..55b90d4 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"
@@ -42,6 +42,9 @@
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 +72,7 @@
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.chkWJieAn = new System.Windows.Forms.CheckBox();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -85,38 +86,36 @@
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.Location = new System.Drawing.Point(0, 50);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1661, 66);
+ this.pPic.Size = new System.Drawing.Size(1246, 53);
this.pPic.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(293, 18);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(222, 19);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(77, 12);
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.Location = new System.Drawing.Point(299, 15);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(215, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(162, 21);
this.txtHOrderProcNO.TabIndex = 17;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
@@ -124,38 +123,34 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(630, 19);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(472, 19);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
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.Location = new System.Drawing.Point(537, 15);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(215, 25);
+ 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(944, 19);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(708, 19);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
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.Location = new System.Drawing.Point(775, 15);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(215, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(162, 21);
this.txtHBillNo.TabIndex = 9;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -164,29 +159,26 @@
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(1398, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1049, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(263, 66);
+ this.panel1.Size = new System.Drawing.Size(197, 53);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 38);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(24, 30);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 15);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(24, 12);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -195,10 +187,9 @@
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(16, 19);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 15);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(180, 27);
+ this.lblCaption.Size = new System.Drawing.Size(142, 21);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "姹囨姤鎵弿鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -236,10 +227,38 @@
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(1661, 62);
+ this.Tool.Size = new System.Drawing.Size(1246, 50);
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(45, 47);
+ 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(112, 22);
+ 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.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// dc
//
@@ -272,7 +291,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -305,7 +324,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -352,7 +371,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// sh
//
@@ -385,7 +404,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// bzd
//
@@ -404,7 +423,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -423,13 +442,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -439,7 +458,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;
@@ -449,7 +468,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -459,7 +478,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;
@@ -469,7 +488,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// timer1
//
@@ -487,12 +506,11 @@
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, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 103);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1661, 512);
+ this.grdMain.Size = new System.Drawing.Size(1246, 409);
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);
@@ -503,11 +521,10 @@
// grdPrint
//
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.Location = new System.Drawing.Point(772, 146);
this.grdPrint.Name = "grdPrint";
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 = 8;
this.grdPrint.Visible = false;
//
@@ -518,54 +535,35 @@
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, 640);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 512);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1661, 24);
+ this.grdSum.Size = new System.Drawing.Size(1246, 19);
this.grdSum.TabIndex = 47;
//
- // toolStripDropDownButton1
+ // chkWJieAn
//
- 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(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.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;
//
// MES_StationOutBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1661, 664);
+ this.ClientSize = new System.Drawing.Size(1246, 531);
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);
this.Name = "MES_StationOutBillList";
this.Text = "姹囨姤鎵弿鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -627,5 +625,6 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.CheckBox chkWJieAn;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
index df0c72c..bc1bb78 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.resx"
@@ -3917,7 +3917,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -3929,7 +3929,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3939,7 +3939,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
@@ -3952,7 +3952,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3964,7 +3964,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3978,7 +3978,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -3992,7 +3992,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4002,7 +4002,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4016,7 +4016,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4029,7 +4029,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4042,7 +4042,7 @@
<data name="bzd.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
@@ -4052,7 +4052,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
@@ -4062,7 +4062,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
@@ -4077,7 +4077,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/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
index 1756635..5effe0d 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
@@ -47,6 +47,7 @@
string sSql = "";
string sWhere = "";
+ bzd.Enabled = true;
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -614,6 +615,8 @@
private void bzd_Click(object sender, EventArgs e)
{
+ //鐐瑰嚮鍚庡叆搴撴寜閽彉鐏�
+ bzd.Enabled = false;
//鏍规嵁閫変腑鐨勬暟鎹敓鎴愬寘瑁呭崟
int MainIDCol = Fun_GetCol("hmainid");
int SubIDCol = Fun_GetCol("hsubid");
@@ -629,6 +632,7 @@
if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
{
MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
@@ -638,6 +642,7 @@
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Today, ref sYear, ref sPeriod, ref s) == false)
{
MessageBox.Show("浼氳鏈熼棿鏈夐敊璇紒 " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
string sHInterID = "";
@@ -648,6 +653,7 @@
if (sHInterID=="")
{
MessageBox.Show("娌℃湁閫変腑鐨勫崟鎹槑缁嗚锛岃鍏堥�夋嫨瑕佸叆搴撶殑鍗曟嵁锛�", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -656,6 +662,7 @@
if (DS == null || DS.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鍏ュ簱鍓嶅垽鏂け璐ワ紒", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -663,6 +670,7 @@
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+ bzd.Enabled = true;
return;
}
}
@@ -707,6 +715,7 @@
System.Threading.Thread.Sleep(2000);
//
}
+ bzd.Enabled = true;
//
if (n > 0)
{
--
Gitblit v1.9.1