V2.0.6A 新增工单打印

halftoneproject-master/BanBoShi/BanBoShi.csproj

@@ -704,6 +704,10 @@
   <ItemGroup>
     <Content Include="AOI.ico" />
     <Content Include="e1.ico" />
+    <None Include="Resources\qxOpen.png" />
+    <None Include="Resources\qxClose.png" />
+    <None Include="Resources\ccOpen.png" />
+    <None Include="Resources\ccClose.png" />
     <None Include="Resources\web.png" />
     <None Include="Resources\e1.ico" />
     <None Include="Resources\AOI.ico" />

halftoneproject-master/BanBoShi/MainFrm.Designer.cs

@@ -30,11 +30,11 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.tsmSysmgr = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmStepMgr = new System.Windows.Forms.ToolStripMenuItem();
@@ -73,6 +73,9 @@
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnDefectImage = new System.Windows.Forms.ToolStripButton();
             this.tsbtnSizeImage = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbCC = new System.Windows.Forms.ToolStripButton();
+            this.tsbQX = new System.Windows.Forms.ToolStripButton();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.gpbLog = new System.Windows.Forms.GroupBox();
             this.lstLog = new System.Windows.Forms.ListBox();
@@ -132,6 +135,8 @@
             this.flpProcessStep = new System.Windows.Forms.FlowLayoutPanel();
             this.gpbProductInfo = new System.Windows.Forms.GroupBox();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.numDefectCnt = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
             this.cbOrderCode = new System.Windows.Forms.ComboBox();
             this.label4 = new System.Windows.Forms.Label();
             this.cbProductSN = new System.Windows.Forms.ComboBox();
@@ -185,6 +190,7 @@
             this.flpProcessStep.SuspendLayout();
             this.gpbProductInfo.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numDefectCnt)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
             this.splitContainer2.Panel1.SuspendLayout();
             this.splitContainer2.Panel2.SuspendLayout();
@@ -431,7 +437,10 @@
             this.tsbOpenLight,
             this.toolStripSeparator7,
             this.tsbtnDefectImage,
-            this.tsbtnSizeImage});
+            this.tsbtnSizeImage,
+            this.toolStripSeparator8,
+            this.tsbCC,
+            this.tsbQX});
             this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
             this.toolStrip1.Location = new System.Drawing.Point(0, 89);
             this.toolStrip1.Name = "toolStrip1";
@@ -577,6 +586,39 @@
             this.tsbtnSizeImage.ToolTipText = "图纸比对失败区域分布";
             this.tsbtnSizeImage.Click += new System.EventHandler(this.tsbtnDefectImage_Click);
             // 
+            // toolStripSeparator8
+            // 
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 56);
+            // 
+            // tsbCC
+            // 
+            this.tsbCC.ForeColor = System.Drawing.Color.White;
+            this.tsbCC.Image = global::MaiMuAOI.Properties.Resources.ccOpen;
+            this.tsbCC.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbCC.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbCC.Name = "tsbCC";
+            this.tsbCC.Size = new System.Drawing.Size(60, 53);
+            this.tsbCC.Tag = "0";
+            this.tsbCC.Text = "尺寸启用";
+            this.tsbCC.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.tsbCC.ToolTipText = "启用了尺寸检测";
+            this.tsbCC.Click += new System.EventHandler(this.tsbCC_Click);
+            // 
+            // tsbQX
+            // 
+            this.tsbQX.ForeColor = System.Drawing.Color.White;
+            this.tsbQX.Image = global::MaiMuAOI.Properties.Resources.qxOpen;
+            this.tsbQX.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbQX.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbQX.Name = "tsbQX";
+            this.tsbQX.Size = new System.Drawing.Size(60, 53);
+            this.tsbQX.Tag = "1";
+            this.tsbQX.Text = "缺陷启用";
+            this.tsbQX.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.tsbQX.ToolTipText = "启用了缺陷检测";
+            this.tsbQX.Click += new System.EventHandler(this.tsbQX_Click);
+            // 
             // splitContainer1
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -673,27 +715,27 @@
             // 
             this.dgvProcess.AllowUserToAddRows = false;
             this.dgvProcess.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
             this.dataGridViewTextBoxColumn2,
             this.colValue});
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle9;
             this.dgvProcess.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvProcess.Location = new System.Drawing.Point(2, 16);
             this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
@@ -702,8 +744,8 @@
             this.dgvProcess.ReadOnly = true;
             this.dgvProcess.RowHeadersVisible = false;
             this.dgvProcess.RowHeadersWidth = 62;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvProcess.RowTemplate.Height = 30;
             this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvProcess.Size = new System.Drawing.Size(433, 112);
@@ -722,9 +764,9 @@
             // dataGridViewTextBoxColumn2
             // 
             this.dataGridViewTextBoxColumn2.DataPropertyName = "ProcessName";
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle7;
             this.dataGridViewTextBoxColumn2.HeaderText = "工序名称";
             this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -735,8 +777,8 @@
             // colValue
             // 
             this.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.colValue.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            this.colValue.DefaultCellStyle = dataGridViewCellStyle8;
             this.colValue.HeaderText = "内容";
             this.colValue.MinimumWidth = 8;
             this.colValue.Name = "colValue";
@@ -1387,6 +1429,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.numDefectCnt);
+            this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.cbOrderCode);
             this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.cbProductSN);
@@ -1400,6 +1444,44 @@
             this.panel1.Size = new System.Drawing.Size(454, 144);
             this.panel1.TabIndex = 0;
             // 
+            // numDefectCnt
+            // 
+            this.numDefectCnt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.numDefectCnt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numDefectCnt.Location = new System.Drawing.Point(310, 10);
+            this.numDefectCnt.Maximum = new decimal(new int[] {
+            100000,
+            0,
+            0,
+            0});
+            this.numDefectCnt.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numDefectCnt.Name = "numDefectCnt";
+            this.numDefectCnt.Size = new System.Drawing.Size(120, 26);
+            this.numDefectCnt.TabIndex = 15;
+            this.numDefectCnt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numDefectCnt.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
+            this.label1.Location = new System.Drawing.Point(240, 13);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(79, 20);
+            this.label1.TabIndex = 14;
+            this.label1.Text = "检测数量：";
+            // 
             // cbOrderCode
             // 
             this.cbOrderCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -1410,7 +1492,7 @@
             "test"});
             this.cbOrderCode.Location = new System.Drawing.Point(91, 10);
             this.cbOrderCode.Name = "cbOrderCode";
-            this.cbOrderCode.Size = new System.Drawing.Size(339, 28);
+            this.cbOrderCode.Size = new System.Drawing.Size(144, 28);
             this.cbOrderCode.TabIndex = 13;
             // 
             // label4
@@ -1683,7 +1765,7 @@
             this.chkDoorSensor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(51)))), ((int)(((byte)(122)))));
             this.chkDoorSensor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkDoorSensor.ForeColor = System.Drawing.Color.White;
-            this.chkDoorSensor.Location = new System.Drawing.Point(681, 107);
+            this.chkDoorSensor.Location = new System.Drawing.Point(763, 107);
             this.chkDoorSensor.Margin = new System.Windows.Forms.Padding(2);
             this.chkDoorSensor.Name = "chkDoorSensor";
             this.chkDoorSensor.Size = new System.Drawing.Size(99, 21);
@@ -1698,7 +1780,7 @@
             this.chkBuzzer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(51)))), ((int)(((byte)(122)))));
             this.chkBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkBuzzer.ForeColor = System.Drawing.Color.White;
-            this.chkBuzzer.Location = new System.Drawing.Point(568, 107);
+            this.chkBuzzer.Location = new System.Drawing.Point(650, 107);
             this.chkBuzzer.Margin = new System.Windows.Forms.Padding(2);
             this.chkBuzzer.Name = "chkBuzzer";
             this.chkBuzzer.Size = new System.Drawing.Size(87, 21);
@@ -1842,6 +1924,7 @@
             this.gpbProductInfo.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numDefectCnt)).EndInit();
             this.splitContainer2.Panel1.ResumeLayout(false);
             this.splitContainer2.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
@@ -1991,6 +2074,11 @@
         private SysUI.ProcessStep.Ctrl.NewStepShow newStepShow2;
         private SysUI.ProcessStep.Ctrl.NewStepShow newStepShow3;
         private SysUI.ProcessStep.Ctrl.NewStepShow newStepShow4;
+        private System.Windows.Forms.NumericUpDown numDefectCnt;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+        private System.Windows.Forms.ToolStripButton tsbCC;
+        private System.Windows.Forms.ToolStripButton tsbQX;
     }
 }
 

halftoneproject-master/BanBoShi/MainFrm.cs

@@ -2,6 +2,7 @@
 using CCWin.SkinControl;
 using HalconDotNet;
 using HZH_Controls.Forms;
+using MaiMuAOI.Properties;
 using MaiMuAOI.SysCtrl;
 using MaiMuAOI.SysUI.DefectPicShow;
 using MaiMuAOI.SysUI.Load;
@@ -343,6 +344,37 @@ namespace MaiMuAOI
         {
 
         }
+
+        private void tsbCC_Click(object sender, EventArgs e)
+        {
+            if(this.tsbCC.Text == "尺寸启用")
+            {
+                this.tsbCC.Text = "尺寸禁用";
+                this.tsbCC.Image = Resources.ccClose;
+                SysMgr.Instance.SetSizeEnable(false);
+            }
+            else
+            {
+                this.tsbCC.Text = "尺寸启用";
+                this.tsbCC.Image = Resources.ccOpen;
+                SysMgr.Instance.SetSizeEnable(true);
+            }
+        }
+        private void tsbQX_Click(object sender, EventArgs e)
+        {
+            if (this.tsbQX.Text == "缺陷启用")
+            {
+                this.tsbQX.Text = "缺陷禁用";
+                this.tsbQX.Image = Resources.qxClose;
+                SysMgr.Instance.SetDefectEnable(false);
+            }
+            else
+            {
+                this.tsbQX.Text = "缺陷启用";
+                this.tsbQX.Image = Resources.qxOpen;
+                SysMgr.Instance.SetDefectEnable(true);
+            }
+        }
         #endregion
 
         #region 菜单按钮      
@@ -1051,7 +1083,7 @@ namespace MaiMuAOI
                     ResetUI(false);
                     AddTextEvent("运行", $"启动自动检测流程");
                     this.lstLog.Refresh();
-                    if (SysMgr.Instance.StartRun(this, this.cbOrderCode.Text, this.cbProductCode.Text, this.cbProductSN.Text))
+                    if (SysMgr.Instance.StartRun(this, this.cbOrderCode.Text, (int)this.numDefectCnt.Value,  this.cbProductCode.Text, this.cbProductSN.Text))
                     {
                         this.tsbtnStop.Enabled = true;
                         this.tsbtnStart.Enabled = false;
@@ -1453,6 +1485,7 @@ namespace MaiMuAOI
         }
         #endregion
 
