From 0a22bb811fab75f85c70b98ea8bbf270bdcc5f17 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期日, 24 七月 2022 09:43:12 +0800
Subject: [PATCH] 车间工序全程跟踪报表

---
 WorkM/报表分析/Mes_OrderProcFlowAllReport.designer.cs |    8 ++++++--
 WorkM/报表分析/Mes_OrderProcFlowAllReport.cs          |   36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
index 98e06f8..9ef9d4a 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
@@ -255,24 +255,24 @@
                 }
             }
 
-            for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
-            {
-                if (checkBox1.Checked == false)
-                {
-                    if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("涓嶅悎鏍�") == true)
-                    {
-                        grdMain.Columns[j].Visible = false;
-                    }
-                    else
-                    {
-                        grdMain.Columns[j].Visible = true;
-                    }
-                }
-                else
-                {
-                    grdMain.Columns[j].Visible = true;
-                }
-            }
+            //for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
+            //{
+            //    if (checkBox1.Checked == false)
+            //    {
+            //        if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("涓嶅悎鏍�") == true)
+            //        {
+            //            grdMain.Columns[j].Visible = false;
+            //        }
+            //        else
+            //        {
+            //            grdMain.Columns[j].Visible = true;
+            //        }
+            //    }
+            //    else
+            //    {
+            //        grdMain.Columns[j].Visible = true;
+            //    }
+            //}
             //
         }
 
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
index bc136d3..d4691dc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
@@ -132,14 +132,14 @@
             // eXCELToolStripMenuItem
             // 
             this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
-            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
             this.eXCELToolStripMenuItem.Text = "EXCEL";
             this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
             // 
             // cSVToolStripMenuItem
             // 
             this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
-            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
             this.cSVToolStripMenuItem.Text = "CSV";
             this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
             // 
@@ -398,6 +398,7 @@
             this.chkHShowUnFinish.TabIndex = 86;
             this.chkHShowUnFinish.Text = "鍙樉绀烘湭瀹屽伐";
             this.chkHShowUnFinish.UseVisualStyleBackColor = true;
+            this.chkHShowUnFinish.Visible = false;
             // 
             // checkBox1
             // 
@@ -408,6 +409,7 @@
             this.checkBox1.TabIndex = 85;
             this.checkBox1.Text = "鏄剧ず涓嶅悎鏍�";
             this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.Visible = false;
             // 
             // txtHOrderProcNo
             // 
@@ -501,6 +503,7 @@
             this.grdSum.Margin = new System.Windows.Forms.Padding(4);
             this.grdSum.Name = "grdSum";
             this.grdSum.ReadOnly = true;
+            this.grdSum.RowHeadersWidth = 51;
             this.grdSum.RowTemplate.Height = 23;
             this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
             this.grdSum.Size = new System.Drawing.Size(1432, 24);
@@ -517,6 +520,7 @@
             this.grdMain.Margin = new System.Windows.Forms.Padding(4);
             this.grdMain.Name = "grdMain";
             this.grdMain.ReadOnly = true;
+            this.grdMain.RowHeadersWidth = 51;
             this.grdMain.RowTemplate.Height = 23;
             this.grdMain.Size = new System.Drawing.Size(1432, 414);
             this.grdMain.TabIndex = 54;

--
Gitblit v1.9.1