+        #region 界面变化
         private void MainFrm_SizeChanged(object sender, EventArgs e)
         {
             if (this.WindowState == FormWindowState.Maximized)
@@ -1490,6 +1523,10 @@ namespace MaiMuAOI
             this.chkDoorSensor.Visible = ConfMgr.Instance.SysConfigParams.ShowDoorAlm;
             this.tsbtnDefectImage.Visible = ConfMgr.Instance.SysConfigParams.ShowDistribution;
             this.tsbtnSizeImage.Visible = ConfMgr.Instance.SysConfigParams.ShowDistribution;
+            toolStripSeparator7.Visible = ConfMgr.Instance.SysConfigParams.ShowDistribution;
+            this.tsbCC.Visible = ConfMgr.Instance.SysConfigParams.ShowSizeBtn;
+            this.tsbQX.Visible = ConfMgr.Instance.SysConfigParams.ShowDefectBtn;
+            toolStripSeparator8.Visible = ConfMgr.Instance.SysConfigParams.ShowSizeBtn || ConfMgr.Instance.SysConfigParams.ShowDefectBtn;
         }
 
         private void flpProcessStep_SizeChanged(object sender, EventArgs e)
@@ -1508,5 +1545,8 @@ namespace MaiMuAOI
             this.cbProductSN.Text = "";
             this.cbProductSN.Select();
         }
+        #endregion
+
+        
     }
 }

halftoneproject-master/BanBoShi/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.5.1")]
-[assembly: AssemblyFileVersion("2.0.5.1")]
+[assembly: AssemblyVersion("2.0.6.1")]
+[assembly: AssemblyFileVersion("2.0.6.1")]

halftoneproject-master/BanBoShi/Properties/Resources.Designer.cs

@@ -60,6 +60,26 @@ namespace MaiMuAOI.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ccClose {
+            get {
+                object obj = ResourceManager.GetObject("ccClose", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ccOpen {
+            get {
+                object obj = ResourceManager.GetObject("ccOpen", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
         /// </summary>
@@ -70,6 +90,26 @@ namespace MaiMuAOI.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap qxClose {
+            get {
+                object obj = ResourceManager.GetObject("qxClose", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap qxOpen {
+            get {
+                object obj = ResourceManager.GetObject("qxOpen", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

halftoneproject-master/BanBoShi/Properties/Resources.resx

@@ -118,9 +118,21 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ccClose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ccClose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ccOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ccOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="e1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\e1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="qxClose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qxClose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="qxOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\qxOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="web" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\web.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

halftoneproject-master/BanBoShi/SysCtrl/ConfMgr.cs

@@ -176,6 +176,15 @@ namespace MaiMuAOI.SysCtrl
         /// 开启单边目数计算
         /// </summary>
         public bool OpenAsideDefect{ get; set; }
+
+        /// <summary>
+        /// 开启工单确认
+        /// </summary>
+        public bool OpenOredrCheck { get; set; }
+        /// <summary>
+        /// 开启工单数量确认
+        /// </summary>
+        public bool OpenOredrCntCheck { get; set; }
         #endregion
 
         #region 硬件传感器通信
@@ -300,6 +309,14 @@ namespace MaiMuAOI.SysCtrl
         /// 调试：显示分布
         /// </summary>
         public bool ShowDistribution { get; set; }
+        /// <summary>
+        /// 调试：显示尺寸检测禁用和启用
+        /// </summary>
+        public bool ShowSizeBtn { get; set; }
+        /// <summary>
+        /// 调试：显示缺陷检测禁用和启用
+        /// </summary>
+        public bool ShowDefectBtn { get; set; }
 
         /// <summary>
         /// 后部相机视野X
@@ -439,6 +456,8 @@ namespace MaiMuAOI.SysCtrl
             OpenPdtIsHave = true;
             OpenDefectSanp = false;
             OpenAsideDefect = true;
+            OpenOredrCheck = false;
+            OpenOredrCntCheck = false;
 
             //LightCfg = new LightParams();
             //IOCfg = new IOParams();
@@ -483,6 +502,8 @@ namespace MaiMuAOI.SysCtrl
             ShowBuzz = false;
             ShowDoorAlm = false;
             ShowDistribution = false;
+            ShowSizeBtn = false;
+            ShowDefectBtn = false;
 
             DefectCamViewX = 35.5;
             DefectCamViewY = 26.5;
@@ -748,6 +769,8 @@ namespace MaiMuAOI.SysCtrl
             iniHelper.WriteBool("SysFunction", "OpenPdtIsHave", SysParams.OpenPdtIsHave);
             iniHelper.WriteBool("SysFunction", "OpenDefectSanp", SysParams.OpenDefectSanp);
             iniHelper.WriteBool("SysFunction", "OpenAsideDefect", SysParams.OpenAsideDefect);
+            iniHelper.WriteBool("SysFunction", "OpenOredrCheck", SysParams.OpenOredrCheck);
+            iniHelper.WriteBool("SysFunction", "OpenOredrCntCheck", SysParams.OpenOredrCntCheck);
 
             iniHelper.WriteString("Dev", "LightCom", SysParams.LightCom);
             iniHelper.WriteInteger("Dev", "LightComBaud", SysParams.LightComBaud);
@@ -789,6 +812,8 @@ namespace MaiMuAOI.SysCtrl
             iniHelper.WriteBool("ShowMainWin", "ShowBuzz", SysParams.ShowBuzz);
             iniHelper.WriteBool("ShowMainWin", "ShowDoorAlm", SysParams.ShowDoorAlm);
             iniHelper.WriteBool("ShowMainWin", "ShowDistribution", SysParams.ShowDistribution);
+            iniHelper.WriteBool("ShowMainWin", "ShowSizeBtn", SysParams.ShowSizeBtn);
+            iniHelper.WriteBool("ShowMainWin", "ShowDefectBtn", SysParams.ShowDefectBtn);
 
             iniHelper.WriteDouble("CamView", "DefectCamViewX", SysParams.DefectCamViewX);
             iniHelper.WriteDouble("CamView", "DefectCamViewY", SysParams.DefectCamViewY);
@@ -950,6 +975,10 @@ namespace MaiMuAOI.SysCtrl
             sysParams.OpenDefectSanp = bValue;
             iniHelper.ReadBool("SysFunction", "OpenAsideDefect", out bValue);
             sysParams.OpenAsideDefect = bValue;
+            iniHelper.ReadBool("SysFunction", "OpenOredrCheck", out bValue);
+            sysParams.OpenOredrCheck = bValue;
+            iniHelper.ReadBool("SysFunction", "OpenOredrCntCheck", out bValue);
+            sysParams.OpenOredrCntCheck = bValue;
 
             iniHelper.ReadString("Dev", "LightCom", out sValue);
             sysParams.LightCom = sValue.Replace("\0", "");
@@ -1030,6 +1059,10 @@ namespace MaiMuAOI.SysCtrl
             sysParams.ShowDoorAlm = bValue;
             iniHelper.ReadBool("ShowMainWin", "ShowDistribution", out bValue);
             sysParams.ShowDistribution = bValue;
+            iniHelper.ReadBool("ShowMainWin", "ShowSizeBtn", out bValue);
+            sysParams.ShowSizeBtn = bValue;
+            iniHelper.ReadBool("ShowMainWin", "ShowDefectBtn", out bValue);
+            sysParams.ShowDefectBtn = bValue;
 
             iniHelper.ReadDouble("CamView", "DefectCamViewX", out dValue);
             sysParams.DefectCamViewX = dValue;

halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs

@@ -447,6 +447,13 @@ namespace MaiMuAOI.SysCtrl
 
         [Description("检测单号")]
         DetectOrder,
+        [Description("检测数量")]
+        DetectCnt,
+        [Description("合格数量")]
+        OKCnt,
+        [Description("不合格数量")]
+        NgCnt,
+
         [Description("料号")]
         OrderCode,
         [Description("料号名称")]
@@ -458,6 +465,8 @@ namespace MaiMuAOI.SysCtrl
 
         [Description("检测时间")]
         Time,
+        [Description("检测日期")]
+        Date,
         [Description("操作员")]
         OperatorName,
     }

halftoneproject-master/BanBoShi/SysCtrl/SysUpdata.cs

@@ -9,7 +9,7 @@ namespace MaiMuAOI.SysCtrl
     public class SysUpdata
     {
         //系统信息
-        public static string Info = "软件名称：版博士\r\n软件版本：V2.0.5A\r\n公司：迈沐智能科技有限公司\r\n";
+        public static string Info = "软件名称：版博士\r\n软件版本：V2.0.6A\r\n公司：迈沐智能科技有限公司\r\n";
 
         public static string Updata = "V2.0:\r\n" +
             "\t新版本，新流程，兼容老流程\r\n" +
@@ -55,6 +55,12 @@ namespace MaiMuAOI.SysCtrl
             "V2.0.5A:\r\n" +
             "\t1.测试项加入SP2—主栅宽度\r\n" +
             "\t2.缺陷项加入钢丝断裂，残胶堵孔\r\n" +
-            "\t3.缺陷项分类乳剂和PT\r\n";
+            "\t3.缺陷项分类乳剂和PT\r\n" +
+            "V2.0.6A:\r\n" +
+            "\t1.界面增加当前检测单号的检测数量\r\n" +
+            "\t2.界面加入尺寸和缺陷的快捷开关按钮\r\n" +
+            "\t3.检测单打印,检测单和数量检测\r\n" +
+            "\t4.加入产品和流程搜索\r\n" +
+            "\t5.修复查询结果错误bug\r\n";
     }
 }

halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.Designer.cs

@@ -35,6 +35,7 @@
             this.skinTabPage7 = new CCWin.SkinControl.SkinTabPage();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.btnClear = new System.Windows.Forms.PictureBox();
             this.skinButton3 = new CCWin.SkinControl.SkinButton();
             this.skinButton1 = new CCWin.SkinControl.SkinButton();
             this.skinButton2 = new CCWin.SkinControl.SkinButton();
@@ -51,17 +52,16 @@
             this.cbProductCode = new System.Windows.Forms.ComboBox();
             this.label3 = new System.Windows.Forms.Label();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.pageCtrl1 = new MaiMuAOI.SysUI.DefectPicShow.PageCtrl();
             this.skinTabPage8 = new CCWin.SkinControl.SkinTabPage();
             this.skinTabPage9 = new CCWin.SkinControl.SkinTabPage();
             this.skinTabPage10 = new CCWin.SkinControl.SkinTabPage();
-            this.pageCtrl1 = new MaiMuAOI.SysUI.DefectPicShow.PageCtrl();
-            this.btnClear = new System.Windows.Forms.PictureBox();
             this.skinTabControl1.SuspendLayout();
             this.skinTabPage7.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnClear)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
             // uiTitel1
@@ -159,6 +159,18 @@
             this.panel1.Size = new System.Drawing.Size(1273, 49);
             this.panel1.TabIndex = 0;
             // 
+            // btnClear
+            // 
+            this.btnClear.Image = ((System.Drawing.Image)(resources.GetObject("btnClear.Image")));
+            this.btnClear.Location = new System.Drawing.Point(253, 17);
+            this.btnClear.Margin = new System.Windows.Forms.Padding(2);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(21, 19);
+            this.btnClear.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.btnClear.TabIndex = 101;
+            this.btnClear.TabStop = false;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
             // skinButton3
             // 
             this.skinButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -286,6 +298,7 @@
             this.comboBox3.Name = "comboBox3";
             this.comboBox3.Size = new System.Drawing.Size(73, 28);
             this.comboBox3.TabIndex = 18;
+            this.comboBox3.Visible = false;
             // 
             // label4
             // 
@@ -298,6 +311,7 @@
             this.label4.Size = new System.Drawing.Size(51, 20);
             this.label4.TabIndex = 17;
             this.label4.Text = "修复：";
+            this.label4.Visible = false;
             // 
             // comboBox2
             // 
@@ -394,6 +408,17 @@
             this.dataGridView1.TabIndex = 1;
             this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
             // 
+            // pageCtrl1
+            // 
+            this.pageCtrl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pageCtrl1.Location = new System.Drawing.Point(3, 594);
+            this.pageCtrl1.Name = "pageCtrl1";
+            this.pageCtrl1.PageIndex = 1;
+            this.pageCtrl1.PageSize = 30;
+            this.pageCtrl1.RecordCount = 0;
+            this.pageCtrl1.Size = new System.Drawing.Size(1273, 38);
+            this.pageCtrl1.TabIndex = 2;
+            // 
             // skinTabPage8
             // 
             this.skinTabPage8.BackColor = System.Drawing.Color.White;
@@ -427,29 +452,6 @@
             this.skinTabPage10.TabItemImage = null;
             this.skinTabPage10.Text = "PT趋势分析";
             // 
-            // pageCtrl1
-            // 
-            this.pageCtrl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pageCtrl1.Location = new System.Drawing.Point(3, 594);
-            this.pageCtrl1.Name = "pageCtrl1";
-            this.pageCtrl1.PageIndex = 1;
-            this.pageCtrl1.PageSize = 30;
-            this.pageCtrl1.RecordCount = 0;
-            this.pageCtrl1.Size = new System.Drawing.Size(1273, 38);
-            this.pageCtrl1.TabIndex = 2;
-            // 
-            // btnClear
-            // 
-            this.btnClear.Image = ((System.Drawing.Image)(resources.GetObject("btnClear.Image")));
-            this.btnClear.Location = new System.Drawing.Point(253, 17);
-            this.btnClear.Margin = new System.Windows.Forms.Padding(2);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(21, 19);
-            this.btnClear.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.btnClear.TabIndex = 101;
-            this.btnClear.TabStop = false;
-            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
-            // 
             // DataQueryFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -466,8 +468,8 @@
             this.tableLayoutPanel1.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnClear)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
 
         }

halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs

@@ -211,9 +211,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("网版编码", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("批次", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
 
             foreach(var item in list)
@@ -620,9 +620,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["网版编码"] = item.SN;
                 dr["批次"] = item.BatchId;
                 dr["合格"] = item.Qualified ? "合格": "不合格";
-                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
-                dr["异常情况"] = item.Abnormalities;
-                dr["修复人员"] = item.RepairCode;
+                //dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                //dr["异常情况"] = item.Abnormalities;
+                //dr["修复人员"] = item.RepairCode;
                 dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
 
                 //根据不同步骤名称插入数据
@@ -813,7 +813,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             this.dataGridView1.Columns[0].Width = 50;
             this.dataGridView1.Columns[1].Width = 120;
 
-            for (int i = 0; i < 12; i++)
+            for (int i = 0; i < 9; i++) //去除3列
             {
                 this.dataGridView1.Columns[i].Frozen = true;
             }
@@ -1045,9 +1045,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("网版编码", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("批次", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
 
             foreach (var item in QueryAllOrders)
@@ -1291,9 +1291,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["网版编码"] = item.SN;
                 dr["批次"] = item.BatchId;
                 dr["合格"] = item.Qualified ? "合格" : "不合格";
-                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
-                dr["异常情况"] = item.Abnormalities;
-                dr["修复人员"] = item.RepairCode;
+                //dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                //dr["异常情况"] = item.Abnormalities;
+                //dr["修复人员"] = item.RepairCode;
                 dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
 
                 List<SizeDefectInfo> tempd = new List<SizeDefectInfo>();

halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/PointTestProp.cs

@@ -74,18 +74,26 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
         [PropertyOrder(64), Browsable(true), Category("7 上下限"), DisplayName("7.4 下限"), Description("设置流程下限")]
         public double MinLimit { get; set; }
 
-        [PropertyOrder(71), Browsable(true), Category("8 打印"), DisplayName("8.1 开启Excel打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(71), Browsable(true), Category("8 打印"), DisplayName("8.01 开启Excel打印"), Description("启用本工序数据打印")]
         public bool OpenPrint { get; set; }
-        [PropertyOrder(72), Browsable(true), Category("8 打印"), DisplayName("8.2 打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(72), Browsable(true), Category("8 打印"), DisplayName("8.02 打印数据"), Description("打印均值数据的位置")]
         public string ExcelData { get; set; }
-        [PropertyOrder(73), Browsable(true), Category("8 打印"), DisplayName("8.3 打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(73), Browsable(true), Category("8 打印"), DisplayName("8.03 打印上下限"), Description("打印上下限的位置")]
         public string ExcelLimit { get; set; }
-        [PropertyOrder(74), Browsable(true), Category("8 打印"), DisplayName("8.4 开启标签打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(74), Browsable(true), Category("8 打印"), DisplayName("8.04 开启标签打印"), Description("启用本工序数据打印")]
         public bool OpenPrintLabel { get; set; }
-        [PropertyOrder(75), Browsable(true), Category("8 打印"), DisplayName("8.5 标签打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(75), Browsable(true), Category("8 打印"), DisplayName("8.05 标签打印数据"), Description("打印均值数据的位置")]
         public string LabelData { get; set; }
-        [PropertyOrder(76), Browsable(true), Category("8 打印"), DisplayName("8.6 标签打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(76), Browsable(true), Category("8 打印"), DisplayName("8.06 标签打印上下限"), Description("打印上下限的位置")]
         public string LabelLimit { get; set; }
+        [PropertyOrder(74), Browsable(true), Category("8 打印"), DisplayName("8.07 开启工单打印"), Description("启用本工序数据打印")]
+        public bool OpenPrintOrder { get; set; }
+        [PropertyOrder(75), Browsable(true), Category("8 打印"), DisplayName("8.08 工单打印数据"), Description("打印均值数据的位置序列")]
+        public string OrderData { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("8 打印"), DisplayName("8.09 工单打印上下限"), Description("打印上下限的位置序列")]
+        public string OrderLimit { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("8 打印"), DisplayName("8.10 工单打印测试名称"), Description("打印测试名称的位置序列")]
+        public string OrderTestName { get; set; }
 
         [PropertyOrder(81), Browsable(true), Category("9 控制"), DisplayName("9.1 禁用工序"), Description("禁用本工序(True-是；False-否)")]
         public bool Disable { get; set; }
@@ -133,6 +141,11 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
             ExcelLimit = "";
             LabelData = "";
             LabelLimit = "";
+
+            OpenPrintOrder = false;
+            OrderData = "";
+            OrderLimit = "";
+            OrderTestName = "";
         }
 
         /// <summary>

halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/TensionProp.cs

@@ -34,18 +34,26 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
         [PropertyOrder(34), Browsable(true), Category("4 上下限"), DisplayName("4.4 下限"), Description("设置流程下限")]
         public double MinLimit { get; set; }
 
-        [PropertyOrder(41), Browsable(true), Category("5 打印"), DisplayName("5.1 开启Excel打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(41), Browsable(true), Category("5 打印"), DisplayName("5.01 开启Excel打印"), Description("启用本工序数据打印")]
         public bool OpenPrint { get; set; }
-        [PropertyOrder(42), Browsable(true), Category("5 打印"), DisplayName("5.2 打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(42), Browsable(true), Category("5 打印"), DisplayName("5.02 打印数据"), Description("打印均值数据的位置")]
         public string ExcelData { get; set; }
-        [PropertyOrder(43), Browsable(true), Category("5 打印"), DisplayName("5.3 打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(43), Browsable(true), Category("5 打印"), DisplayName("5.03 打印上下限"), Description("打印上下限的位置")]
         public string ExcelLimit { get; set; }
-        [PropertyOrder(44), Browsable(true), Category("5 打印"), DisplayName("5.4 开启标签打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(44), Browsable(true), Category("5 打印"), DisplayName("5.04 开启标签打印"), Description("启用本工序数据打印")]
         public bool OpenPrintLabel { get; set; }
-        [PropertyOrder(45), Browsable(true), Category("5 打印"), DisplayName("5.5 标签打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(45), Browsable(true), Category("5 打印"), DisplayName("5.05 标签打印数据"), Description("打印均值数据的位置")]
         public string LabelData { get; set; }
-        [PropertyOrder(46), Browsable(true), Category("5 打印"), DisplayName("5.6 标签打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(46), Browsable(true), Category("5 打印"), DisplayName("5.06 标签打印上下限"), Description("打印上下限的位置")]
         public string LabelLimit { get; set; }
+        [PropertyOrder(74), Browsable(true), Category("5 打印"), DisplayName("5.07 开启工单打印"), Description("启用本工序数据打印")]
+        public bool OpenPrintOrder { get; set; }
+        [PropertyOrder(75), Browsable(true), Category("5 打印"), DisplayName("5.08 工单打印数据"), Description("打印均值数据的位置序列")]
+        public string OrderData { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("5 打印"), DisplayName("5.09 工单打印上下限"), Description("打印上下限的位置序列")]
+        public string OrderLimit { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("5 打印"), DisplayName("5.10 工单打印测试名称"), Description("打印测试名称的位置序列")]
+        public string OrderTestName { get; set; }
 
         [PropertyOrder(51), Browsable(true), Category("6 控制"), DisplayName("6.1 禁用工序"), Description("禁用本工序(True-是；False-否)")]
         public bool Disable { get; set; }
@@ -71,6 +79,11 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
             ExcelLimit = "";
             LabelData = "";
             LabelLimit = "";
+
+            OpenPrintOrder = false;
+            OrderData = "";
+            OrderLimit = "";
+            OrderTestName = "";
         }
         /// <summary>
         /// 序列化

halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/ThicknessProp.cs

@@ -52,18 +52,26 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
         [PropertyOrder(44), Browsable(true), Category("5 上下限"), DisplayName("5.4 下限"), Description("设置流程下限")]
         public double MinLimit { get; set; }
 
-        [PropertyOrder(51), Browsable(true), Category("6 打印"), DisplayName("6.1 开启Excel打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(51), Browsable(true), Category("6 打印"), DisplayName("6.01 开启Excel打印"), Description("启用本工序数据打印")]
         public bool OpenPrint { get; set; }
-        [PropertyOrder(52), Browsable(true), Category("6 打印"), DisplayName("6.2 打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(52), Browsable(true), Category("6 打印"), DisplayName("6.02 打印数据"), Description("打印均值数据的位置")]
         public string ExcelData { get; set; }
-        [PropertyOrder(53), Browsable(true), Category("6 打印"), DisplayName("6.3 打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(53), Browsable(true), Category("6 打印"), DisplayName("6.03 打印上下限"), Description("打印上下限的位置")]
         public string ExcelLimit { get; set; }
-        [PropertyOrder(54), Browsable(true), Category("6 打印"), DisplayName("6.4 开启标签打印"), Description("启用本工序数据打印")]
+        [PropertyOrder(54), Browsable(true), Category("6 打印"), DisplayName("6.04 开启标签打印"), Description("启用本工序数据打印")]
         public bool OpenPrintLabel { get; set; }
-        [PropertyOrder(55), Browsable(true), Category("6 打印"), DisplayName("6.5 标签打印数据"), Description("打印均值数据的位置")]
+        [PropertyOrder(55), Browsable(true), Category("6 打印"), DisplayName("6.05 标签打印数据"), Description("打印均值数据的位置")]
         public string LabelData { get; set; }
-        [PropertyOrder(56), Browsable(true), Category("6 打印"), DisplayName("6.6 标签打印上下限"), Description("打印上下限的位置")]
+        [PropertyOrder(56), Browsable(true), Category("6 打印"), DisplayName("6.06 标签打印上下限"), Description("打印上下限的位置")]
         public string LabelLimit { get; set; }
+        [PropertyOrder(74), Browsable(true), Category("6 打印"), DisplayName("6.07 开启工单打印"), Description("启用本工序数据打印")]
+        public bool OpenPrintOrder { get; set; }
+        [PropertyOrder(75), Browsable(true), Category("6 打印"), DisplayName("6.08 工单打印数据"), Description("打印均值数据的位置序列")]
+        public string OrderData { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("6 打印"), DisplayName("6.09 工单打印上下限"), Description("打印上下限的位置序列")]
+        public string OrderLimit { get; set; }
+        [PropertyOrder(76), Browsable(true), Category("6 打印"), DisplayName("6.10 工单打印测试名称"), Description("打印测试名称的位置序列")]
+        public string OrderTestName { get; set; }
 
 
         [PropertyOrder(61), Browsable(true), Category("7 控制"), DisplayName("7.1 禁用工序"), Description("禁用本工序(True-是；False-否)")]
@@ -99,6 +107,11 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop
             ExcelLimit = "";
             LabelData = "";
             LabelLimit = "";
+
+            OpenPrintOrder = false;
+            OrderData = "";
+            OrderLimit = "";
+            OrderTestName = "";
         }
         /// <summary>
         /// 序列化

halftoneproject-master/BanBoShi/SysUI/ProcessStep/StepListFrm.Designer.cs

@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StepListFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbtnDel = new System.Windows.Forms.ToolStripButton();
@@ -52,6 +52,7 @@
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.tsslCount = new System.Windows.Forms.ToolStripStatusLabel();
+            this.tbSearch = new System.Windows.Forms.TextBox();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.statusStrip1.SuspendLayout();
@@ -150,14 +151,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colId,
@@ -166,14 +167,14 @@
             this.类型,
             this.Column2,
             this.Column1});
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle11;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView1.Location = new System.Drawing.Point(0, 102);
             this.dataGridView1.Margin = new System.Windows.Forms.Padding(2);
@@ -182,8 +183,8 @@
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowHeadersWidth = 62;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle12;
             this.dataGridView1.RowTemplate.Height = 30;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView1.Size = new System.Drawing.Size(1210, 468);
@@ -203,8 +204,8 @@
             // 检测值
             // 
             this.检测值.DataPropertyName = "Code";
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.检测值.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            this.检测值.DefaultCellStyle = dataGridViewCellStyle8;
             this.检测值.HeaderText = "编号";
             this.检测值.MinimumWidth = 8;
             this.检测值.Name = "检测值";
@@ -215,9 +216,9 @@
             // 
             this.工序.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.工序.DataPropertyName = "Name";
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.工序.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.工序.DefaultCellStyle = dataGridViewCellStyle9;
             this.工序.HeaderText = "名称";
             this.工序.MinimumWidth = 8;
             this.工序.Name = "工序";
@@ -244,9 +245,9 @@
             // Column1
             // 
             this.Column1.DataPropertyName = "ModifyTime";
-            dataGridViewCellStyle4.Format = "g";
-            dataGridViewCellStyle4.NullValue = null;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle10.Format = "g";
+            dataGridViewCellStyle10.NullValue = null;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle10;
             this.Column1.HeaderText = "修订日期";
             this.Column1.MinimumWidth = 8;
             this.Column1.Name = "Column1";
@@ -272,11 +273,22 @@
             this.tsslCount.Size = new System.Drawing.Size(24, 17);
             this.tsslCount.Text = "共 ";
             // 
+            // tbSearch
+            // 
+            this.tbSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbSearch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbSearch.Location = new System.Drawing.Point(949, 61);
+            this.tbSearch.Name = "tbSearch";
+            this.tbSearch.Size = new System.Drawing.Size(200, 26);
+            this.tbSearch.TabIndex = 29;
+            this.tbSearch.TextChanged += new System.EventHandler(this.tbSearch_TextChanged);
+            // 
             // StepListFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1210, 592);
+            this.Controls.Add(this.tbSearch);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.toolStrip1);
@@ -313,5 +325,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn 类型;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.TextBox tbSearch;
     }
 }

halftoneproject-master/BanBoShi/SysUI/ProcessStep/StepListFrm.cs

@@ -36,6 +36,7 @@ namespace MaiMuAOI.SysUI.ProcessStep
             };
             dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             #endregion
+            this.tbSearch.Top = toolStrip1.Top + 15;
         }
         private void InitDataView(int selIndex = -1)
         {
@@ -192,5 +193,39 @@ namespace MaiMuAOI.SysUI.ProcessStep
             }
             InitDataView();
         }
+
+        private void tbSearch_TextChanged(object sender, EventArgs e)
+        {
+            if (tbSearch.Text != "")
+            {
+                int count = 0;
+                foreach (DataGridViewRow row in dataGridView1.Rows)
+                {
+                    for (int i = 0; i < row.Cells.Count; i++)
+                    {
+                        if (row.Cells[i].Value != null && row.Cells[i].Value.ToString().Contains(tbSearch.Text))
+                        {
+                            count = count + 1;
+                        }
+                    }
+                    if (count == 0)
+                    {
+                        CurrencyManager cm = (CurrencyManager)BindingContext[dataGridView1.DataSource];
+
+                        cm.SuspendBinding(); //挂起数据绑定
+                        row.Visible = false;
+                        cm.ResumeBinding(); //恢复数据绑定
+                    }
+                    count = 0;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < dataGridView1.Rows.Count; i++)
+                {
+                    dataGridView1.Rows[i].Visible = true;
+                }
+            }
+        }
     }
 }

halftoneproject-master/BanBoShi/SysUI/ProcessStep/StepListFrm.resx

@@ -125,14 +125,14 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVFhH3ZfNSwJBGMaFIIgM3R2/gu5B/0OXDp26eiro
-        UO6OfRD9S921PyCIopPQKTx4iFbcGTU6R1+QzaNvarow7jYi9YMHfMd5n/dhdZed2ChxR6YYF2XGa5+M
-        y44ZwUuU4U1jgsnyVkY1VMYNjKmCGTRuHJWyhI22K4/U51WT6nkihCjRuBHy1Xl7W75ajn9LK8aBN2Zg
-        Fi0NyO60FlXCN9sVV7RkHHhjBmbR0gAsIh3j/g0t6cl35rqaEHhjhrEAzJUXEJVajAdI7IsWRKUW81eA
-        +x5EpZb/F8Dm8h6iUkvkALnjZtpyxJnl+ufDivPaMzS6jr3oofY+kQPYbnOt9xSbXOih9j6RA4DEiZdM
-        FerL6YPH3LdYQTag4TXswV5q+8GvAgSh9j5AVGqZRoAZ34ZOow5RqcV4gCT32xCVWsxfAe5vQFRqMR4g
-        LJECrJw2FtTtFcf3YYQe9JJNl9AB7KLIJ7h8Ybveh3q4vIeS6kEvPMgufIAUl+uWKy9tLq6jCL3wILs/
-        +h8wSegAdlFuqt/zjrmiGkmqFx5kF+U/ILbwysW49xRF6IUH2ekDqMSzey3HYQG3zbQPJpgReDABODap
-        hDM6mikye+2s2jTVwylm0Lhglg4Fw3ud6eM5POFNY4hY7AtiVZYue5IDsQAAAABJRU5ErkJggg==
+        UO6OfRD9S921PyCIopPQKYQ6RCvujBqdoy/I5tE3NV0YdxuR+sEDvuO8z/uwustObJi4I1OMizLjt5+M
+        y7YZwUuU4U1jgsnyZkY1VEYNjKmCGTRuFJWyhI22Kw/U52WT6noihCjRuCHy1Vl7U75ajn9NK8aBN2Zg
+        Fi31yW4151XCN9sVF7RkHHhjBmbRUh8sIh3j/hUt6cm3ZzoaE3hjhrEAzJVnEJVajAdI7IomRKUW81eA
+        +x5EpZb/F8Dm8h6iUkvkALnDRtpyxInl+qeDivO7Z2h4HXvRQ+09Igew3cZK9yk2vtBD7T0iBwCJIy+Z
+        KtQW03uPuW+xgqxDg2vYg73U9oNfBQhC7X2AqNQyiQBTvg2deg2iUovxAEnutyAqtZi/Atxfg6jUYjxA
+        WCIFWDquz6nbK47vwwg96CWbDqED2EWRT3D5wra9D/VweQ8l1YNeeJBd+AApLlctV57bXFxGEXrhQXZ/
+        9D9gktAB7KJcV7/nDXNFNZJULzzILsp/QGzglYtx7ymK0AsPstMHUImn91qOwwJum0kfTDAj8GACcGxS
+        Cad0NFNkdlpZtWmih1PMoHHBLOwLhvc608dzeMKbxhCx2BdCF5Yqz7+xWQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="tsbtnDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs

@@ -38,6 +38,7 @@ namespace MaiMuAOI.SysUI.ProductAndStep
 
             dataGridView1.DefaultCellStyle.ForeColor = Color.Black;
             dataGridView2.DefaultCellStyle.ForeColor = Color.Black;
+            dataGridView3.DefaultCellStyle.ForeColor = Color.Black;
 
             this.Cursor = Cursors.WaitCursor;
             skinTabControl1.SelectedIndex = 0;
@@ -51,11 +52,13 @@ namespace MaiMuAOI.SysUI.ProductAndStep
             //显示打印内容
             DataGridViewComboBoxColumn cbxColumn = (DataGridViewComboBoxColumn)dataGridView1.Columns["DataType"];
             DataGridViewComboBoxColumn cbxColumn2 = (DataGridViewComboBoxColumn)dataGridView2.Columns["DataType2"];
+            DataGridViewComboBoxColumn cbxColumn3 = (DataGridViewComboBoxColumn)dataGridView3.Columns["DataType3"];
             foreach (var s in System.Enum.GetValues(typeof(PrintDataPdtEnum)))
             {
                 PrintDataPdtEnum dataEnum = (PrintDataPdtEnum)s;
                 cbxColumn.Items.Add(dataEnum.GetDescription());
                 cbxColumn2.Items.Add(dataEnum.GetDescription());
+                cbxColumn3.Items.Add(dataEnum.GetDescription());
             }
 
             if (m != null)
@@ -203,6 +206,8 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     tsbPdtPush.Visible = false;
 
                 /////////////Print////////////////
+                this.cbOrderPrint.Checked = m.EnableOrderPrint;
+                this.tbOrderTempPath.Text = m.OrderTempPath;
                 this.cbOpenBarTenderPrint.Checked = m.EnableLabelPrint;
                 this.tbBarTenderTempPath.Text = m.LabelTempPath;
                 this.cbOpenExcelPrint.Checked = m.EnableExcelPrint;
@@ -210,18 +215,24 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                 if (m.PrintInfoList != null)
                     foreach (var item in m.PrintInfoList)
                     {
-                        if (item.IsLabel && !item.IsValue)
+                        if (item.Type == 1 && !item.IsValue)
                         {
                             int index = this.dataGridView1.Rows.Add();
                             this.dataGridView1.Rows[index].Cells[0].Value = item.PrintKey;
                             this.dataGridView1.Rows[index].Cells[1].Value = item.PrintCode;
                         }
-                        else if (!item.IsLabel && !item.IsValue)
+                        else if (item.Type == 0 && !item.IsValue)
                         {
                             int index = this.dataGridView2.Rows.Add();
                             this.dataGridView2.Rows[index].Cells[0].Value = item.PrintKey;
                             this.dataGridView2.Rows[index].Cells[1].Value = item.PrintCode;
                         }
+                        else if (item.Type == 3 && !item.IsValue)
+                        {
+                            int index = this.dataGridView3.Rows.Add();
+                            this.dataGridView3.Rows[index].Cells[0].Value = item.PrintKey;
+                            this.dataGridView3.Rows[index].Cells[1].Value = item.PrintCode;
+                        }
                     }
                 ////////////////////////////////
 
@@ -510,6 +521,8 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                 model.HavePad = this.cbHavePad.Checked ? 1 : 0;
 
                 ////////////////////Print//////////////////////////
+                model.EnableOrderPrint = this.cbOrderPrint.Checked;
+                model.OrderTempPath = this.tbOrderTempPath.Text;
                 model.EnableLabelPrint = this.cbOpenBarTenderPrint.Checked;
                 model.LabelTempPath = this.tbBarTenderTempPath.Text;
                 model.EnableExcelPrint = this.cbOpenExcelPrint.Checked;
@@ -520,7 +533,7 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     if (this.dataGridView1.Rows[i].Cells[0].Value != null)
                         labeldata.Add(new PrintInfo()
                         {
-                            IsLabel = true,
+                            Type = 1,
                             IsValue = false,
                             PrintKey = this.dataGridView1.Rows[i].Cells[0].Value.ToString(),
                             PrintCode = this.dataGridView1.Rows[i].Cells[1].Value.ToString(),
@@ -533,7 +546,7 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     if (this.dataGridView2.Rows[i].Cells[0].Value != null)
                         labeldata.Add(new PrintInfo()
                         {
-                            IsLabel = false,
+                            Type = 0,
                             IsValue = false,
                             PrintKey = this.dataGridView2.Rows[i].Cells[0].Value.ToString(),
                             PrintCode = this.dataGridView2.Rows[i].Cells[1].Value.ToString(),
@@ -541,6 +554,19 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                             ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code
                         });
                 }
+                for (int i = 0; i < this.dataGridView3.RowCount; i++)
+                {
+                    if (this.dataGridView3.Rows[i].Cells[0].Value != null)
+                        labeldata.Add(new PrintInfo()
+                        {
+                            Type = 3,
+                            IsValue = false,
+                            PrintKey = this.dataGridView3.Rows[i].Cells[0].Value.ToString(),
+                            PrintCode = this.dataGridView3.Rows[i].Cells[1].Value.ToString(),
+                            CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
+                            ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code
+                        });
+                }
                 model.PrintInfoList = labeldata;
                 /////////////////////////////////////////////////
                 ///

halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.resx

@@ -281,6 +281,12 @@
         b1AAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="Key3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataType3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Key2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductListFrm.Designer.cs

@@ -29,15 +29,15 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductListFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnRefresh = new System.Windows.Forms.ToolStripButton();
@@ -69,6 +69,7 @@
             this.colModifyTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.tsslCount = new System.Windows.Forms.ToolStripStatusLabel();
+            this.tbSearch = new System.Windows.Forms.TextBox();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.statusStrip1.SuspendLayout();
@@ -250,14 +251,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colId,
@@ -273,14 +274,14 @@
             this.colReviseStepName,
             this.colModifyCode,
             this.colModifyTime});
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle17;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView1.Location = new System.Drawing.Point(0, 102);
             this.dataGridView1.Margin = new System.Windows.Forms.Padding(2);
@@ -289,8 +290,8 @@
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowHeadersWidth = 62;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle18;
             this.dataGridView1.RowTemplate.Height = 30;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView1.Size = new System.Drawing.Size(1194, 529);
@@ -301,8 +302,8 @@
             // colId
             // 
             this.colId.DataPropertyName = "Id";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colId.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colId.DefaultCellStyle = dataGridViewCellStyle11;
             this.colId.HeaderText = "ID";
             this.colId.MinimumWidth = 8;
             this.colId.Name = "colId";
@@ -320,8 +321,8 @@
             // colCode
             // 
             this.colCode.DataPropertyName = "Code";
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.colCode.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            this.colCode.DefaultCellStyle = dataGridViewCellStyle12;
             this.colCode.HeaderText = "料号";
             this.colCode.MinimumWidth = 8;
             this.colCode.Name = "colCode";
@@ -332,9 +333,9 @@
             // 
             this.colName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.colName.DataPropertyName = "Name";
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.colName.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle13.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.colName.DefaultCellStyle = dataGridViewCellStyle13;
             this.colName.HeaderText = "名称";
             this.colName.MinimumWidth = 135;
             this.colName.Name = "colName";
@@ -370,8 +371,8 @@
             // colTargetCount
             // 
             this.colTargetCount.DataPropertyName = "TargetCount";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.colTargetCount.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.colTargetCount.DefaultCellStyle = dataGridViewCellStyle14;
             this.colTargetCount.HeaderText = "目标数";
             this.colTargetCount.MinimumWidth = 8;
             this.colTargetCount.Name = "colTargetCount";
@@ -381,8 +382,8 @@
             // colCompleteCount
             // 
             this.colCompleteCount.DataPropertyName = "CompleteCount";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.colCompleteCount.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.colCompleteCount.DefaultCellStyle = dataGridViewCellStyle15;
             this.colCompleteCount.HeaderText = "完成数";
             this.colCompleteCount.MinimumWidth = 8;
             this.colCompleteCount.Name = "colCompleteCount";
@@ -417,9 +418,9 @@
             // colModifyTime
             // 
             this.colModifyTime.DataPropertyName = "ModifyTime";
-            dataGridViewCellStyle7.Format = "g";
-            dataGridViewCellStyle7.NullValue = null;
-            this.colModifyTime.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle16.Format = "g";
+            dataGridViewCellStyle16.NullValue = null;
+            this.colModifyTime.DefaultCellStyle = dataGridViewCellStyle16;
             this.colModifyTime.HeaderText = "修订日期";
             this.colModifyTime.MinimumWidth = 8;
             this.colModifyTime.Name = "colModifyTime";
@@ -446,11 +447,22 @@
             this.tsslCount.Size = new System.Drawing.Size(24, 17);
             this.tsslCount.Text = "共 ";
             // 
+            // tbSearch
+            // 
+            this.tbSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbSearch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbSearch.Location = new System.Drawing.Point(927, 58);
+            this.tbSearch.Name = "tbSearch";
+            this.tbSearch.Size = new System.Drawing.Size(200, 26);
+            this.tbSearch.TabIndex = 28;
+            this.tbSearch.TextChanged += new System.EventHandler(this.tbSearch_TextChanged);
+            // 
             // ProductListFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1194, 653);
+            this.Controls.Add(this.tbSearch);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.toolStrip1);
@@ -501,5 +513,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn colModifyTime;
         private System.Windows.Forms.StatusStrip statusStrip1;
         private System.Windows.Forms.ToolStripStatusLabel tsslCount;
+        private System.Windows.Forms.TextBox tbSearch;
     }
 }

halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductListFrm.cs

@@ -50,6 +50,8 @@ namespace MaiMuAOI.SysUI.ProductAndStep
             //行列交叉处标题
             //if (dataGridView1.RowHeadersVisible) dataGridView1.TopLeftHeaderCell.Value = "SPH/CYL";
             #endregion
+
+            this.tbSearch.Top = toolStrip1.Top + 15;
         }
 
         private void InitDataView(int selIndex = -1)
@@ -216,6 +218,39 @@ namespace MaiMuAOI.SysUI.ProductAndStep
         {
             this.Close();
         }
-       
+
+        private void tbSearch_TextChanged(object sender, EventArgs e)
+        {
+            if (tbSearch.Text != "")
+            {
+                int count = 0;
+                foreach (DataGridViewRow row in dataGridView1.Rows)
+                {
+                    for (int i = 0; i < row.Cells.Count; i++)
+                    {
+                        if (row.Cells[i].Value != null && row.Cells[i].Value.ToString().Contains(tbSearch.Text))
+                        {
+                            count = count + 1;
+                        }
+                    }
+                    if (count == 0)
+                    {
+                        CurrencyManager cm = (CurrencyManager)BindingContext[dataGridView1.DataSource];
+
+                        cm.SuspendBinding(); //挂起数据绑定
+                        row.Visible = false;
+                        cm.ResumeBinding(); //恢复数据绑定
+                    }
+                    count = 0;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < dataGridView1.Rows.Count; i++)
+                {
+                    dataGridView1.Rows[i].Visible = true;
+                }
+            }
+        }
     }
 }

halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductListFrm.resx

@@ -124,35 +124,35 @@
   <data name="tsbtnRefresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANBSURBVFhH7ZdNSFRRHMVPRYug2klBtKisQAhKKRACCapV
-        VAtBCLKFH+PXODiOjh+ZFQqmGZkiY2bphCEJgmIItgiCaFeboEBoUUEbI+JlYzNz7+04/AN13htHcxaB
-        B37838f533O9c99zBhv6L6UHkGYGkaWHkB2rQeyTW6mTGcJJNYTucBBfTBBmOaEgvqkghvVjnJeWOKlB
-        TMhh8uKAGQwe5wRMskSH8JYrUyxDxPT3npwmJ/0QeVY/fplHbF4jC+MsP09KZgB1xKw3Mnxi6fvINf1s
-        SAES4Szdj3Srj8vex4YUIDHOUj0YNr00C1Y79OLzf0Vi7GV6cJSYlQj18JHrwTTpI2Phe3w0bXx2SJS9
-        VBfumi4aE0DPmO5CmrTEpDuxjden7fzLkRZ7RW7jg7lDowOqE5NijdPPdlh2PcsRe7y4PNtNB00OWM3c
-        mO3YLfYlsvM7IS3x0q3IMG00OaDaMCXWJeL1CTu/HQteaYuXbsEJ00qjA6oFD8SaGulmrsBNhjmgbtiv
-        wLrJNHMPXGeYA7E90Gy/B5zEP2qnvoUdsSrH5im2yO14RRoxY5oY6IBqwrhYbcUJ7tdNyGZYpr6KIwur
-        ynqYHORxum7EAXo2iz1eqh7dpoFhCVANGNX1S98DphhbdQMu8Ho1a76px0Vdh7M8z2HNJse1H8dY06XF
-        XqYOWcbPoBUI+fkmrMWUqkGv8mM06sdr1mkSYNA1XYsK1nzWXF2Dc7HJ1OAUJ7RLopylqjFifAxaBfNe
-        zEZ9eKN8mGB/gLRoH3y6GiWs+QzPo+80XwKbJMZZuor/Db3ccF4OniRzXvyIeDET9eKlqsKo8iLA623a
-        iwbi4ZhFrHslYmXpSlwyHg6eJJYHc2E3PkU9XIVKPFdujLAGlAcd2sOPxI0cGTp5sanRuBmQBJYbod9u
-        fI248T5ajleqAs84iSckoCu4KRPt/ETSZbhsFfDjKGdQAqwrmJ8vxGykBB+jZVyFUrxQ5ZhgeJ4MtXZp
-        F78VuzBpShnmgFWKcMiF7+EifgwuvOMEgrocmTLE+ojP+klVzN8FBfzy4WLwIrgCkbALn3k/wAmfkZbU
-        iSF7TCF/ETEsVgtxSG5taJUC/gDFAXjUm9ab3AAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANCSURBVFhH7ZdLaFNBGIWPigtB3YmCuFCrgiCoRaEgFEFd
+        iboQCoJxYW1s0xhMU9OHtSoV6hOrQVLrKxFFLAiGSqEuBEHc6UZQEFyo4EYRr4/UJPOPp+EXbHJvGrVZ
+        CB74+O/j/HOmk7m3Cf7rn5Rcxhx7DdWSQE2+JrFQb1VONoF1JoHzmSTe2iRsIekkPpgkbsh1bNGWIplr
+        SOlh+eKAyxl8lxOw5ZJL4ClXpkGHyOvnPT0tT3IFdc4AvtmrbP5DxsYpPC9L9jLaiJ1sdPjSkovYbgfY
+        UAE0wlsygCqnn8vez4YKoDHeMjHcsBdoVpzjkF/P/xaNcZeNYSWxE5GO8ZGLYYT0kzuZc3w0XXxuaJS7
+        TB/O2j4aS0DPHenDHG3JS05jBq+PuPkL0RZ3ZU/hhT1DowfmNIbUWqQvJ/DZracQtReLyzPTnqTJA6eb
+        G/ME5ql9nNz8XmhLseQYlttemjwwvRhW6zjxesrN78aYV9uKJT1Ya4/R6IHpwSW1VkbSzRU4yjAPzBH3
+        FZg02W7ugcMM8yC/B7rd94CX+EfNluOYla96bG9jmt4uVrYTL20XAz0wXbirVldxgoukCzUMWy0HsWJs
+        VVmXkSU8rpJOLKZnqtqLZdpx3nYwrASmA4PSPv49YBswXTqwlddbWH22HdukDZt4XstaQ9ZIFKtYq7TF
+        XbYN1TbKoAlIR/kmPIBh04oLJorBXBSPWUdInEGH5ACaWX2s26UVm/OTacV6TmiuRnnLtOCWjTDoNxgN
+        430ugicmghT746RHIohIC/ay+hheR98GvgSmaIy3ZD//G4a54cIcvEy+hvEpG8bLXBgPzX4MmjDivN4r
+        YXSQEMfcw7pAIyaW7MMOG+LgZeKE8DUTxOtciKuwD/dNELdY4yaEkxLiRxJErQ5dvtjUaYMMKAMniPT3
+        IN5lg3ieC+CRacY9TuImiUszN2WpnV9K0oSdzm5+HAEGlcDxYXS0Hu+ze/Eq18RVaMQDE0CK4XU61J9L
+        /PxW7MeQbWSYB04jMmk/Pmb28GPw4xknkJQAVusQkyM+6+tMA38X7OaXDz+Df8HZhWzGjze8H+eEN2pL
+        5cSQ+baev4gYlq/1WKq3/us3BfwAbvF4xnDVq7gAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbtnAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVFhH3ZfNSwJBGMaFIIgM3R2/gu5B/0OXDp26eiro
-        UO6OfRD9S921PyCIopPgKTx0iFbcGTU6R1+QzaNvarow7jYi9YMHfMd5n/dhdZed2ChxR6YYF2XGq5+M
-        y44ZwUuU4U1jgsnyVkY1VMYNjKmCGTRuHJWyhI22K4/U51WT6nkihCjRuBHytXl7W75ajl+lFePAGzMw
-        i5YGZHdaiyrhm+2KK1oyDrwxA7NoaQAWkY5x/4aW9OQ7c11NCLwxw1gA5soLiEotxgMk9kULolKL+SvA
-        fQ+iUsv/C2BzeQ9RqSVygNxxM2054sxy/fNhxfndMzS6jr3oofY+kQPYbnOt9xSbXOih9j6RA4DEiZdM
-        FerL6YPH3LdYQTag4TXswV5q+8GvAgSh9j5AVGqZRoAZ34ZOow5RqcV4gCT32xCVWsxfAe5vQFRqMR4g
-        LJECrJw2FtTtFcf3YYQe9JJNl9AB7KLIJ7h8Ybveh3q4vIeS6kEvPMgufIAUl+uWKy9tLq6jCL3wILs/
-        +h8wSegAdlFuqt/zlrmiFkmqFx5kF+U/ILbwysW49xRF6IUH2ekDqMSzey3HYQG3zbQPJpgReDABODap
-        hDM6mikye+2s2jTVwylm0Lhglg4Fw3ud6eM5POFNY4hY7AvfT5X+Wf281gAAAABJRU5ErkJggg==
+        UO6OfRD9S921PyCIopPUKTx0iFbcGTU6R1+QzaNvarow7jYi9YMHfMd5n/dhdZed2DBxR6YYF2XGrz8Z
+        l20zgpcow5vGBJPlzYxqqIwaGFMFM2jcKCplCRttVx6oz8sm1fVECFGicUPkq7P2pny1HP+GVowDb8zA
+        LFrqk91qzquEb7YrLmjJOPDGDMyipT5YRDrG/Sta0pNvz3Q0JvDGDGMBmCvPICq1GA+Q2BVNiEot5q8A
+        9z2ISi3/L4DN5T1EpZbIAXKHjbTliBPL9U8HFed3z9DwOvaih9p7RA5gu42V7lNsfKGH2ntEDgASR14y
+        Vagtpvcec99iBVmHBtewB3up7Qe/ChCE2vsAUallEgGmfBs69RpEpRbjAZLcb0FUajF/Bbi/BlGpxXiA
+        sEQKsHRcn1O3VxzfhxF60Es2HUIHsIsin+DyhW17H+rh8h5Kqge98CC78AFSXK5arjy3ubiMIvTCg+z+
+        6H/AJKED2EW5rn7PW+aKaiSpXniQXZT/gNjAKxfj3lMUoRceZKcPoBJP77UchwXcNpM+mGBG4MEE4Nik
+        Ek7paKbI7LSyatNED6eYQeOCWdgXDO91po/n8IQ3jSFisS+/EZX62W9ipgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="tsbtnDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -232,16 +232,16 @@
   <data name="tsbtnRevise.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIlSURBVFhH7dTLSxtRFAbwQEEo+P/UQkHahdCFUiwRUyNq
-        4qpddSNddNNNN1YRtAFLqSh9yCQxJjGLQkEo9IUgYodgq1LF1HHMBOuDwMDA6Rw5N1yvk5m5SexC+sEP
-        ktxzvntXCVyaDOZK4EckZ0zSSuMSzZXKTpdVQ2uNiezliFbrT3TBKA8uGCCL1utLNGuUbVALqqg9kaxu
-        RrJFcJQuxu8renNQgaZIZj/mNEM1tWUgo5sDmX1wlrfwchoN4CPCab0kztGxfPrTumkDF2X70is0fpr+
-        Oa0gztGRXPrm90wbMKm1k8rnM1LaCK3YO9ojpxk69p/elGbagEnkjyv435l7qYIWmtO2nc4Q1fpLOKla
-        4eQuMIp6dA5/7gdVe6cnoVo9id/AvF09rIqf80L17gnFVSsULwAzs/LHEz9fDdW7pzumWt3KDjCvlg98
-        4/dEVO+ergnV6prdBubFUkkav89QvXtujqtW8N0WMM+/GtL4fYbq3XP3zS/gjX0qShM7ENV7p/P1JjDD
-        H/ek8fsMVXsH/z7vzGwA7+mi5pu4i6jaf/ARHdPrwHvyYdeTuIOoUj5BRW1qn/oBvMfvd6oSZxFV1R58
-        xO2XeeAN5bbOEWcQVdQffETb5HfgPUxvVohniFYbF3zErdgK8B4kf575ztBK49My8vlq6/gyuKHRiws+
-        4sbYEjihkYsPPuL66Dfg0dG/S+vEYvO1Z18A0U//cxkSCPwFCXwW+5yqUBkAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIlSURBVFhH7dTRS1NRHAfwgSAE/j8pBEoPQQ+GFBOXi3Tz
+        qZ56CR966aWXUkRTUKJQUuNuc21zD4EgBKUhiOhVypIUp9fr7ihTBhcu/Ly/+J1xPN7de882e5C+8IFt
+        5/f7nvO0wKVJT7YAfkSyxiit1C7RbKHodFk5tFabyF6OaLX6RGeNYs+sAbJovbpEM0bRBpWgisoTyehm
+        JJMHR6l87IGiNwQVqI+kD0ecZqimsnSndbM7fQjO1i28nEYD+IhwSi+Ic3Qsn66UbtrARdG+tI7G/6Zr
+        RsuJc3Qkl/vvD0wbMMmvJ6XPZyS1Plqxd7Repxk69p97Sc20ARPfOC7hf2fuJnNaaEbbcTpDVOsv4YRq
+        hRP7wCjqn3P4cz+o2judcdXqjO8BM7V6VBY/54Xq3ROKqVYolgNmYuW3J36+HKp3T8ewanUou8C8Xv7l
+        G78nonr3tA+pVvu7HWDGlgrS+H2G6t3TMqhaweltYIYXDWn8PkP17rkz+RN4A5/y0sQORPXeuf12C5jn
+        Hw+k8fsMVXsH/z7bJn4A79m85pu4i6jaf/ARt8a/A+/p3L4ncQdRpXyCilrf+uYb8J582C1LnEVUVXnw
+        ETdfbQDvcXb7HHEGUUX1wUfcGF0D3qPUVol4hmi1dsFHXB9ZAd7DxOaZ7wyt1D6NfZ+vNA8tgxsavbjg
+        I64NLIETGrn44COa+r8Aj47+XZpfzjdcfbEAiH76n8uQQOAU26MW9kEIUTsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbtnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

halftoneproject-master/BanBoShi/SysUI/SysSet/SysSetFrm.Designer.cs

@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SysSetFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnSave = new System.Windows.Forms.ToolStripButton();
@@ -197,6 +197,7 @@
             this.cobLightPortNum = new System.Windows.Forms.ComboBox();
             this.label5 = new System.Windows.Forms.Label();
             this.skinTabPage1 = new CCWin.SkinControl.SkinTabPage();
+            this.cbAsideDefect = new System.Windows.Forms.CheckBox();
             this.cbSnapDefect = new System.Windows.Forms.CheckBox();
             this.cbPdtPut = new System.Windows.Forms.CheckBox();
             this.cbOpenAxisXCal = new System.Windows.Forms.CheckBox();
@@ -313,7 +314,10 @@
             this.tbBarTenderTempPath = new System.Windows.Forms.TextBox();
             this.cbOpenBarTenderPrint = new System.Windows.Forms.CheckBox();
             this.label76 = new System.Windows.Forms.Label();
-            this.cbAsideDefect = new System.Windows.Forms.CheckBox();
+            this.cbDefectEnable = new System.Windows.Forms.CheckBox();
+            this.cbSizeEnabel = new System.Windows.Forms.CheckBox();
+            this.cbOrdercheck = new System.Windows.Forms.CheckBox();
+            this.cbOrderCntcheck = new System.Windows.Forms.CheckBox();
             this.toolStrip1.SuspendLayout();
             this.skinTabPage6.SuspendLayout();
             this.groupBox28.SuspendLayout();
@@ -640,7 +644,7 @@
             this.groupBox14.Controls.Add(this.panel14);
             this.groupBox14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox14.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.groupBox14.Location = new System.Drawing.Point(1, 389);
+            this.groupBox14.Location = new System.Drawing.Point(1, 425);
             this.groupBox14.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox14.Name = "groupBox14";
             this.groupBox14.Padding = new System.Windows.Forms.Padding(2);
@@ -747,7 +751,7 @@
             this.groupBox13.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox13.Name = "groupBox13";
             this.groupBox13.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox13.Size = new System.Drawing.Size(720, 66);
+            this.groupBox13.Size = new System.Drawing.Size(720, 102);
             this.groupBox13.TabIndex = 35;
             this.groupBox13.TabStop = false;
             this.groupBox13.Text = "主界面设置(调试)";
@@ -755,6 +759,8 @@
             // panel13
             // 
             this.panel13.BackColor = System.Drawing.Color.White;
+            this.panel13.Controls.Add(this.cbDefectEnable);
+            this.panel13.Controls.Add(this.cbSizeEnabel);
             this.panel13.Controls.Add(this.cbShowBtn);
             this.panel13.Controls.Add(this.cbDoorAlm);
             this.panel13.Controls.Add(this.cbBuzzShow);
@@ -763,7 +769,7 @@
             this.panel13.Location = new System.Drawing.Point(2, 16);
             this.panel13.Margin = new System.Windows.Forms.Padding(2);
             this.panel13.Name = "panel13";
-            this.panel13.Size = new System.Drawing.Size(716, 48);
+            this.panel13.Size = new System.Drawing.Size(716, 84);
             this.panel13.TabIndex = 0;
             // 
             // cbShowBtn
@@ -2638,6 +2644,8 @@
             // skinTabPage1
             // 
             this.skinTabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.skinTabPage1.Controls.Add(this.cbOrderCntcheck);
+            this.skinTabPage1.Controls.Add(this.cbOrdercheck);
             this.skinTabPage1.Controls.Add(this.cbAsideDefect);
             this.skinTabPage1.Controls.Add(this.cbSnapDefect);
             this.skinTabPage1.Controls.Add(this.cbPdtPut);
@@ -2657,6 +2665,19 @@
             this.skinTabPage1.TabItemImage = null;
             this.skinTabPage1.Text = "功能设置";
             // 
+            // cbAsideDefect
+            // 
+            this.cbAsideDefect.AutoSize = true;
+            this.cbAsideDefect.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbAsideDefect.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.cbAsideDefect.Location = new System.Drawing.Point(465, 315);
+            this.cbAsideDefect.Margin = new System.Windows.Forms.Padding(2);
+            this.cbAsideDefect.Name = "cbAsideDefect";
+            this.cbAsideDefect.Size = new System.Drawing.Size(154, 20);
+            this.cbAsideDefect.TabIndex = 25;
+            this.cbAsideDefect.Text = "启用单边计算目数";
+            this.cbAsideDefect.UseVisualStyleBackColor = true;
+            // 
             // cbSnapDefect
             // 
             this.cbSnapDefect.AutoSize = true;
@@ -2804,7 +2825,7 @@
             this.skinTabControl1.PageImagePosition = CCWin.SkinControl.SkinTabControl.ePageImagePosition.Left;
             this.skinTabControl1.PageNorml = null;
             this.skinTabControl1.PageNormlTxtColor = System.Drawing.Color.White;
-            this.skinTabControl1.SelectedIndex = 0;
+            this.skinTabControl1.SelectedIndex = 7;
             this.skinTabControl1.Size = new System.Drawing.Size(723, 643);
             this.skinTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.skinTabControl1.TabIndex = 22;
@@ -4106,36 +4127,36 @@
             // 
             // dataGridView2
             // 
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Key2,
             this.DataType2});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.InfoText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.InfoText;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle8;
             this.dataGridView2.Location = new System.Drawing.Point(77, 88);
             this.dataGridView2.Name = "dataGridView2";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
             this.dataGridView2.RowTemplate.Height = 23;
             this.dataGridView2.Size = new System.Drawing.Size(443, 135);
             this.dataGridView2.TabIndex = 16;
@@ -4223,6 +4244,7 @@
             this.label74.Size = new System.Drawing.Size(65, 12);
             this.label74.TabIndex = 4;
             this.label74.Text = "模板路径：";
+            this.label74.Visible = false;
             // 
             // groupBox26
             // 
@@ -4261,36 +4283,36 @@
             // 
             // dataGridView1
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Key,
             this.DataType});
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle11;
             this.dataGridView1.Location = new System.Drawing.Point(77, 88);
             this.dataGridView1.Name = "dataGridView1";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.Size = new System.Drawing.Size(443, 135);
             this.dataGridView1.TabIndex = 16;
@@ -4381,18 +4403,55 @@
             this.label76.Text = "模板路径：";
             this.label76.Visible = false;
             // 
-            // cbAsideDefect
-            // 
-            this.cbAsideDefect.AutoSize = true;
-            this.cbAsideDefect.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbAsideDefect.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.cbAsideDefect.Location = new System.Drawing.Point(465, 315);
-            this.cbAsideDefect.Margin = new System.Windows.Forms.Padding(2);
-            this.cbAsideDefect.Name = "cbAsideDefect";
-            this.cbAsideDefect.Size = new System.Drawing.Size(154, 20);
-            this.cbAsideDefect.TabIndex = 25;
-            this.cbAsideDefect.Text = "启用单边计算目数";
-            this.cbAsideDefect.UseVisualStyleBackColor = true;
+            // cbDefectEnable
+            // 
+            this.cbDefectEnable.AutoSize = true;
+            this.cbDefectEnable.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.cbDefectEnable.Location = new System.Drawing.Point(239, 52);
+            this.cbDefectEnable.Margin = new System.Windows.Forms.Padding(2);
+            this.cbDefectEnable.Name = "cbDefectEnable";
+            this.cbDefectEnable.Size = new System.Drawing.Size(120, 16);
+            this.cbDefectEnable.TabIndex = 13;
+            this.cbDefectEnable.Text = "显示缺陷检测禁用";
+            this.cbDefectEnable.UseVisualStyleBackColor = true;
+            // 
+            // cbSizeEnabel
+            // 
+            this.cbSizeEnabel.AutoSize = true;
+            this.cbSizeEnabel.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.cbSizeEnabel.Location = new System.Drawing.Point(79, 52);
+            this.cbSizeEnabel.Margin = new System.Windows.Forms.Padding(2);
+            this.cbSizeEnabel.Name = "cbSizeEnabel";
+            this.cbSizeEnabel.Size = new System.Drawing.Size(120, 16);
+            this.cbSizeEnabel.TabIndex = 12;
+            this.cbSizeEnabel.Text = "显示尺寸检测禁用";
+            this.cbSizeEnabel.UseVisualStyleBackColor = true;
+            // 
+            // cbOrdercheck
+            // 
+            this.cbOrdercheck.AutoSize = true;
+            this.cbOrdercheck.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbOrdercheck.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.cbOrdercheck.Location = new System.Drawing.Point(89, 180);
+            this.cbOrdercheck.Margin = new System.Windows.Forms.Padding(2);
+            this.cbOrdercheck.Name = "cbOrdercheck";
+            this.cbOrdercheck.Size = new System.Drawing.Size(154, 20);
+            this.cbOrdercheck.TabIndex = 26;
+            this.cbOrdercheck.Text = "启用检测工单确认";
+            this.cbOrdercheck.UseVisualStyleBackColor = true;
+            // 
+            // cbOrderCntcheck
+            // 
+            this.cbOrderCntcheck.AutoSize = true;
+            this.cbOrderCntcheck.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbOrderCntcheck.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.cbOrderCntcheck.Location = new System.Drawing.Point(89, 223);
+            this.cbOrderCntcheck.Margin = new System.Windows.Forms.Padding(2);
+            this.cbOrderCntcheck.Name = "cbOrderCntcheck";
+            this.cbOrderCntcheck.Size = new System.Drawing.Size(154, 20);
+            this.cbOrderCntcheck.TabIndex = 27;
+            this.cbOrderCntcheck.Text = "启用检测数量确认";
+            this.cbOrderCntcheck.UseVisualStyleBackColor = true;
             // 
             // SysSetFrm
             // 
@@ -4829,5 +4888,9 @@
         private System.Windows.Forms.CheckBox cbPdtPut;
         private System.Windows.Forms.CheckBox cbSnapDefect;
         private System.Windows.Forms.CheckBox cbAsideDefect;
+        private System.Windows.Forms.CheckBox cbDefectEnable;
+        private System.Windows.Forms.CheckBox cbSizeEnabel;
+        private System.Windows.Forms.CheckBox cbOrdercheck;
+        private System.Windows.Forms.CheckBox cbOrderCntcheck;
     }
 }

halftoneproject-master/BanBoShi/SysUI/SysSet/SysSetFrm.cs

@@ -92,6 +92,8 @@ namespace MaiMuAOI.UI.SysSet
             cbPdtPut.Checked = ConfMgr.Instance.SysConfigParams.OpenPdtIsHave;
             cbSnapDefect.Checked = ConfMgr.Instance.SysConfigParams.OpenDefectSanp;
             cbAsideDefect.Checked = ConfMgr.Instance.SysConfigParams.OpenAsideDefect;
+            cbOrdercheck.Checked = ConfMgr.Instance.SysConfigParams.OpenOredrCheck;
+            cbOrderCntcheck.Checked = ConfMgr.Instance.SysConfigParams.OpenOredrCntCheck;
 
             cobLightPortNum.Text = ConfMgr.Instance.SysConfigParams.LightCom;
             numCamBaud.Value = ConfMgr.Instance.SysConfigParams.LightComBaud;
@@ -163,6 +165,8 @@ namespace MaiMuAOI.UI.SysSet
             cbBuzzShow.Checked = ConfMgr.Instance.SysConfigParams.ShowBuzz;
             cbDoorAlm.Checked = ConfMgr.Instance.SysConfigParams.ShowDoorAlm;
             cbShowBtn.Checked = ConfMgr.Instance.SysConfigParams.ShowDistribution;
+            cbSizeEnabel.Checked = ConfMgr.Instance.SysConfigParams.ShowSizeBtn;
+            cbDefectEnable.Checked = ConfMgr.Instance.SysConfigParams.ShowDefectBtn;
 
             numViewX.Value = (decimal)ConfMgr.Instance.SysConfigParams.DefectCamViewX;
             numViewY.Value = (decimal)ConfMgr.Instance.SysConfigParams.DefectCamViewY;
@@ -243,6 +247,8 @@ namespace MaiMuAOI.UI.SysSet
             configParams.OpenPdtIsHave = cbPdtPut.Checked;
             configParams.OpenDefectSanp = cbSnapDefect.Checked;
             configParams.OpenAsideDefect = cbAsideDefect.Checked;
+            configParams.OpenOredrCheck = cbOrdercheck.Checked;
+            configParams.OpenOredrCntCheck = cbOrderCntcheck.Checked;
 
             configParams.LightCom = cobLightPortNum.Text;
             configParams.LightComBaud = (int)numCamBaud.Value;
@@ -314,6 +320,8 @@ namespace MaiMuAOI.UI.SysSet
             configParams.ShowBuzz = cbBuzzShow.Checked;
             configParams.ShowDoorAlm = cbDoorAlm.Checked;
             configParams.ShowDistribution = cbShowBtn.Checked;
+            configParams.ShowSizeBtn = cbSizeEnabel.Checked;
+            configParams.ShowDefectBtn = cbDefectEnable.Checked;
 
             configParams.DefectCamViewX = (double)numViewX.Value;
             configParams.DefectCamViewY = (double)numViewY.Value;

halftoneproject-master/BanBoShi/SysUI/SysSet/SysSetFrm.resx

@@ -145,17 +145,17 @@
   <data name="tsbtnDatImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJbSURBVFhHvZdNaxpRGIX9EfkBdRPaEjCDqZoP0WgMKG00
-        UailhHwsJFSh0BACgXwsu3DRdue6624KXXSVRTal5D905aq70kJIKTc+k3nDzTijo97pgTMwzr3nnLn3
-        viNvZFSs7R1ape037R6/ZorV7vz61u/ZldLfeDyuhEuZ7D9+W8wXrxmTrW5+Z87ppZpyZEZHob73KZFc
-        ukqvPlPwxXFHtT5e2jz40rV5+k3ZlHue7b77bI9drTfscGig5cgOR66283ghk/mDKWJiMg4JhQZh0ETb
-        sfEHA3kTL8FJSBC0HRt/sGxeAiaItmPjDwbp+2uKaAYOwP5XmmdGgrCdaKEZOAAT2TOpAA6RVAGhhLoR
-        91IFUEyZyz1jRgrgFpbSklCQsUIxwxhi6g55L0AsFnvQ++GHLiJEzD3ZBNF27G8hIaLrB+eR90oJ5193
-        QgnRFwD8rxDoeAYAfiGSzQ8Th+irAi6DOF1q3AWAj8otlUgtqNp+20wV2BfNIAjnGm2VSmdVvrpliwr1
-        4GI2tArGCQBNnImJAlhHtx8mL+GgHDuACXNW7i7AIM4sV4ya91WBFyhDy7LOHxaeX+jm0Zdv1ZNE0j5c
-        of0X+JnLm4uw8f8CMMxcn2yC9wKIuf4WwjDMIdqOvT8Y5F46E0QzcABWgH00ESRQFehgEBM5REyCoVaB
-        GxLALRxKFXjBHcAkAwVYLm/85G29BCYhqxioMTHZmkG2ga1Bc7HwtOjYDAbfiLVXJ53cRv2XvrcE0g+i
-        bgJ5pp8Xlnzk5tQNac9puf3ac6i357Ty3u15JHIDx5urf7Hd8TYAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJVSURBVFhHvZc9SyNRGIXzI/wB2sgqQhiyxo8o48dGSPA7
+        ghERP4ogKgguIgjqllukULvU1jaChZWFjYj/wcpqu0VBFLn6jPPKdTKTTJI7HjgDk7n3nDP33nfCG6sV
+        46s7VnZpq/jOCzuTu++ZWnyI/8q+JBIJJeyz7Vd+Sw1nnhkzkFu4Yc7BrWpyZWpHOr96mkymnvpHxhSc
+        2yupjZNbh9vn9w4PrpVDuefZyuGZM3YkX3DCoYGWK1sdQzPL7b22/YgpYmJSDwmFBmHQRNu1CQYDeRM/
+        wUZIELRdm2CwbH4CJoi2axMMBun7a4pohg7A/k+u/zEShO1EC83QAZjInkkFcIikCggl1I24lyqAYspc
+        7hlTUwCvsJSWhIKMFYoZxhBTb8gvAeLxePP7D3e6iBAx72QTRNu1/4CEaJnavowdKSXs2SxFEqIsAPiu
+        EOj4BgBBIbrWjxsOUVYFXCqxNVv4DADbJjZUsrtXzfwumqkC56IZhOHPQlF19w+o4dyiIyrUg4tZ1Sqo
+        JwA0cSYaCmDtfnyY/ITDsu4AJsxZuc8AldgxOGnUvKwK/EAZWpZ1+SM9e6Wbt8z/VZ3JLudwRfZfEGQu
+        by7Cxv8LQDVzfbIJfgkg5vpbCKMwh2i79sFgkHfpTBDN0AFYAfbRRJBQVaCDQUzkEDEJRloFXkgAr3Ak
+        VeAHbwCTDBVgcGL6H2/rJ9AIWcVQjYnJ1gyyDWwNmqn0aMa1qQy+EeNr+6Wh6fx/fW8JpB9E3QTyTD8v
+        LHnNzakX0p7Tcge151Bvz2nl/dvzWOwNWXOrdFDdwM0AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbtnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -277,12 +277,6 @@
   <metadata name="DataType2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Key.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DataType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="skinTabControl1.PageArrowDown" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABUAAAAiCAYAAACwaJKDAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -342,4 +336,10 @@
         b1AAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="Key.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

halftoneproject-master/Models/Product.cs

@@ -219,6 +219,16 @@ namespace Models
         #region 打印
         [SugarColumn(IsNullable = true)]
         /// <summary>
+        /// 开启检测单打印
+        /// </summary>
+        public bool EnableOrderPrint { get; set; }
+        [SugarColumn(IsNullable = true)]
+        /// <summary>
+        /// 打印模板路径
+        /// </summary>
+        public string OrderTempPath { get; set; }
+        [SugarColumn(IsNullable = true)]
+        /// <summary>
         /// 开启标签打印
         /// </summary>
         public bool EnableLabelPrint { get; set; }
@@ -243,7 +253,7 @@ namespace Models
         //打印信息
         [Navigate(NavigateType.OneToMany, nameof(PrintInfo.Pid))]
         public List<PrintInfo> PrintInfoList { get; set; }
-        
+
         #endregion
     }
     /// <summary>
@@ -357,9 +367,9 @@ namespace Models
         /// </summary>
         public bool IsValue { get; set; }
         /// <summary>
-        /// 是否为标签
+        /// 打印类型0：excel，1：标签，2：工单
         /// </summary>
-        public bool IsLabel { get; set; }
+        public int Type { get; set; }
         /// <summary>
         /// 打印位置
         /// </summary>

halftoneproject-master/Service/OrderService.cs

@@ -141,6 +141,18 @@ namespace Service
                 .Includes(m => m.DefectInfoList)
                 .First(m => m.SN == sn);
         }
+        /// <summary>
+        /// 根据检测工单号获取当前工单的检测数据
+        /// </summary>
+        /// <param name="defectCode"></param>
+        /// <returns></returns>
+        public List<Order> GetListNav(string defectCode)
+        {
+            return base.AsSugarClient().Queryable<Order>()
+                .Includes(m => m.ProductInfo, x => x.AssistStepInfo, info => info.ProcessList.OrderBy(x => x.Order).ToList()) //多级 
+                .Includes(m => m.DefectInfoList)
+                .Where(it => it.DetectOrder.Equals(defectCode)).ToList();
+        }
         //获取产品
         public List<Product> GetProductList()
         {