diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/1800a028-d4fa-4044-8190-770a16adeaf5.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/1800a028-d4fa-4044-8190-770a16adeaf5.vsidx
deleted file mode 100644
index dec3654..0000000
Binary files a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/1800a028-d4fa-4044-8190-770a16adeaf5.vsidx and /dev/null differ
diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/3628dad1-91da-4ffa-ab42-4c78501154f1.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/3628dad1-91da-4ffa-ab42-4c78501154f1.vsidx
new file mode 100644
index 0000000..a79e5ed
Binary files /dev/null and b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/3628dad1-91da-4ffa-ab42-4c78501154f1.vsidx differ
diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/6de7415d-dd60-4c7e-be03-245b036fd094.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/6de7415d-dd60-4c7e-be03-245b036fd094.vsidx
new file mode 100644
index 0000000..b1d974e
Binary files /dev/null and b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/6de7415d-dd60-4c7e-be03-245b036fd094.vsidx differ
diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/b5959595-d95a-4467-a656-bfa6510a2c53.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/b5959595-d95a-4467-a656-bfa6510a2c53.vsidx
new file mode 100644
index 0000000..1deecce
Binary files /dev/null and b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/b5959595-d95a-4467-a656-bfa6510a2c53.vsidx differ
diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/c27728df-7e57-47b0-954d-3fbf219980c8.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/c27728df-7e57-47b0-954d-3fbf219980c8.vsidx
new file mode 100644
index 0000000..995a44a
Binary files /dev/null and b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/c27728df-7e57-47b0-954d-3fbf219980c8.vsidx differ
diff --git a/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/d6e43b86-4c41-4071-9bed-f109df407bb5.vsidx b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/d6e43b86-4c41-4071-9bed-f109df407bb5.vsidx
new file mode 100644
index 0000000..7159299
Binary files /dev/null and b/MaiMuAOI/.vs/MaiMuAOI/FileContentIndex/d6e43b86-4c41-4071-9bed-f109df407bb5.vsidx differ
diff --git a/MaiMuAOI/MaiMuAOI/ImageProcessing/DefectLib.cs b/MaiMuAOI/MaiMuAOI/ImageProcessing/DefectLib.cs
index 1ccb5ea..baaa826 100644
--- a/MaiMuAOI/MaiMuAOI/ImageProcessing/DefectLib.cs
+++ b/MaiMuAOI/MaiMuAOI/ImageProcessing/DefectLib.cs
@@ -37,6 +37,8 @@ namespace MaiMuAOI.ImageProcessing
         private List<DefectTask> taskList = new List<DefectTask>(); 
         private List<DefectTask> taskOperationList = new List<DefectTask>();
         private List<DefectTask> taskTagList = new List<DefectTask>();
+
+        private string t_ClaseeName = "";
         public DefectLib()
         {
         } 
@@ -68,7 +70,8 @@ namespace MaiMuAOI.ImageProcessing
                 t_task_operation2 = new System.Threading.Thread(run2);
                 t_task_operation2.IsBackground = true;
                 t_task_operation2.Start();
-               
+
+                t_ClaseeName = "";
                 return true;
             }
             catch (Exception ex)
@@ -125,7 +128,7 @@ namespace MaiMuAOI.ImageProcessing
             catch { }
         }
         private string _preLoadONNXFilePath;//记录上次成功加载的模型，不重复加载
-        public void loadModelFile(string onnxFilePath)
+        public void loadModelFile(string onnxFilePath, string ClassName = "")
         {
             //string modelFilePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\DevCfg\\best.onnx";
             //不重复加载
@@ -148,6 +151,8 @@ namespace MaiMuAOI.ImageProcessing
             }
             _onnxSession = yolo1.LoadModel(onnxFilePath, true);//false-CPU true-显卡
             _preLoadONNXFilePath = onnxFilePath;
+
+            t_ClaseeName = ClassName;
         }
         /// <summary>
         /// 保存图片
@@ -261,7 +266,11 @@ namespace MaiMuAOI.ImageProcessing
                         stopwatch.Start();
                         IDisposableReadOnlyCollection<DisposableNamedOnnxValue>[] results = yolo1.RunModlel(_onnxSession, task.tensors);
                         liStep = 1; 
-                        task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        if(t_ClaseeName == "钢网")
+                            task.informationList = yolo1.ScreeningResults_YD_GW(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        else
+                            task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        
                         liStep = 2;
                          
                         //当前大图上缺陷个数
diff --git a/MaiMuAOI/MaiMuAOI/MaiMuAOI.csproj b/MaiMuAOI/MaiMuAOI/MaiMuAOI.csproj
index 393a8c8..34b6349 100644
--- a/MaiMuAOI/MaiMuAOI/MaiMuAOI.csproj
+++ b/MaiMuAOI/MaiMuAOI/MaiMuAOI.csproj
@@ -118,7 +118,7 @@
     </Reference>
     <Reference Include="Service, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Service\bin\Release\Service.dll</HintPath>
+      <HintPath>..\Service\bin\Debug\Service.dll</HintPath>
     </Reference>
     <Reference Include="SixLabors.ImageSharp">
       <HintPath>Dlls\SixLabors.ImageSharp.dll</HintPath>
@@ -175,24 +175,48 @@
     <Compile Include="SysCtrl\ConfMgr.cs" />
     <Compile Include="SysCtrl\SysEnum.cs" />
     <Compile Include="SysCtrl\SysMgr.cs" />
+    <Compile Include="SysUI\DefectPicShow\AmendantRecordFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\AmendantRecordFrm.Designer.cs">
+      <DependentUpon>AmendantRecordFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\CamImageFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\CamImageFrm.Designer.cs">
       <DependentUpon>CamImageFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\DataQueryFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\DataQueryFrm.Designer.cs">
+      <DependentUpon>DataQueryFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\DebugTestFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\DebugTestFrm.Designer.cs">
       <DependentUpon>DebugTestFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\HistoryViewFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\HistoryViewFrm.Designer.cs">
+      <DependentUpon>HistoryViewFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\ImageShowFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\ImageShowFrm.Designer.cs">
       <DependentUpon>ImageShowFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\PageCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\PageCtrl.Designer.cs">
+      <DependentUpon>PageCtrl.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\Load\InitFrm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -387,15 +411,27 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="SysUI\DefectPicShow\AmendantRecordFrm.resx">
+      <DependentUpon>AmendantRecordFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\CamImageFrm.resx">
       <DependentUpon>CamImageFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\DataQueryFrm.resx">
+      <DependentUpon>DataQueryFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\DebugTestFrm.resx">
       <DependentUpon>DebugTestFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\HistoryViewFrm.resx">
+      <DependentUpon>HistoryViewFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\ImageShowFrm.resx">
       <DependentUpon>ImageShowFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\PageCtrl.resx">
+      <DependentUpon>PageCtrl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\Load\InitFrm.resx">
       <DependentUpon>InitFrm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/MaiMuAOI/MaiMuAOI/MainFrm.Designer.cs b/MaiMuAOI/MaiMuAOI/MainFrm.Designer.cs
index 545799b..0bac264 100644
--- a/MaiMuAOI/MaiMuAOI/MainFrm.Designer.cs
+++ b/MaiMuAOI/MaiMuAOI/MainFrm.Designer.cs
@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = 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 dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            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();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.tsmSysmgr = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmStepMgr = new System.Windows.Forms.ToolStripMenuItem();
@@ -97,10 +97,11 @@
             this.tsslLoginInfo = new System.Windows.Forms.ToolStripStatusLabel();
             this.tslabelTime = new System.Windows.Forms.ToolStripStatusLabel();
             this.lblTimeLen = new System.Windows.Forms.Label();
-            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
             this.chkDoorSensor = new System.Windows.Forms.CheckBox();
             this.chkBuzzer = new System.Windows.Forms.CheckBox();
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.defectString = new System.Windows.Forms.Label();
             this.menuStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -508,27 +509,27 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvProcess.BackgroundColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            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.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCode,
             this.colProcessName,
             this.colValue});
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle14;
+            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.SystemColors.Control;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4;
             this.dgvProcess.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
             this.dgvProcess.Location = new System.Drawing.Point(2, 16);
             this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
@@ -537,8 +538,8 @@
             this.dgvProcess.ReadOnly = true;
             this.dgvProcess.RowHeadersVisible = false;
             this.dgvProcess.RowHeadersWidth = 62;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvProcess.RowTemplate.Height = 30;
             this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvProcess.Size = new System.Drawing.Size(449, 51);
@@ -557,9 +558,9 @@
             // colProcessName
             // 
             this.colProcessName.DataPropertyName = "ProcessName";
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.colProcessName.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.colProcessName.DefaultCellStyle = dataGridViewCellStyle2;
             this.colProcessName.HeaderText = "工序名称";
             this.colProcessName.MinimumWidth = 8;
             this.colProcessName.Name = "colProcessName";
@@ -570,8 +571,8 @@
             // colValue
             // 
             this.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.colValue.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            this.colValue.DefaultCellStyle = dataGridViewCellStyle3;
             this.colValue.HeaderText = "内容";
             this.colValue.MinimumWidth = 8;
             this.colValue.Name = "colValue";
@@ -608,6 +609,7 @@
             // 
             // splitContainer3.Panel2
             // 
+            this.splitContainer3.Panel2.Controls.Add(this.defectString);
             this.splitContainer3.Panel2.Controls.Add(this.label5);
             this.splitContainer3.Panel2.Controls.Add(this.lblDefectResult);
             this.splitContainer3.Panel2.Controls.Add(this.label7);
@@ -892,16 +894,6 @@
             this.lblTimeLen.TabIndex = 23;
             this.lblTimeLen.Text = "检测时长: 0 秒";
             // 
-            // uiTitel1
-            // 
-            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
-            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.uiTitel1.FatherForm = null;
-            this.uiTitel1.Location = new System.Drawing.Point(0, 43);
-            this.uiTitel1.Name = "uiTitel1";
-            this.uiTitel1.Size = new System.Drawing.Size(1031, 46);
-            this.uiTitel1.TabIndex = 0;
-            // 
             // backgroundWorker1
             // 
             this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
@@ -934,6 +926,25 @@
             this.chkBuzzer.Text = "禁用蜂鸣器";
             this.chkBuzzer.UseVisualStyleBackColor = false;
             // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 43);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1031, 46);
+            this.uiTitel1.TabIndex = 0;
+            // 
+            // defectString
+            // 
+            this.defectString.AutoSize = true;
+            this.defectString.Location = new System.Drawing.Point(29, 59);
+            this.defectString.Name = "defectString";
+            this.defectString.Size = new System.Drawing.Size(53, 12);
+            this.defectString.TabIndex = 12;
+            this.defectString.Text = "缺陷详情";
+            // 
             // MainFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1062,6 +1073,7 @@
         private System.ComponentModel.BackgroundWorker backgroundWorker1;
         private System.Windows.Forms.CheckBox chkDoorSensor;
         private System.Windows.Forms.CheckBox chkBuzzer;
+        private System.Windows.Forms.Label defectString;
     }
 }
 
diff --git a/MaiMuAOI/MaiMuAOI/MainFrm.cs b/MaiMuAOI/MaiMuAOI/MainFrm.cs
index d1842db..40445a7 100644
--- a/MaiMuAOI/MaiMuAOI/MainFrm.cs
+++ b/MaiMuAOI/MaiMuAOI/MainFrm.cs
@@ -73,6 +73,7 @@ namespace MaiMuAOI
             this.chkBuzzer.Top = toolStrip1.Top + 20;
             this.chkDoorSensor.Top = toolStrip1.Top + 20;
 
+            this.defectString.Text = "";
         }
 
         #region 私有方法
@@ -131,6 +132,7 @@ namespace MaiMuAOI
 
             this.lblCompareResult.Text = this.lblDefectResult.Text = "无";
 
+            this.defectString.Text = "";
             //
             this.lblCompareResult.ForeColor = this.lblDefectResult.ForeColor = Color.White;
 
@@ -143,6 +145,9 @@ namespace MaiMuAOI
 
             this.tsbtnStop.Enabled = false;
 
+            this.cbProductCode.Enabled = true;
+            this.cbProductSN.Enabled = true;
+
             this.splitContainer3.SplitterDistance = this.splitContainer3.Width / 2 - 30;
 
             lblTimeLen.Text = "检测时长: 0 秒";
@@ -185,7 +190,11 @@ namespace MaiMuAOI
                 if (InitSystem())
                 {
                     this.Cursor = Cursors.WaitCursor;
-                    this.WindowState = FormWindowState.Maximized;
+                    //this.WindowState = FormWindowState.Maximized;
+                    this.Top = 0;
+                    this.Left = 0;
+                    this.Width = SystemInformation.WorkingArea.Width;
+                    this.Height = SystemInformation.WorkingArea.Height;
                     this.splitContainer1.SplitterDistance = this.Width / 3;
                     
                     this.dgvProcess.AutoGenerateColumns = false;
@@ -314,11 +323,15 @@ namespace MaiMuAOI
         }
         private void tsmSysDataFind_Click(object sender, EventArgs e)
         {
-            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B",
-            //    "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort.ToString() + "/static/index.html#/");
-            WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B", "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort + "/static/index.html#/");
+            DataQueryFrm frm = new DataQueryFrm();
             frm.WindowState = FormWindowState.Maximized;
             frm.Show();
+
+            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B",
+            //    "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort.ToString() + "/static/index.html#/");
+            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B", "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort + "/static/index.html#/");
+            //frm.WindowState = FormWindowState.Maximized;
+            //frm.Show();
         }
         private void 系统管理ToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -470,6 +483,8 @@ namespace MaiMuAOI
                     {
                         lblDefectResult.Text = "未通过";
 
+                        defectString.Text = e.ResultStr;
+
                         this.lblDefectResult.Text = (e.CompareResult ? "通过" : "未通过");
                         if (!e.CompareResult)
                         {
@@ -497,6 +512,9 @@ namespace MaiMuAOI
                     {
                         this.tsbtnStart.Enabled = true;
                         this.tsbtnStop.Enabled = false;
+
+                        this.cbProductCode.Enabled = true;
+                        this.cbProductSN.Enabled = true;
                     }
                 }
                 catch { }
@@ -659,6 +677,9 @@ namespace MaiMuAOI
                     {
                         this.tsbtnStop.Enabled = true;
                         this.tsbtnStart.Enabled = false;
+                        //锁定信息
+                        this.cbProductCode.Enabled = false;
+                        this.cbProductSN.Enabled = false;
                         //记录开始运行时间
                         RunStartTime.Restart();
                     }
diff --git a/MaiMuAOI/MaiMuAOI/Properties/AssemblyInfo.cs b/MaiMuAOI/MaiMuAOI/Properties/AssemblyInfo.cs
index 7e7502e..c288eab 100644
--- a/MaiMuAOI/MaiMuAOI/Properties/AssemblyInfo.cs
+++ b/MaiMuAOI/MaiMuAOI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/MaiMuAOI/MaiMuAOI/SysCtrl/SysEnum.cs b/MaiMuAOI/MaiMuAOI/SysCtrl/SysEnum.cs
index a9ae668..abde28c 100644
--- a/MaiMuAOI/MaiMuAOI/SysCtrl/SysEnum.cs
+++ b/MaiMuAOI/MaiMuAOI/SysCtrl/SysEnum.cs
@@ -125,6 +125,22 @@ namespace MaiMuAOI.SysCtrl
         栅线,
         断栅
     }
+
+    public enum DefectCode2Enum
+    {
+        [Description("钢丝")]
+        gs,
+        [Description("脏污")]
+        zw,
+        [Description("正常")]
+        zc,
+    }
+    public enum DefectName2Enum
+    {
+        钢丝,
+        脏污,
+        正常,
+    }
     public enum ValType
     {
         字符串,
diff --git a/MaiMuAOI/MaiMuAOI/SysCtrl/SysMgr.cs b/MaiMuAOI/MaiMuAOI/SysCtrl/SysMgr.cs
index a8e4b7f..239feb8 100644
--- a/MaiMuAOI/MaiMuAOI/SysCtrl/SysMgr.cs
+++ b/MaiMuAOI/MaiMuAOI/SysCtrl/SysMgr.cs
@@ -73,7 +73,7 @@ namespace MaiMuAOI.SysCtrl
         }
         #endregion
         //系统信息
-        public string Info = "软件名称：AOI\r\n软件版本：V1.0.0\r\n公司：迈沐智能科技有限公司\r\n地址：";
+        public string Info = "软件名称：AOI\r\n软件版本：V1.0.1\r\n公司：迈沐智能科技有限公司\r\n地址：";
 
         public CameraEnumType SysUseCam = CameraEnumType.MVSCamera_CC;
         public LightDevNameEnum SysUseLight = LightDevNameEnum.CST;
@@ -108,12 +108,17 @@ namespace MaiMuAOI.SysCtrl
         private List<string> productCodeList = new List<string>();
         public List<string> ProductCodeList { get { return productCodeList; } }
 
+        //产品ID列表
+        private List<int> productIdList = new List<int>();
+        public List<int> ProductIdList { get { return productIdList; } }
+
         //近期SN列表
         private List<string> productSNList = new List<string>();
         public List<string> ProductSNList { get { return productSNList; } }
 
         Service.ProductService PdtService;
         Service.OrderService OrderService;
+        Service.ClassesService ClassesService;
 
         //可用步骤
         public static Dictionary<string, string> dicDevType = new Dictionary<string, string>();
@@ -210,6 +215,7 @@ namespace MaiMuAOI.SysCtrl
             Service.InitDB.ConnectionString = confMgr.DBConStr;
             PdtService = new Service.ProductService();
             OrderService = new OrderService();
+            ClassesService = new ClassesService();
             webService = new WebService();
 
             scannerGBmpQueue = new Queue<scannerGBmpLoc>();
@@ -951,14 +957,16 @@ namespace MaiMuAOI.SysCtrl
         {
             try
             {
-                productCodeList = PdtService.GetList().Select(m => m.Code).OrderBy(m => m).ToList();
+                //productCodeList = PdtService.GetList().Select(m => m.Code).OrderBy(m => m).ToList();
+                productCodeList = PdtService.GetList().Select(m => m.Code).ToList();
+                productIdList = PdtService.GetList().Select(m => m.Id).ToList();
 
-                string[] array = ReadSNText();
-                if (array != null && array.Length > 0)
-                {    
-                    for (int i = 0; i < array.Length; i++)
-                        productSNList.Add(array[i]);
-                }
+                //string[] array = ReadSNText();
+                //if (array != null && array.Length > 0)
+                //{    
+                //    for (int i = 0; i < array.Length; i++)
+                //        productSNList.Add(array[i]);
+                //}
             }
             catch (Exception ex)
             {
@@ -1374,7 +1382,10 @@ namespace MaiMuAOI.SysCtrl
                         onnxFile = $"{ConfMgr.Instance.SysConfigParams.AIModelPath}\\{model.DefectModelFile}";
                     else
                         onnxFile = $"{ConfMgr.Instance.SysConfigParams.AIModelPath}\\default.onnx";
-                    defectLib.loadModelFile(onnxFile);
+
+                   Classes classTemp = this.ClassesService.GetById(model.ClassesId);
+                   
+                    defectLib.loadModelFile(onnxFile, classTemp.Name);
 
                     //输入SN
                     errStep = 2;
@@ -1398,7 +1409,7 @@ namespace MaiMuAOI.SysCtrl
                     Log("运行", $"料号：{code}，网版编码：{sn}");
 
                     //记忆
-                    Remind(sn);
+                    //Remind(sn);
                     //查询SN是否重复
                     var findSN = OrderService.GetModelNav(sn);
                     if (findSN != null)
@@ -1813,7 +1824,13 @@ namespace MaiMuAOI.SysCtrl
             //    if (!dic.ContainsKey(code))
             //        dic.Add(code, 0);
             //}
-            var lstDefect = ConfMgr.GetArrayList<DefectCodeEnum>();
+            Classes classtemp = ClassesService.GetById(m.ClassesId);
+
+            ArrayList lstDefect;
+            if ((classtemp != null) && (classtemp.Name == "钢网"))
+                lstDefect = ConfMgr.GetArrayList<DefectCode2Enum>();
+            else
+                lstDefect = ConfMgr.GetArrayList<DefectCodeEnum>();
             foreach (DictionaryEntry item in lstDefect)
             {
                 string code = item.Value.ToString();
@@ -1838,6 +1855,9 @@ namespace MaiMuAOI.SysCtrl
                     case "zw":
                         order.ZWCount++;
                         break;
+                    case "gs":
+                        order.GSYCCount++;
+                        break;
                     case "gsyc":
                         order.GSYCCount++;
                         break;
@@ -2371,6 +2391,10 @@ namespace MaiMuAOI.SysCtrl
                                             }
                                             else
                                             {
+                                                //不合格
+                                                order.Qualified = false;
+                                                order.CompareResult = 2;
+                                                                                               
                                                 SizeNGCnt++;
                                                 OnAutoRuning(new RunEventArgs(3, false, SizeNGCnt));
                                                 OnAutoRuning(new RunEventArgs(liStatocStepIndex, $"index:{res.index}，图像比对失败！"));
@@ -2793,39 +2817,124 @@ namespace MaiMuAOI.SysCtrl
 
                     //判断是否合格 
                     DefectCodeEnum defectCode;
+                    DefectCode2Enum defectCode2;
                     string defectNames = "";
-                    if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                    //if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                    //{
+                    //    int itemDefectCount;
+                    //    foreach (var item in model.QualifiedCriterionList)
+                    //    {
+                    //        Classes classtemp = ClassesService.GetById(model.ClassesId);
+                    //        if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    //        {
+                    //            defectCode2 = EnumExtension.Convert2Enum<DefectCode2Enum>(item.DefectCode);
+                    //            itemDefectCount = getDefectCountFromCode(order, defectCode2);
+                    //            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                    //            {
+                    //                order.Qualified = false;
+                    //                defectNames += $"{EnumExtension.GetEnumDescription(defectCode2)}({itemDefectCount}),";
+                    //            }
+                    //        }
+                    //        else
+                    //        {
+                    //            defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                    //            itemDefectCount = getDefectCountFromCode(order, defectCode);
+                    //            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                    //            {
+                    //                order.Qualified = false;
+                    //                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                    //            }
+                    //        }   
+                            
+                    //    }
+                    //}
+                    //else
                     {
+                        Log("结果", "结果判断");
                         int itemDefectCount;
-                        foreach (var item in model.QualifiedCriterionList)
+                        bool isGetQua = false;
+                        Classes classtemp = ClassesService.GetById(model.ClassesId);
+                        if ((classtemp != null) && (classtemp.Name == "钢网"))
                         {
-                            defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
-                            itemDefectCount = getDefectCountFromCode(order, defectCode);
-                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                            Log("结果", $"类别判断:{classtemp.Name}");
+                            for (int enumcnt = 0; enumcnt < 3; enumcnt++)
                             {
-                                order.Qualified = false;
-                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                isGetQua = false;
+                                //判断是否是过滤项
+                                if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                                {
+                                    foreach (var item in model.QualifiedCriterionList)
+                                    {
+                                        defectCode2 = EnumExtension.Convert2Enum<DefectCode2Enum>(item.DefectCode);
+                                        //是过滤
+                                        if (defectCode2 == (DefectCode2Enum)enumcnt)
+                                        {
+                                            isGetQua = true;
+                                            itemDefectCount = getDefectCountFromCode(order, defectCode2);
+                                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                            {
+                                                order.Qualified = false;
+                                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode2)}({itemDefectCount}),";
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!isGetQua)
+                                {
+                                    itemDefectCount = getDefectCountFromCode(order, (DefectCode2Enum)enumcnt);
+                                    if (itemDefectCount > 0)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription((DefectCode2Enum)enumcnt)}({itemDefectCount}),";
+                                    }
+                                }
                             }
                         }
-                    }
-                    else
-                    {
-                        Log("结果", "默认判断");
-                        int itemDefectCount;
-                        for(int enumcnt = 0; enumcnt < 12; enumcnt++)
+                        else
                         {
-                            itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
-                            if ( itemDefectCount >0)
+                            if (classtemp != null)
+                                Log("结果", $"类别判断:{classtemp.Name}");
+                            else
+                                Log("结果", $"类别默认");
+                            for (int enumcnt = 0; enumcnt < 12; enumcnt++)
                             {
-                                order.Qualified = false;
-                                defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                isGetQua = false;
+                                //判断是否是过滤项
+                                if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                                {
+                                    foreach (var item in model.QualifiedCriterionList)
+                                    {
+                                        defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                                        //是过滤
+                                        if (defectCode == (DefectCodeEnum)enumcnt)
+                                        {
+                                            isGetQua = true;
+                                            itemDefectCount = getDefectCountFromCode(order, defectCode);
+                                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                            {
+                                                order.Qualified = false;
+                                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!isGetQua)
+                                {
+                                    itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
+                                    if (itemDefectCount > 0)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                    }
+                                }
                             }
+
                         }
                     }
 
                     stopWatch.Stop();
                     long timeLen = stopWatch.ElapsedMilliseconds / 1000;
-                    OnAutoRuning(new RunEventArgs(4, defectNames == "",0));
+                    OnAutoRuning(new RunEventArgs(4, defectNames == "",0, defectNames));
                     OnAutoRuning(new RunEventArgs(timeLen));
                     //界面显示
 
@@ -2916,6 +3025,19 @@ namespace MaiMuAOI.SysCtrl
                     return 0;
             }
         }
+
+        private int getDefectCountFromCode(Order order, DefectCode2Enum defectCodeEnum)
+        {
+            switch (defectCodeEnum)
+            {
+                case DefectCode2Enum.gs:
+                    return order.GSYCCount;
+                case DefectCode2Enum.zw:
+                    return order.ZWCount;
+                default:
+                    return 0;
+            }
+        }
         #endregion
 
         #region 日志图片删除
@@ -2925,7 +3047,7 @@ namespace MaiMuAOI.SysCtrl
             //删除文件
             Task.Factory.StartNew(() =>
             {
-
+                //图片
                 if (confMgr.SysConfigParams.DefectBigImag.AutoDelete)
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.DefectBigImag.SavePath, confMgr.SysConfigParams.DefectBigImag.AutoDeleteDays, true);
                 if (confMgr.SysConfigParams.DefectSmallImag.AutoDelete)
@@ -2938,7 +3060,9 @@ namespace MaiMuAOI.SysCtrl
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.SizeNGImag.SavePath, confMgr.SysConfigParams.SizeNGImag.AutoDeleteDays, true);
                 if (confMgr.SysConfigParams.SizeRepairImag.AutoDelete)
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.SizeRepairImag.SavePath, confMgr.SysConfigParams.SizeRepairImag.AutoDeleteDays, true);
-  
+                //日志
+                if (confMgr.SysConfigParams.AutoDeleteLog)
+                    statusMgr.DeleteFiles(confMgr.SysConfigParams.LogPath, confMgr.SysConfigParams.AutoDeleteLogData, true);
             });
         }
         #endregion
@@ -3138,6 +3262,9 @@ namespace MaiMuAOI.SysCtrl
         private bool _compareResult;
         public bool CompareResult {  get { return _compareResult; } }
 
+        private string _resultStr;
+        public string ResultStr { get { return _resultStr; } }
+
         private long _time;
         public long Time { get { return _time; } }
         private long _cnt;
@@ -3159,11 +3286,12 @@ namespace MaiMuAOI.SysCtrl
             this._stepIndex = stepIndex;
             _mesg = mesg;
         }
-        public RunEventArgs(int cmd, bool rel, int cnt)
+        public RunEventArgs(int cmd, bool rel, int cnt, string str = "")
         {
             this._cmd = cmd;
             this._compareResult = rel;
             this._cnt = cnt;
+            this._resultStr = str;
         }
         public RunEventArgs(long time )
         {
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.Designer.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.Designer.cs
new file mode 100644
index 0000000..b8b6262
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.Designer.cs
@@ -0,0 +1,513 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class AmendantRecordFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.skinButton3 = new CCWin.SkinControl.SkinButton();
+            this.skinButton1 = new CCWin.SkinControl.SkinButton();
+            this.numericUpDown22 = new System.Windows.Forms.NumericUpDown();
+            this.label24 = new System.Windows.Forms.Label();
+            this.numericUpDown21 = new System.Windows.Forms.NumericUpDown();
+            this.label23 = new System.Windows.Forms.Label();
+            this.numericUpDown20 = new System.Windows.Forms.NumericUpDown();
+            this.label22 = new System.Windows.Forms.Label();
+            this.numericUpDown19 = new System.Windows.Forms.NumericUpDown();
+            this.label21 = new System.Windows.Forms.Label();
+            this.numericUpDown18 = new System.Windows.Forms.NumericUpDown();
+            this.label20 = new System.Windows.Forms.Label();
+            this.numericUpDown17 = new System.Windows.Forms.NumericUpDown();
+            this.label19 = new System.Windows.Forms.Label();
+            this.numericUpDown16 = new System.Windows.Forms.NumericUpDown();
+            this.label18 = new System.Windows.Forms.Label();
+            this.numericUpDown15 = new System.Windows.Forms.NumericUpDown();
+            this.label17 = new System.Windows.Forms.Label();
+            this.numericUpDown14 = new System.Windows.Forms.NumericUpDown();
+            this.label16 = new System.Windows.Forms.Label();
+            this.numericUpDown13 = new System.Windows.Forms.NumericUpDown();
+            this.label15 = new System.Windows.Forms.Label();
+            this.numericUpDown12 = new System.Windows.Forms.NumericUpDown();
+            this.label14 = new System.Windows.Forms.Label();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(810, 46);
+            this.uiTitel1.TabIndex = 37;
+            // 
+            // skinButton3
+            // 
+            this.skinButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton3.BackColor = System.Drawing.Color.White;
+            this.skinButton3.BaseColor = System.Drawing.Color.Red;
+            this.skinButton3.BorderColor = System.Drawing.Color.Red;
+            this.skinButton3.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton3.DownBack = null;
+            this.skinButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.skinButton3.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton3.InnerBorderColor = System.Drawing.Color.Red;
+            this.skinButton3.Location = new System.Drawing.Point(736, 66);
+            this.skinButton3.MouseBack = null;
+            this.skinButton3.Name = "skinButton3";
+            this.skinButton3.NormlBack = null;
+            this.skinButton3.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton3.Size = new System.Drawing.Size(61, 27);
+            this.skinButton3.TabIndex = 153;
+            this.skinButton3.Text = "取消";
+            this.skinButton3.UseVisualStyleBackColor = false;
+            this.skinButton3.Click += new System.EventHandler(this.skinButton3_Click);
+            // 
+            // skinButton1
+            // 
+            this.skinButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton1.BackColor = System.Drawing.Color.White;
+            this.skinButton1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton1.DownBack = null;
+            this.skinButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.skinButton1.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton1.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.Location = new System.Drawing.Point(661, 66);
+            this.skinButton1.MouseBack = null;
+            this.skinButton1.Name = "skinButton1";
+            this.skinButton1.NormlBack = null;
+            this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton1.Size = new System.Drawing.Size(61, 27);
+            this.skinButton1.TabIndex = 152;
+            this.skinButton1.Text = "保存";
+            this.skinButton1.UseVisualStyleBackColor = false;
+            this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
+            // 
+            // numericUpDown22
+            // 
+            this.numericUpDown22.Location = new System.Drawing.Point(505, 261);
+            this.numericUpDown22.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown22.Name = "numericUpDown22";
+            this.numericUpDown22.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown22.TabIndex = 151;
+            this.numericUpDown22.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(404, 263);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(59, 12);
+            this.label24.TabIndex = 150;
+            this.label24.Text = "栅线数量:";
+            // 
+            // numericUpDown21
+            // 
+            this.numericUpDown21.Location = new System.Drawing.Point(287, 261);
+            this.numericUpDown21.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown21.Name = "numericUpDown21";
+            this.numericUpDown21.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown21.TabIndex = 149;
+            this.numericUpDown21.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Location = new System.Drawing.Point(204, 263);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(59, 12);
+            this.label23.TabIndex = 148;
+            this.label23.Text = "斜边数量:";
+            // 
+            // numericUpDown20
+            // 
+            this.numericUpDown20.Location = new System.Drawing.Point(98, 261);
+            this.numericUpDown20.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown20.Name = "numericUpDown20";
+            this.numericUpDown20.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown20.TabIndex = 147;
+            this.numericUpDown20.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(15, 263);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(59, 12);
+            this.label22.TabIndex = 146;
+            this.label22.Text = "压线数量:";
+            // 
+            // numericUpDown19
+            // 
+            this.numericUpDown19.Location = new System.Drawing.Point(698, 219);
+            this.numericUpDown19.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown19.Name = "numericUpDown19";
+            this.numericUpDown19.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown19.TabIndex = 145;
+            this.numericUpDown19.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Location = new System.Drawing.Point(609, 221);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(59, 12);
+            this.label21.TabIndex = 144;
+            this.label21.Text = "划伤数量:";
+            // 
+            // numericUpDown18
+            // 
+            this.numericUpDown18.Location = new System.Drawing.Point(505, 219);
+            this.numericUpDown18.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown18.Name = "numericUpDown18";
+            this.numericUpDown18.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown18.TabIndex = 143;
+            this.numericUpDown18.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.Location = new System.Drawing.Point(404, 221);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(59, 12);
+            this.label20.TabIndex = 142;
+            this.label20.Text = "泡泡数量:";
+            // 
+            // numericUpDown17
+            // 
+            this.numericUpDown17.Location = new System.Drawing.Point(287, 219);
+            this.numericUpDown17.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown17.Name = "numericUpDown17";
+            this.numericUpDown17.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown17.TabIndex = 141;
+            this.numericUpDown17.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Location = new System.Drawing.Point(204, 221);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(59, 12);
+            this.label19.TabIndex = 140;
+            this.label19.Text = "针孔数量:";
+            // 
+            // numericUpDown16
+            // 
+            this.numericUpDown16.Location = new System.Drawing.Point(98, 219);
+            this.numericUpDown16.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown16.Name = "numericUpDown16";
+            this.numericUpDown16.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown16.TabIndex = 139;
+            this.numericUpDown16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Location = new System.Drawing.Point(15, 221);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(59, 12);
+            this.label18.TabIndex = 138;
+            this.label18.Text = "缺口数量:";
+            // 
+            // numericUpDown15
+            // 
+            this.numericUpDown15.Location = new System.Drawing.Point(698, 177);
+            this.numericUpDown15.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown15.Name = "numericUpDown15";
+            this.numericUpDown15.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown15.TabIndex = 137;
+            this.numericUpDown15.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Location = new System.Drawing.Point(609, 179);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(71, 12);
+            this.label17.TabIndex = 136;
+            this.label17.Text = "纤维丝数量:";
+            // 
+            // numericUpDown14
+            // 
+            this.numericUpDown14.Location = new System.Drawing.Point(505, 177);
+            this.numericUpDown14.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown14.Name = "numericUpDown14";
+            this.numericUpDown14.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown14.TabIndex = 135;
+            this.numericUpDown14.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(404, 179);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(83, 12);
+            this.label16.TabIndex = 134;
+            this.label16.Text = "钢丝异常数量:";
+            // 
+            // numericUpDown13
+            // 
+            this.numericUpDown13.Location = new System.Drawing.Point(287, 175);
+            this.numericUpDown13.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown13.Name = "numericUpDown13";
+            this.numericUpDown13.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown13.TabIndex = 133;
+            this.numericUpDown13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Location = new System.Drawing.Point(204, 177);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(59, 12);
+            this.label15.TabIndex = 132;
+            this.label15.Text = "脏污数量:";
+            // 
+            // numericUpDown12
+            // 
+            this.numericUpDown12.Location = new System.Drawing.Point(98, 177);
+            this.numericUpDown12.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown12.Name = "numericUpDown12";
+            this.numericUpDown12.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown12.TabIndex = 131;
+            this.numericUpDown12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Location = new System.Drawing.Point(15, 179);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(59, 12);
+            this.label14.TabIndex = 130;
+            this.label14.Text = "堵孔数量:";
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Location = new System.Drawing.Point(258, 125);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(59, 16);
+            this.radioButton3.TabIndex = 107;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "未通过";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Location = new System.Drawing.Point(181, 125);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(47, 16);
+            this.radioButton2.TabIndex = 106;
+            this.radioButton2.TabStop = true;
+            this.radioButton2.Text = "通过";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(98, 125);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(59, 16);
+            this.radioButton1.TabIndex = 105;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "未比对";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(15, 127);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(59, 12);
+            this.label2.TabIndex = 104;
+            this.label2.Text = "比对结果:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(12, 63);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(96, 28);
+            this.label1.TabIndex = 103;
+            this.label1.Text = "修改记录";
+            // 
+            // AmendantRecordFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.ControlLightLight;
+            this.ClientSize = new System.Drawing.Size(810, 314);
+            this.Controls.Add(this.skinButton3);
+            this.Controls.Add(this.skinButton1);
+            this.Controls.Add(this.numericUpDown22);
+            this.Controls.Add(this.label24);
+            this.Controls.Add(this.numericUpDown21);
+            this.Controls.Add(this.label23);
+            this.Controls.Add(this.numericUpDown20);
+            this.Controls.Add(this.label22);
+            this.Controls.Add(this.numericUpDown19);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.numericUpDown18);
+            this.Controls.Add(this.label20);
+            this.Controls.Add(this.numericUpDown17);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.numericUpDown16);
+            this.Controls.Add(this.label18);
+            this.Controls.Add(this.numericUpDown15);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.numericUpDown14);
+            this.Controls.Add(this.label16);
+            this.Controls.Add(this.numericUpDown13);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.numericUpDown12);
+            this.Controls.Add(this.label14);
+            this.Controls.Add(this.radioButton3);
+            this.Controls.Add(this.radioButton2);
+            this.Controls.Add(this.radioButton1);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "AmendantRecordFrm";
+            this.Text = "修改记录";
+            this.Load += new System.EventHandler(this.AmendantRecordFrm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private CCWin.SkinControl.SkinButton skinButton3;
+        private CCWin.SkinControl.SkinButton skinButton1;
+        private System.Windows.Forms.NumericUpDown numericUpDown22;
+        private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.NumericUpDown numericUpDown21;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.NumericUpDown numericUpDown20;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.NumericUpDown numericUpDown19;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.NumericUpDown numericUpDown18;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.NumericUpDown numericUpDown17;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.NumericUpDown numericUpDown16;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.NumericUpDown numericUpDown15;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.NumericUpDown numericUpDown14;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.NumericUpDown numericUpDown13;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.NumericUpDown numericUpDown12;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+    }
+}
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.cs
new file mode 100644
index 0000000..c655657
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.cs
@@ -0,0 +1,150 @@
+using MaiMuAOI.SysCtrl;
+using Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class AmendantRecordFrm : Form
+    {
+        Service.OrderService OrderService = new Service.OrderService();
+        Order _order;
+        List<OrderHistory> _OrderHistoryList = new List<OrderHistory>();
+
+        public AmendantRecordFrm(Order order)
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+
+            _order = order;
+            _OrderHistoryList = _order.OrderHistoryList;
+            this.BackColor = Color.White;
+        }
+
+        private void AmendantRecordFrm_Load(object sender, EventArgs e)
+        {
+            if (_order.CompareResult == 2)
+                radioButton3.Checked = true;
+            else if (_order.CompareResult == 1)
+                radioButton2.Checked = true;
+            else
+                radioButton1.Checked = true;
+
+            numericUpDown12.Value = (decimal)_order.DKCount;
+            numericUpDown13.Value = (decimal)_order.ZWCount;
+            numericUpDown14.Value = (decimal)_order.GSYCCount;
+            numericUpDown15.Value = (decimal)_order.XWSCount;
+            numericUpDown16.Value = (decimal)_order.QKCount;
+            numericUpDown17.Value = (decimal)_order.ZKCount;
+            numericUpDown18.Value = (decimal)_order.PPCount;
+            numericUpDown19.Value = (decimal)_order.HSCount;
+            numericUpDown20.Value = (decimal)_order.YXCount;
+            numericUpDown21.Value = (decimal)_order.XBCount;
+            numericUpDown22.Value = (decimal)_order.SXCount;
+        }
+
+        #region 取消
+
+        private void skinButton3_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        #endregion
+
+        #region 保存
+
+        private bool IsModify()
+        {
+            bool ret = true;
+            if ((_order.CompareResult == 2) && (radioButton3.Checked))
+                ret = ret & true;
+            else if ((_order.CompareResult == 1) && (radioButton2.Checked))
+                ret = ret & true;
+            else if ((_order.CompareResult == 0) && (radioButton1.Checked))
+                ret = ret & true;
+            else
+                ret = ret & false;
+
+            ret = ret & (_order.DKCount == (int)numericUpDown12.Value);
+            ret = ret & (_order.ZWCount == (int)numericUpDown13.Value);
+            ret = ret & (_order.GSYCCount == (int)numericUpDown14.Value);
+            ret = ret & (_order.XWSCount == (int)numericUpDown15.Value);
+            ret = ret & (_order.QKCount == (int)numericUpDown16.Value);
+            ret = ret & (_order.ZKCount == (int)numericUpDown17.Value);
+            ret = ret & (_order.PPCount == (int)numericUpDown18.Value);
+            ret = ret & (_order.HSCount == (int)numericUpDown19.Value);
+            ret = ret & (_order.YXCount == (int)numericUpDown20.Value);
+            ret = ret & (_order.XBCount == (int)numericUpDown21.Value);
+            ret = ret & (_order.SXCount == (int)numericUpDown22.Value);
+
+            return !ret;
+        }
+
+        private void skinButton1_Click(object sender, EventArgs e)
+        {
+            if (IsModify())
+            {
+                if (_OrderHistoryList == null)
+                    _OrderHistoryList = new List<OrderHistory>();
+
+                _OrderHistoryList.Add(new OrderHistory()
+                {  
+                    CompareResult = _order.CompareResult,
+                    Qualified = _order.Qualified,
+
+                    DKCount = _order.DKCount,
+                    ZWCount = _order.ZWCount,
+                    GSYCCount = _order.GSYCCount,
+                    XWSCount = _order.XWSCount,
+                    QKCount = _order.QKCount,
+                    ZKCount = _order.ZKCount,
+                    PPCount = _order.PPCount,
+                    HSCount = _order.HSCount,
+                    XBCount = _order.XBCount,
+                    YXCount = _order.YXCount,
+                    SXCount = _order.SXCount,
+                    CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
+                    ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code
+                });
+
+                _order.HistoryCount++;
+                _order.CompareResult = radioButton3.Checked ? 2 : radioButton2.Checked ? 1 : 0;
+
+                _order.DKCount = (int)numericUpDown12.Value;
+                _order.ZWCount = (int)numericUpDown13.Value;
+                _order.GSYCCount = (int)numericUpDown14.Value;
+                _order.XWSCount = (int)numericUpDown15.Value;
+                _order.QKCount = (int)numericUpDown16.Value;
+                _order.ZKCount = (int)numericUpDown17.Value;
+                _order.PPCount = (int)numericUpDown18.Value;
+                _order.HSCount = (int)numericUpDown19.Value;
+                _order.YXCount = (int)numericUpDown20.Value;
+                _order.XBCount = (int)numericUpDown21.Value;
+                _order.SXCount = (int)numericUpDown22.Value;
+
+                _order.OrderHistoryList = _OrderHistoryList;
+                _order.ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code;
+
+                bool qua = true;
+                qua = qua & (_order.CompareResult == 1);
+                
+                _order.Qualified = qua;
+
+                bool result = OrderService.UpdateableListEx(_order);
+                if (result)
+                    MessageBox.Show("修改成功", "完成");
+                else
+                    MessageBox.Show("修改失败", "失败", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.resx b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.Designer.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.Designer.cs
new file mode 100644
index 0000000..1b3812e
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.Designer.cs
@@ -0,0 +1,427 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class DataQueryFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataQueryFrm));
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.MainPanel = new System.Windows.Forms.Panel();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBox3 = new System.Windows.Forms.ComboBox();
+            this.label4 = new System.Windows.Forms.Label();
+            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();
+            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
+            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.MainPanel.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClear)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1337, 46);
+            this.uiTitel1.TabIndex = 36;
+            // 
+            // MainPanel
+            // 
+            this.MainPanel.BackColor = System.Drawing.SystemColors.ControlLightLight;
+            this.MainPanel.Controls.Add(this.tableLayoutPanel1);
+            this.MainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.MainPanel.Location = new System.Drawing.Point(0, 46);
+            this.MainPanel.Name = "MainPanel";
+            this.MainPanel.Size = new System.Drawing.Size(1337, 547);
+            this.MainPanel.TabIndex = 37;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 1;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.pageCtrl1, 0, 2);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 3;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 55F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 44F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1337, 547);
+            this.tableLayoutPanel1.TabIndex = 1;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.comboBox1);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.comboBox3);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.btnClear);
+            this.panel1.Controls.Add(this.skinButton3);
+            this.panel1.Controls.Add(this.skinButton1);
+            this.panel1.Controls.Add(this.skinButton2);
+            this.panel1.Controls.Add(this.dateTimePicker2);
+            this.panel1.Controls.Add(this.label6);
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.dateTimePicker1);
+            this.panel1.Controls.Add(this.comboBox2);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.cbProductCode);
+            this.panel1.Controls.Add(this.label3);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1331, 49);
+            this.panel1.TabIndex = 0;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Items.AddRange(new object[] {
+            "",
+            "未比对",
+            "通过",
+            "未通过"});
+            this.comboBox1.Location = new System.Drawing.Point(379, 13);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(73, 28);
+            this.comboBox1.TabIndex = 105;
+            // 
+            // label1
+            // 
+            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.Black;
+            this.label1.Location = new System.Drawing.Point(323, 16);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(51, 20);
+            this.label1.TabIndex = 104;
+            this.label1.Text = "比对：";
+            // 
+            // comboBox3
+            // 
+            this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox3.FormattingEnabled = true;
+            this.comboBox3.Items.AddRange(new object[] {
+            "",
+            "未修复",
+            "修复",
+            "异常"});
+            this.comboBox3.Location = new System.Drawing.Point(647, 12);
+            this.comboBox3.Name = "comboBox3";
+            this.comboBox3.Size = new System.Drawing.Size(73, 28);
+            this.comboBox3.TabIndex = 103;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.ForeColor = System.Drawing.Color.Black;
+            this.label4.Location = new System.Drawing.Point(591, 16);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(51, 20);
+            this.label4.TabIndex = 102;
+            this.label4.Text = "修复：";
+            // 
+            // 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)));
+            this.skinButton3.BackColor = System.Drawing.Color.White;
+            this.skinButton3.BaseColor = System.Drawing.Color.Red;
+            this.skinButton3.BorderColor = System.Drawing.Color.Red;
+            this.skinButton3.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton3.DownBack = null;
+            this.skinButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton3.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton3.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton3.InnerBorderColor = System.Drawing.Color.Red;
+            this.skinButton3.Location = new System.Drawing.Point(1260, 11);
+            this.skinButton3.MouseBack = null;
+            this.skinButton3.Name = "skinButton3";
+            this.skinButton3.NormlBack = null;
+            this.skinButton3.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton3.Size = new System.Drawing.Size(61, 27);
+            this.skinButton3.TabIndex = 100;
+            this.skinButton3.Text = "删除";
+            this.skinButton3.UseVisualStyleBackColor = false;
+            this.skinButton3.Click += new System.EventHandler(this.skinButton3_Click);
+            // 
+            // skinButton1
+            // 
+            this.skinButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton1.BackColor = System.Drawing.Color.White;
+            this.skinButton1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton1.DownBack = null;
+            this.skinButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton1.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton1.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton1.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.Location = new System.Drawing.Point(1185, 11);
+            this.skinButton1.MouseBack = null;
+            this.skinButton1.Name = "skinButton1";
+            this.skinButton1.NormlBack = null;
+            this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton1.Size = new System.Drawing.Size(61, 27);
+            this.skinButton1.TabIndex = 99;
+            this.skinButton1.Text = "导出";
+            this.skinButton1.UseVisualStyleBackColor = false;
+            this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
+            // 
+            // skinButton2
+            // 
+            this.skinButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton2.BackColor = System.Drawing.Color.Transparent;
+            this.skinButton2.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton2.DownBack = null;
+            this.skinButton2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton2.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton2.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.Location = new System.Drawing.Point(1110, 11);
+            this.skinButton2.MouseBack = null;
+            this.skinButton2.Name = "skinButton2";
+            this.skinButton2.NormlBack = null;
+            this.skinButton2.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton2.Size = new System.Drawing.Size(61, 27);
+            this.skinButton2.TabIndex = 98;
+            this.skinButton2.Text = "查询";
+            this.skinButton2.UseVisualStyleBackColor = false;
+            this.skinButton2.Click += new System.EventHandler(this.skinButton2_Click);
+            // 
+            // dateTimePicker2
+            // 
+            this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.dateTimePicker2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dateTimePicker2.Location = new System.Drawing.Point(963, 12);
+            this.dateTimePicker2.Name = "dateTimePicker2";
+            this.dateTimePicker2.Size = new System.Drawing.Size(130, 26);
+            this.dateTimePicker2.TabIndex = 20;
+            // 
+            // label6
+            // 
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.ForeColor = System.Drawing.Color.Black;
+            this.label6.Location = new System.Drawing.Point(935, 16);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(23, 20);
+            this.label6.TabIndex = 21;
+            this.label6.Text = "至";
+            // 
+            // label5
+            // 
+            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ForeColor = System.Drawing.Color.Black;
+            this.label5.Location = new System.Drawing.Point(744, 16);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(51, 20);
+            this.label5.TabIndex = 20;
+            this.label5.Text = "日期：";
+            // 
+            // dateTimePicker1
+            // 
+            this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.dateTimePicker1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dateTimePicker1.Location = new System.Drawing.Point(800, 12);
+            this.dateTimePicker1.Name = "dateTimePicker1";
+            this.dateTimePicker1.Size = new System.Drawing.Size(130, 26);
+            this.dateTimePicker1.TabIndex = 19;
+            // 
+            // comboBox2
+            // 
+            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox2.FormattingEnabled = true;
+            this.comboBox2.Items.AddRange(new object[] {
+            "",
+            "合格",
+            "不合格"});
+            this.comboBox2.Location = new System.Drawing.Point(513, 13);
+            this.comboBox2.Name = "comboBox2";
+            this.comboBox2.Size = new System.Drawing.Size(73, 28);
+            this.comboBox2.TabIndex = 16;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(457, 16);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(51, 20);
+            this.label2.TabIndex = 15;
+            this.label2.Text = "合格：";
+            // 
+            // cbProductCode
+            // 
+            this.cbProductCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbProductCode.FormattingEnabled = true;
+            this.cbProductCode.Items.AddRange(new object[] {
+            "1",
+            "2",
+            "3",
+            "4",
+            "5"});
+            this.cbProductCode.Location = new System.Drawing.Point(58, 13);
+            this.cbProductCode.Name = "cbProductCode";
+            this.cbProductCode.Size = new System.Drawing.Size(190, 28);
+            this.cbProductCode.TabIndex = 12;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.ForeColor = System.Drawing.Color.Black;
+            this.label3.Location = new System.Drawing.Point(2, 16);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(51, 20);
+            this.label3.TabIndex = 11;
+            this.label3.Text = "料号：";
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(3, 58);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(1331, 442);
+            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, 506);
+            this.pageCtrl1.Name = "pageCtrl1";
+            this.pageCtrl1.PageIndex = 1;
+            this.pageCtrl1.PageSize = 30;
+            this.pageCtrl1.RecordCount = 0;
+            this.pageCtrl1.Size = new System.Drawing.Size(1331, 38);
+            this.pageCtrl1.TabIndex = 2;
+            // 
+            // DataQueryFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1337, 593);
+            this.Controls.Add(this.MainPanel);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "DataQueryFrm";
+            this.Text = "数据查询";
+            this.Load += new System.EventHandler(this.DataQueryFrm_Load);
+            this.SizeChanged += new System.EventHandler(this.DataQueryFrm_SizeChanged);
+            this.MainPanel.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClear)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private System.Windows.Forms.Panel MainPanel;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.PictureBox btnClear;
+        private CCWin.SkinControl.SkinButton skinButton3;
+        private CCWin.SkinControl.SkinButton skinButton1;
+        private CCWin.SkinControl.SkinButton skinButton2;
+        private System.Windows.Forms.DateTimePicker dateTimePicker2;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.DateTimePicker dateTimePicker1;
+        private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private PageCtrl pageCtrl1;
+        private System.Windows.Forms.ComboBox cbProductCode;
+        private System.Windows.Forms.ComboBox comboBox3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.Label label1;
+    }
+}
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.cs
new file mode 100644
index 0000000..0b9ecd5
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.cs
@@ -0,0 +1,880 @@
+using MaiMuAOI.SysCtrl;
+using Models;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class DataQueryFrm : Form
+    {
+        Service.OrderService OrderService = new Service.OrderService();
+        List<Order> QueryOrders = new List<Order>();
+        List<Order> QueryAllOrders = new List<Order>();
+
+        public DataQueryFrm()
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+        }
+
+        private void DataQueryFrm_Load(object sender, EventArgs e)
+        {
+            LoadPdtList(SysMgr.Instance.ProductCodeList);
+
+            //激活OnPageChanged事件
+            pageCtrl1.OnPageChanged += new EventHandler(pagerControl1_OnPageChanged);
+        }
+
+        #region 切页
+        /// <summary>
+        /// 页数变化时调用绑定数据方法
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void pagerControl1_OnPageChanged(object sender, EventArgs e)
+        {
+            QueryData();
+        }
+        #endregion
+
+        #region 加载料号
+        private string[] pdtlistData;
+        private void LoadPdtList(List<string> list)
+        {
+            this.cbProductCode.Items.Clear();
+            this.pdtlistData = list.ToArray();
+            cbProductCode.Items.AddRange(pdtlistData);//比使用DataSource速度要快一些
+            cbProductCode.TextUpdate += cobList_TextUpdate;//重新绑定事件
+            cbProductCode.KeyDown += CobList_KeyDown;
+            this.cbProductCode.Text = "";
+            cbProductCode.Focus();
+            cbProductCode.SelectAll();
+        }
+        private void CobList_KeyDown(object sender, KeyEventArgs e)
+        {
+            ComboBox ctrl = sender as ComboBox;
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (ctrl.Items.Count == 1)
+                    ctrl.Text = ctrl.Items[0].ToString();
+            }
+        }
+
+        private void cobList_TextUpdate(object sender, EventArgs e)
+        {
+            ComboBox ctrl = sender as ComboBox;
+            if (ctrl.Text != null)
+            {
+                string str = ctrl.Text;  //获取cb_material控件输入内 
+                                         //清空combobox
+                ctrl.DataSource = null;
+                ctrl.Items.Clear();
+
+                string[] workOrderFiltered;
+
+                workOrderFiltered = pdtlistData.Where(x => x.IndexOf(str, StringComparison.CurrentCultureIgnoreCase) != -1).ToArray();//忽略大小写
+                ctrl.Items.AddRange(workOrderFiltered);//比使用DataSource速度要快一些
+
+                // 不存在符合条件时
+                //设置光标位置，若不设置：光标位置始终保持在第一列，造成输入关键词的倒序排列
+                ctrl.Cursor = Cursors.Default; //保持鼠标指针原来状态，有时候鼠标指针会被下拉框覆盖，所以要进行一次设置 
+                if (workOrderFiltered.Length > 0)
+                {
+                    if (!ctrl.DroppedDown)
+                        ctrl.DroppedDown = true; // 自动弹出下拉框 
+                }
+
+                ctrl.SelectionStart = str.Length;  // 设置光标位置，若不设置：光标位置始终保持在第一列，造成输入关键词的倒序排列
+            }
+        }
+
+        #endregion
+
+        #region 查询数据
+
+        #region 数据库查询
+        private class domainItem
+        {
+            public string FieldName { get; set; }
+            public string FieldValue { get; set; }
+            public int ConditionalType { get; set; }
+        }
+        private class QueryOrderData
+        {
+            public string model { get; set; }
+            public string fields { get; set; }
+            public List<domainItem> domain { get; set; }
+            public string order { get; set; }
+
+            public int pageNum { get; set; }
+            public int pageSize { get; set; }
+
+        }
+        private List<Order> getTableList(JObject req, out int TotalCnt)
+        {
+            try
+            {
+                string model, fields = "", domain = "", order = "";
+                int pageNum = 0, pageSize = 0, totalCount = 0;
+
+                model = req.Value<string>("model");
+                if (req.ContainsKey("fields")) fields = req.Value<string>("fields");
+                if (req.ContainsKey("domain")) domain = req.Value<JArray>("domain").ToString();
+                if (req.ContainsKey("order")) order = req.Value<string>("order");
+
+                if (req.ContainsKey("pageNum")) pageNum = req.Value<int>("pageNum");
+                if (req.ContainsKey("pageSize")) pageSize = req.Value<int>("pageSize");
+
+                //创建表达式
+                var exp1 = Expressionable.Create<Order>()
+                                //.AndIF((int)cobProductList.SelectedValue > 0, it => it.ProductId == (int)cobProductList.SelectedValue)
+                                //.AndIF((int)cobStepList.SelectedValue > 0, it => it.StepId == (int)cobStepList.SelectedValue)
+                                //.AndIF(dateTimePicker1.Checked, it => it.CreateTime >= dateTimePicker1.Value)
+                                //.AndIF(dateTimePicker2.Checked, it => it.CreateTime < dateTimePicker2.Value)
+                                .ToExpression();//注意 这一句 不能少
+
+
+                var list = OrderService.GetListEx(fields, domain, order, pageNum, pageSize, ref totalCount);
+                TotalCnt = totalCount;
+                //var list = svcOrder.GetListNav(pageNum, pageSize, ref totalCount, exp1);
+                return list;
+            }
+            catch (Exception ex)
+            {
+                ;
+            }
+            TotalCnt = 0;
+            return null;
+        }
+        #endregion
+
+        #region 新老流程数据分析
+        private void ShowDataTableEx(List<Order> list)
+        {
+            dataGridView1.Columns.Clear();
+            //记录数据类型列数
+            Dictionary<string, int> dataCnt = new Dictionary<string, int>();
+            DataTable dt = new DataTable(); //建立个数据表
+            //通用列
+            DataGridViewCheckBoxColumn chk = new DataGridViewCheckBoxColumn();
+            chk.Name = "Select";
+            chk.HeaderText = "选择";
+            dataGridView1.Columns.Add(chk);
+            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类型的列
+
+            dt.Columns.Add(new DataColumn("堵孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列        
+
+            dataGridView1.DataSource = dt;
+            //在datagridview中添加button按钮
+            DataGridViewButtonColumn btn = new DataGridViewButtonColumn();
+            btn.Name = "Modify";
+            btn.HeaderText = "操作";
+            btn.DefaultCellStyle.NullValue = "修改";
+            dataGridView1.Columns.Add(btn);
+            DataGridViewButtonColumn btn2 = new DataGridViewButtonColumn();
+            btn2.Name = "HistoryView";
+            btn2.HeaderText = "查看";
+            btn2.DefaultCellStyle.NullValue = "历史";
+            dataGridView1.Columns.Add(btn2);
+
+            
+            DataTable dts = (DataTable)dataGridView1.DataSource;
+            dts.Clear();
+            foreach (var item in list)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dts.NewRow();
+                //dr["选择"] = false;
+                dr["检验日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["产品名称"] = item.ProductInfo.Name;
+                dr["料号"] = item.ProductInfo.Code;
+                dr["网版编码"] = item.SN;
+                dr["批次"] = item.BatchId;
+                dr["合格"] = item.Qualified ? "合格" : "不合格";
+                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                dr["异常情况"] = item.Abnormalities;
+                dr["修复人员"] = item.RepairCode;
+                dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dts.Rows.Add(dr);//在表的对象的行里添加此行                  
+            }
+
+            //dts.DefaultView.Sort = "时间戳 desc";
+            //dts = dts.DefaultView.ToTable();
+
+            dataGridView1.DataSource = dts;
+
+            this.dataGridView1.Columns[0].Width = 50;
+            this.dataGridView1.Columns[1].Width = 120;
+
+            for (int i = 0; i < 11; i++)
+            {
+                this.dataGridView1.Columns[i].Frozen = true;
+            }
+            
+            return;
+        }
+        #endregion
+
+        private void QueryData()
+        {
+            QueryOrderData queryOrderData = new QueryOrderData();
+            queryOrderData.model = "order";
+            queryOrderData.fields = "*";
+            queryOrderData.order = "id desc";
+            queryOrderData.pageNum = this.pageCtrl1.PageIndex;
+            queryOrderData.pageSize = this.pageCtrl1.PageSize;
+            queryOrderData.domain = new List<domainItem>();
+
+            domainItem startTime = new domainItem();
+            startTime.FieldName = "CreateTime";
+            startTime.FieldValue = dateTimePicker1.Value.ToString("yyyy-M-d");
+            startTime.ConditionalType = 3;
+            queryOrderData.domain.Add(startTime);
+
+            domainItem endTime = new domainItem();
+            endTime.FieldName = "CreateTime";
+            endTime.FieldValue = dateTimePicker2.Value.ToString("yyyy-M-d") + " 23:59:59";
+            endTime.ConditionalType = 5;
+            queryOrderData.domain.Add(endTime);
+            //OrderService.GetList
+            
+            //产品条件
+            if (!string.IsNullOrEmpty(cbProductCode.Text))
+            {
+                domainItem ProductCode = new domainItem();
+                ProductCode.FieldName = "ProductId";
+                ProductCode.FieldValue = SysMgr.Instance.ProductIdList[cbProductCode.SelectedIndex].ToString();
+                ProductCode.ConditionalType = 6;
+                queryOrderData.domain.Add(ProductCode);
+            }
+            //合格条件
+            if (!string.IsNullOrEmpty(comboBox2.Text))
+            {
+                domainItem CompareResult = new domainItem();
+                CompareResult.FieldName = "Qualified";
+                CompareResult.FieldValue = comboBox2.Text == "合格" ? "1" : "0";
+                CompareResult.ConditionalType = 0;
+                queryOrderData.domain.Add(CompareResult);
+            }
+            //比对条件
+            if (!string.IsNullOrEmpty(comboBox1.Text))
+            {
+                domainItem CompareResultOptions = new domainItem();
+                CompareResultOptions.FieldName = "CompareResult";
+                CompareResultOptions.FieldValue = comboBox1.Text == "通过" ? "1" : comboBox1.Text == "未通过" ? "2" : "0";
+                CompareResultOptions.ConditionalType = 0;
+                queryOrderData.domain.Add(CompareResultOptions);
+            }
+            //异常条件
+            if (!string.IsNullOrEmpty(comboBox3.Text))
+            {
+                domainItem State = new domainItem();
+                State.FieldName = "State";
+                State.FieldValue = comboBox3.Text == "修复" ? "5" : comboBox3.Text == "未修复" ? "0" : "10";
+                State.ConditionalType = 0;
+                queryOrderData.domain.Add(State);
+            }
+            
+            int totalcnt = 0;
+            JObject str = JObject.Parse(JsonConvert.SerializeObject(queryOrderData));
+            var list = getTableList(str, out totalcnt);
+            this.pageCtrl1.DrawControl(totalcnt);
+
+            QueryOrders = list;
+            //自动生成表格
+            ShowDataTableEx(list);
+
+            //总数居
+            queryOrderData.pageNum = 0;
+            queryOrderData.pageSize = 0;
+            JObject str2 = JObject.Parse(JsonConvert.SerializeObject(queryOrderData));
+            var list2 = getTableList(str2, out totalcnt);
+            QueryAllOrders = list2;
+        }
+        private void skinButton2_Click(object sender, EventArgs e)
+        {
+            pageCtrl1.PageIndex = 1;
+            QueryData();
+        }
+        #endregion
+
+        #region 表格单击
+
+        #region 更新数据
+
+        #endregion
+        private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            
+            int Index = this.dataGridView1.CurrentRow.Index;//获取当前选中行的索引 
+            if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "操作")
+            {
+                AmendantRecordFrm recordFrm = new AmendantRecordFrm(QueryOrders[Index]);
+                recordFrm.ShowDialog();
+                //重新显示
+                QueryData();
+            }
+            else if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "查看")
+            {
+                HistoryViewFrm Frm = new HistoryViewFrm(QueryOrders[Index]);
+                Frm.ShowDialog();
+
+            }
+            else if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "选择")
+            {
+                DataGridViewCheckBoxCell checkCell = (DataGridViewCheckBoxCell)dataGridView1.Rows[Index].Cells[0];
+                Boolean flag = Convert.ToBoolean(checkCell.Value);
+                if (flag == true)     //查找被选择的数据行  
+                {
+                    checkCell.Value = false;
+                }
+                else
+                    checkCell.Value = true;
+            }
+        }
+        #endregion
+
+        #region 界面调整
+        private void DataQueryFrm_SizeChanged(object sender, EventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Maximized)
+            {
+                this.WindowState = FormWindowState.Normal;
+                this.Top = 0;
+                this.Left = 0;
+                this.Width = SystemInformation.WorkingArea.Width;
+                this.Height = SystemInformation.WorkingArea.Height;
+            }
+        }
+        #endregion
+
+        #region 删除
+        private int delTableList(JObject req)
+        {
+            JObject res = new JObject();
+            try
+            {
+                string model = req.Value<string>("model");
+                string domain = req.Value<JArray>("domain").ToString();
+                //var idArr = req.Value<JArray>("idList"); 
+                //List<int> ids = new List<int>();
+                //foreach (int id in idArr) ids.Add(id);
+                int result = OrderService.DeleteList(model, domain);
+                return 1;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return 0;
+        }
+        private void skinButton3_Click(object sender, EventArgs e)
+        {
+
+
+            for (int i = 0; i < dataGridView1.Rows.Count; i++)
+            {
+                DataGridViewCheckBoxCell checkCell = (DataGridViewCheckBoxCell)dataGridView1.Rows[i].Cells[0];
+                Boolean flag = Convert.ToBoolean(checkCell.Value);
+                if (flag == true)
+                {
+                    QueryOrderData delOrderData = new QueryOrderData();
+                    delOrderData.model = "order";
+                    delOrderData.domain = new List<domainItem>();
+                    domainItem doitem = new domainItem();
+                    doitem.FieldName = "Id";
+                    doitem.FieldValue = QueryOrders[i].Id.ToString();
+                    doitem.ConditionalType = 6;
+                    delOrderData.domain.Add(doitem);
+                    JObject str = JObject.Parse(JsonConvert.SerializeObject(delOrderData));
+                    int ret = delTableList(str);
+                    if (ret == 1)
+                    {
+                        //删除历史
+                        QueryOrderData HistoryOrderData = new QueryOrderData();
+                        HistoryOrderData.model = "OrderHistory";
+                        HistoryOrderData.domain = new List<domainItem>();
+
+                        domainItem doitem2 = new domainItem();
+                        doitem2.FieldName = "Pid";
+                        doitem2.FieldValue = QueryOrders[i].Id.ToString();
+                        doitem2.ConditionalType = 6;
+                        HistoryOrderData.domain.Add(doitem2);
+
+
+                        JObject str2 = JObject.Parse(JsonConvert.SerializeObject(HistoryOrderData));
+                        delTableList(str2);
+                    }
+                }
+            }
+
+
+
+            //重新显示
+            QueryData();
+        }
+        #endregion
+
+        #region Excel导出
+        private void ShowAllDataTableEx(string filePath)
+        {
+            /*
+            //记录数据类型列数
+            Dictionary<string, int> dataCnt = new Dictionary<string, int>();
+            DataTable dt = new DataTable(); //建立个数据表
+            //通用列
+            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类型的列
+            dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
+
+            foreach (var item in QueryAllOrders)
+            {
+                //老流程
+                if (item.StepInfo == null || item.StepInfo.ProcessType != "快速流程")
+                {
+                    //加入数据表
+                    if (item.SizeDefectInfoList == null)
+                        item.SizeDefectInfoList = new List<SizeDefectInfo>();
+                    #region 张力
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension5,
+                    });
+                    #endregion
+                    #region 厚度
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height5,
+                    });
+                    #endregion
+                    #region YPT
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT5,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT6,
+                    });
+                    #endregion
+                    #region 线宽
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth5,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth6,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth7,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth8,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth9,
+                    });
+                    #endregion
+                    if (!dataCnt.ContainsKey("Tension"))
+                        dataCnt.Add("Tension", 5);
+                    else
+                        if (dataCnt["Tension"] < 5)
+                        dataCnt["Tension"] = 5;
+
+                    if (!dataCnt.ContainsKey("Height"))
+                        dataCnt.Add("Height", 5);
+                    else
+                        if (dataCnt["Height"] < 5)
+                        dataCnt["Height"] = 5;
+
+                    if (!dataCnt.ContainsKey("Y轴方向PT值检测"))
+                        dataCnt.Add("Y轴方向PT值检测", 5);
+                    else
+                        if (dataCnt["Y轴方向PT值检测"] < 5)
+                        dataCnt["Y轴方向PT值检测"] = 5;
+
+                    if (!dataCnt.ContainsKey("线宽正面"))
+                        dataCnt.Add("线宽正面", 9);
+                    else
+                        if (dataCnt["线宽正面"] < 9)
+                        dataCnt["线宽正面"] = 9;
+                }
+                else
+                {
+                    string[] pointType = new string[11] {"Tension", "Height", "Y轴方向PT值检测" , "线宽正面" , "反面检测" ,
+                                "X轴方向PT值检测","主栅连接线检测","主栅宽度检测","主栅间距","细栅间距检测","背极宽度"};
+                    for (int i = 0; i < pointType.Length; i++)
+                    {
+                        List<SizeDefectInfo> t = item.SizeDefectInfoList.Where(q => q.PointCode == pointType[i]).ToList();
+                        if (t.Count > 0)
+                        {
+                            if (!dataCnt.ContainsKey(pointType[i]))
+                                dataCnt.Add(pointType[i], t.Count);
+                            else
+                                if (dataCnt[pointType[i]] < t.Count)
+                                dataCnt[pointType[i]] = t.Count;
+                        }
+                    }
+                }
+            }
+            foreach (var item in dataCnt)
+            {
+                switch (item.Key)
+                {
+                    case "Tension":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"张力{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("张力均值", typeof(string)));
+                        break;
+                    case "Height":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"厚度{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("厚度均值", typeof(string)));
+                        break;
+                    case "Y轴方向PT值检测":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"Y轴方向PT值{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("Y轴方向PT值均值", typeof(string)));
+                        break;
+                    case "线宽正面":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"线宽正面{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("线宽正面均值", typeof(string)));
+                        break;
+                    case "X轴方向PT值检测":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"X轴方向PT值{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("X轴方向PT值均值", typeof(string)));
+                        break;
+                }
+
+            }
+
+            dt.Columns.Add(new DataColumn("堵孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列        
+
+
+            foreach (var item in QueryAllOrders)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dt.NewRow();
+                //dr["选择"] = false;
+                dr["检验日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["检测单号"] = item.DetectOrder;
+                dr["产品名称"] = item.ProductInfo.Name;
+                dr["料号"] = item.ProductInfo.Code;
+                dr["网版编码"] = item.SN;
+                dr["批次"] = item.BatchId;
+                dr["合格"] = item.Qualified ? "不合格" : "合格";
+                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>();
+                foreach (var tdata in dataCnt)
+                {
+                    switch (tdata.Key)
+                    {
+                        case "Tension":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Tension").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"张力{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["张力均值"] = item.TensionValue.ToString("0.00");
+                            break;
+                        case "Height":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Height").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"厚度{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["厚度均值"] = item.HeightValue.ToString("0.00");
+                            break;
+                        case "Y轴方向PT值检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Y轴方向PT值检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"Y轴方向PT值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["Y轴方向PT值均值"] = item.PTValue.ToString("0.0000");
+                            break;
+                        case "线宽正面":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "线宽正面").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"线宽正面{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["线宽正面均值"] = item.PTValue.ToString("0.00");
+                            break;
+                        case "反面检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "反面检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"反面检测{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["反面检测均值"] = item.PTValue.ToString("0.00");
+                            break;
+                        case "X轴方向PT值检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "X轴方向PT值检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"X轴方向PT值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["X轴方向PT值均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅连接线检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅连接线检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅连接线检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅连接线检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅宽度检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅宽度检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅宽度检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅宽度检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅间距":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅间距").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅间距值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅间距均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "细栅间距检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "细栅间距检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"细栅间距检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["细栅间距检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "背极宽度":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "背极宽度").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"背极宽度值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["背极宽度均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                    }
+
+                }
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dt.Rows.Add(dr);//在表的对象的行里添加此行                  
+            }
+
+            try
+            {
+                // 创建一个新的CSV文件并写入数据
+                using (StreamWriter writer = new StreamWriter(filePath, false, UnicodeEncoding.GetEncoding("GB2312")))
+                {
+                    // 写入CSV文件的标题行
+                    for (int i = 0; i < dt.Columns.Count; i++)
+                    {
+                        writer.Write(dt.Columns[i].ColumnName + ",");
+                    }
+                    writer.Write("\r\n");
+
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        // 写入数据行
+                        for (int j = 0; j < dt.Columns.Count; j++)
+                        {
+                            writer.Write(dt.Rows[i][j] + ",");
+                        }
+                        writer.Write("\r\n");
+                        //Console.WriteLine("CSV文件写入成功！");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("数据导出失败！error:" + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            */
+            return;
+        }
+        private void skinButton1_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dataGridView1.DataSource;
+            if (dt.Rows.Count > 0)
+            {
+                SaveFileDialog fileDialog = new SaveFileDialog();
+                fileDialog.Filter = "数据文件(*.csv)|*.csv";
+                fileDialog.Title = "保存数据";
+                //保存对话框是否记忆上次打开的目录
+                fileDialog.RestoreDirectory = true;
+
+                if (fileDialog.ShowDialog() == DialogResult.OK)
+                {
+                    try
+                    {
+                        string filePath = fileDialog.FileName; // CSV文件路径
+                        ShowAllDataTableEx(filePath);
+                        MessageBox.Show("数据导出成功！", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show("数据导出失败！error:" + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+        #endregion
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            cbProductCode.Text = "";
+        }
+
+    }
+}
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.resx b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.resx
new file mode 100644
index 0000000..97a5479
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClear.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
+        DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
+        VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
+        XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
+        4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
+        UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
+        qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
+        NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
+        sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
+        IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
+        wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
+        XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.Designer.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.Designer.cs
new file mode 100644
index 0000000..76eabde
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.Designer.cs
@@ -0,0 +1,109 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class HistoryViewFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1060, 46);
+            this.uiTitel1.TabIndex = 38;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(12, 49);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(138, 28);
+            this.label1.TabIndex = 39;
+            this.label1.Text = "修改历史记录";
+            // 
+            // panel1
+            // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.Controls.Add(this.dataGridView1);
+            this.panel1.Location = new System.Drawing.Point(0, 80);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1060, 473);
+            this.panel1.TabIndex = 40;
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(1060, 473);
+            this.dataGridView1.TabIndex = 2;
+            // 
+            // HistoryViewFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1060, 554);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "HistoryViewFrm";
+            this.Text = "历史记录";
+            this.Load += new System.EventHandler(this.HistoryViewFrm_Load);
+            this.panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.DataGridView dataGridView1;
+    }
+}
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.cs
new file mode 100644
index 0000000..8bfd66d
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.cs
@@ -0,0 +1,78 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class HistoryViewFrm : Form
+    {
+        Order _order;
+        public HistoryViewFrm(Order order)
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+
+            _order = order;
+            this.BackColor = Color.White;
+        }
+
+        private void HistoryViewFrm_Load(object sender, EventArgs e)
+        {
+            dataGridView1.Columns.Clear();
+            DataTable dt = new DataTable(); //建立个数据表
+
+            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(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列      
+
+            foreach (var item in _order.OrderHistoryList)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dt.NewRow();
+                //dr["选择"] = false;
+                dr["修改日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["修改账号"] = item.CreateUserCode;
+
+                dr["合格"] = item.Qualified ? "不合格" : "合格";
+                dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dt.Rows.Add(dr);//在表的对象的行里添加此行     
+            }
+            dataGridView1.DataSource = dt;
+        }
+    }
+}
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.resx b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.Designer.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.Designer.cs
new file mode 100644
index 0000000..a62a54b
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.Designer.cs
@@ -0,0 +1,312 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class PageCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnGo = new System.Windows.Forms.Button();
+            this.linkNext = new System.Windows.Forms.LinkLabel();
+            this.linkPrevious = new System.Windows.Forms.LinkLabel();
+            this.linkLast = new System.Windows.Forms.LinkLabel();
+            this.linkFirst = new System.Windows.Forms.LinkLabel();
+            this.numGoto = new System.Windows.Forms.NumericUpDown();
+            this.numPageDataCount = new System.Windows.Forms.NumericUpDown();
+            this.lblTotalCount = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.lblPageCount = new System.Windows.Forms.Label();
+            this.lblCurrentPage = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numGoto)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numPageDataCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // btnGo
+            // 
+            this.btnGo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnGo.Location = new System.Drawing.Point(823, 4);
+            this.btnGo.Name = "btnGo";
+            this.btnGo.Size = new System.Drawing.Size(47, 28);
+            this.btnGo.TabIndex = 32;
+            this.btnGo.Text = "跳转";
+            this.btnGo.UseVisualStyleBackColor = true;
+            this.btnGo.Click += new System.EventHandler(this.btnGo_Click);
+            // 
+            // linkNext
+            // 
+            this.linkNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkNext.AutoSize = true;
+            this.linkNext.Location = new System.Drawing.Point(658, 12);
+            this.linkNext.Name = "linkNext";
+            this.linkNext.Size = new System.Drawing.Size(17, 12);
+            this.linkNext.TabIndex = 31;
+            this.linkNext.TabStop = true;
+            this.linkNext.Text = ">>";
+            this.linkNext.Click += new System.EventHandler(this.linkNext_Click);
+            // 
+            // linkPrevious
+            // 
+            this.linkPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkPrevious.AutoSize = true;
+            this.linkPrevious.Location = new System.Drawing.Point(618, 12);
+            this.linkPrevious.Name = "linkPrevious";
+            this.linkPrevious.Size = new System.Drawing.Size(17, 12);
+            this.linkPrevious.TabIndex = 30;
+            this.linkPrevious.TabStop = true;
+            this.linkPrevious.Text = "<<";
+            this.linkPrevious.Click += new System.EventHandler(this.linkPrevious_Click);
+            // 
+            // linkLast
+            // 
+            this.linkLast.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkLast.AutoSize = true;
+            this.linkLast.Location = new System.Drawing.Point(698, 12);
+            this.linkLast.Name = "linkLast";
+            this.linkLast.Size = new System.Drawing.Size(29, 12);
+            this.linkLast.TabIndex = 29;
+            this.linkLast.TabStop = true;
+            this.linkLast.Text = "尾页";
+            this.linkLast.Click += new System.EventHandler(this.linkLast_Click);
+            // 
+            // linkFirst
+            // 
+            this.linkFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkFirst.AutoSize = true;
+            this.linkFirst.Location = new System.Drawing.Point(566, 12);
+            this.linkFirst.Name = "linkFirst";
+            this.linkFirst.Size = new System.Drawing.Size(29, 12);
+            this.linkFirst.TabIndex = 28;
+            this.linkFirst.TabStop = true;
+            this.linkFirst.Text = "首页";
+            this.linkFirst.Click += new System.EventHandler(this.linkFirst_Click);
+            // 
+            // numGoto
+            // 
+            this.numGoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.numGoto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numGoto.Location = new System.Drawing.Point(750, 7);
+            this.numGoto.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.numGoto.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numGoto.Name = "numGoto";
+            this.numGoto.Size = new System.Drawing.Size(67, 23);
+            this.numGoto.TabIndex = 27;
+            this.numGoto.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numGoto.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numGoto.ValueChanged += new System.EventHandler(this.txtPageNum_TextChanged);
+            this.numGoto.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPageNum_KeyPress);
+            // 
+            // numPageDataCount
+            // 
+            this.numPageDataCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numPageDataCount.Location = new System.Drawing.Point(52, 5);
+            this.numPageDataCount.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.numPageDataCount.Minimum = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+            this.numPageDataCount.Name = "numPageDataCount";
+            this.numPageDataCount.Size = new System.Drawing.Size(72, 23);
+            this.numPageDataCount.TabIndex = 26;
+            this.numPageDataCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numPageDataCount.Value = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numPageDataCount.ValueChanged += new System.EventHandler(this.txtPageSize_TextChanged);
+            this.numPageDataCount.Leave += new System.EventHandler(this.txtPageSize_Leave);
+            // 
+            // lblTotalCount
+            // 
+            this.lblTotalCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblTotalCount.AutoSize = true;
+            this.lblTotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblTotalCount.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblTotalCount.Location = new System.Drawing.Point(429, 9);
+            this.lblTotalCount.Name = "lblTotalCount";
+            this.lblTotalCount.Size = new System.Drawing.Size(64, 17);
+            this.lblTotalCount.TabIndex = 25;
+            this.lblTotalCount.Text = "10000000";
+            // 
+            // label8
+            // 
+            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(499, 9);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(44, 17);
+            this.label8.TabIndex = 24;
+            this.label8.Text = "条记录";
+            // 
+            // label7
+            // 
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(403, 9);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(20, 17);
+            this.label7.TabIndex = 23;
+            this.label7.Text = "共";
+            // 
+            // lblPageCount
+            // 
+            this.lblPageCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblPageCount.AutoSize = true;
+            this.lblPageCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblPageCount.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblPageCount.Location = new System.Drawing.Point(340, 9);
+            this.lblPageCount.Name = "lblPageCount";
+            this.lblPageCount.Size = new System.Drawing.Size(43, 17);
+            this.lblPageCount.TabIndex = 22;
+            this.lblPageCount.Text = "10000";
+            // 
+            // lblCurrentPage
+            // 
+            this.lblCurrentPage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblCurrentPage.AutoSize = true;
+            this.lblCurrentPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblCurrentPage.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblCurrentPage.Location = new System.Drawing.Point(272, 9);
+            this.lblCurrentPage.Name = "lblCurrentPage";
+            this.lblCurrentPage.Size = new System.Drawing.Size(43, 17);
+            this.lblCurrentPage.TabIndex = 21;
+            this.lblCurrentPage.Text = "10000";
+            // 
+            // label4
+            // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(321, 9);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(13, 17);
+            this.label4.TabIndex = 20;
+            this.label4.Text = "/";
+            // 
+            // label3
+            // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(205, 9);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(44, 17);
+            this.label3.TabIndex = 19;
+            this.label3.Text = "当前页";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(130, 9);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(20, 17);
+            this.label2.TabIndex = 18;
+            this.label2.Text = "条";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(14, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 17);
+            this.label1.TabIndex = 17;
+            this.label1.Text = "每页";
+            // 
+            // PageCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.btnGo);
+            this.Controls.Add(this.linkNext);
+            this.Controls.Add(this.linkPrevious);
+            this.Controls.Add(this.linkLast);
+            this.Controls.Add(this.linkFirst);
+            this.Controls.Add(this.numGoto);
+            this.Controls.Add(this.numPageDataCount);
+            this.Controls.Add(this.lblTotalCount);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.lblPageCount);
+            this.Controls.Add(this.lblCurrentPage);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Name = "PageCtrl";
+            this.Size = new System.Drawing.Size(885, 36);
+            ((System.ComponentModel.ISupportInitialize)(this.numGoto)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numPageDataCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnGo;
+        private System.Windows.Forms.LinkLabel linkNext;
+        private System.Windows.Forms.LinkLabel linkPrevious;
+        private System.Windows.Forms.LinkLabel linkLast;
+        private System.Windows.Forms.LinkLabel linkFirst;
+        private System.Windows.Forms.NumericUpDown numGoto;
+        private System.Windows.Forms.NumericUpDown numPageDataCount;
+        private System.Windows.Forms.Label lblTotalCount;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label lblPageCount;
+        private System.Windows.Forms.Label lblCurrentPage;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+    }
+}
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.cs b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.cs
new file mode 100644
index 0000000..78ea252
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.cs
@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class PageCtrl : UserControl
+    {
+        public PageCtrl()
+        {
+            InitializeComponent();
+
+            numPageDataCount.Controls[0].Visible = false;
+            numGoto.Controls[0].Visible = false;
+        }
+
+        #region 分页字段和属性
+
+        private int pageIndex = 1;
+        /// <summary>
+        /// 当前页数
+        /// </summary>
+        public virtual int PageIndex
+        {
+            get { return pageIndex; }
+            set { pageIndex = value; }
+        }
+
+        private int pageSize = 10;
+        /// <summary>
+        /// 每页记录数
+        /// </summary>
+        public virtual int PageSize
+        {
+            get { return pageSize; }
+            set { pageSize = value; }
+        }
+
+        private int recordCount = 0;
+        /// <summary>
+        /// 总记录数
+        /// </summary>
+        public virtual int RecordCount
+        {
+            get { return recordCount; }
+            set { recordCount = value; }
+        }
+
+        private int pageCount = 0;
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        public int PageCount
+        {
+            get
+            {
+                if (pageSize != 0)
+                {
+                    pageCount = GetPageCount();
+                }
+                return pageCount;
+            }
+        }
+
+        #endregion
+
+        #region 页码变化时触发事件
+
+        public event EventHandler OnPageChanged;
+
+        #endregion
+
+        #region 分页及相关事件功能实现
+
+        /// <summary>
+        /// 设窗体控件全部可用
+        /// </summary>
+        private void SetFormCtrEnabled()
+        {
+            linkFirst.Enabled = true;
+            linkPrevious.Enabled = true;
+            linkNext.Enabled = true;
+            linkLast.Enabled = true;
+            btnGo.Enabled = true;
+        }
+
+        /// <summary>
+        /// 计算总页数
+        /// </summary>
+        /// <returns></returns>
+        private int GetPageCount()
+        {
+            if (PageSize == 0)
+            {
+                return 0;
+            }
+            int pageCount = RecordCount / PageSize;
+            if (RecordCount % PageSize == 0)
+            {
+                pageCount = RecordCount / PageSize;
+            }
+            else
+            {
+                pageCount = RecordCount / PageSize + 1;
+            }
+            return pageCount;
+        }
+        /// <summary>
+        /// 用于客户端调用
+        /// </summary>
+        public void DrawControl(int count)
+        {
+            recordCount = count;
+            DrawControl(false);
+        }
+        /// <summary>
+        /// 根据不同的条件，改变页面控件的呈现状态
+        /// </summary>
+        private void DrawControl(bool callEvent)
+        {
+
+            lblCurrentPage.Text = PageIndex.ToString();
+            lblPageCount.Text = PageCount.ToString();
+            lblTotalCount.Text = RecordCount.ToString();
+            numPageDataCount.Value = PageSize;
+
+            if (callEvent && OnPageChanged != null)
+            {
+                OnPageChanged(this, null);//当前分页数字改变时，触发委托事件
+            }
+            SetFormCtrEnabled();
+            if (PageCount == 1)//有且仅有一页时
+            {
+                linkFirst.Enabled = false;
+                linkPrevious.Enabled = false;
+                linkNext.Enabled = false;
+                linkLast.Enabled = false;
+                btnGo.Enabled = false;
+            }
+            else if (PageIndex == 1)//当前页为第一页时
+            {
+                linkFirst.Enabled = false;
+                linkPrevious.Enabled = false;
+            }
+            else if (PageIndex == PageCount)//当前页为最后一页时
+            {
+                linkNext.Enabled = false;
+                linkLast.Enabled = false;
+            }
+        }
+
+        #endregion
+
+        #region 相关控件事件
+
+        //首页按钮
+        private void linkFirst_Click(object sender, EventArgs e)
+        {
+            PageIndex = 1;
+            DrawControl(true);
+        }
+
+        //上一页按钮
+        private void linkPrevious_Click(object sender, EventArgs e)
+        {
+            PageIndex = Math.Max(1, PageIndex - 1);
+            DrawControl(true);
+        }
+
+        //下一页按钮
+        private void linkNext_Click(object sender, EventArgs e)
+        {
+            PageIndex = Math.Min(PageCount, PageIndex + 1);
+            DrawControl(true);
+        }
+
+        //尾页按钮
+        private void linkLast_Click(object sender, EventArgs e)
+        {
+            PageIndex = PageCount;
+            DrawControl(true);
+        }
+
+        /// <summary>
+        /// 按下enter键，执行跳转页面功能
+        /// </summary>
+        private void txtPageNum_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            btnGo_Click(null, null);
+        }
+
+        /// <summary>
+        /// 跳转页数限制
+        /// </summary>
+        private void txtPageNum_TextChanged(object sender, EventArgs e)
+        {
+            int num = 0;
+            if (int.TryParse(numGoto.Value.ToString(), out num) && num > 0)
+            {   //TryParse 函数，将字符串转换成等效的整数，返回bool型，判断是否转换成功。
+                //输入除数字以外的字符是转换不成功的
+
+                if (num > PageCount)   //输入数量大于最大页数时，文本框自动显示最大页数
+                {
+                    numGoto.Value = PageCount;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 跳转按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnGo_Click(object sender, EventArgs e)
+        {
+            int num = 0;
+            if (int.TryParse(numGoto.Value.ToString(), out num) && num > 0)
+            {
+                PageIndex = num;
+                DrawControl(true);
+            }
+        }
+
+        #endregion
+
+        bool isTextChanged = false;
+        /// <summary>
+        /// 每页显示的记录数改变时
+        /// </summary>
+        private void txtPageSize_TextChanged(object sender, EventArgs e)
+        {
+            int num = 0;
+            //输入不符合规范时，默认设置为100
+            if (!int.TryParse(numPageDataCount.Text.Trim(), out num) || num <= 0)
+            {
+                num = 100;
+                numPageDataCount.Value = 100;
+            }
+            else
+            {
+                isTextChanged = true;
+
+            }
+            pageSize = num;
+        }
+        /// <summary>
+        /// 光标离开 每页设置文本框时，显示到首页
+        private void txtPageSize_Leave(object sender, EventArgs e)
+        {
+            if (isTextChanged)
+            {
+                isTextChanged = false;
+                linkFirst_Click(null, null);
+            }
+        }
+    }
+}
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.resx b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.Designer.cs b/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.Designer.cs
index 1750076..2d8a9b1 100644
--- a/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.Designer.cs
+++ b/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.Designer.cs
@@ -30,10 +30,10 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductInfoFrm));
-            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();
             this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnSave = new System.Windows.Forms.ToolStripButton();
@@ -71,6 +71,9 @@
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.panel5 = new System.Windows.Forms.Panel();
+            this.label25 = new System.Windows.Forms.Label();
+            this.cbMainGrid = new System.Windows.Forms.CheckBox();
+            this.cbMarkDisturb = new System.Windows.Forms.CheckBox();
             this.label21 = new System.Windows.Forms.Label();
             this.numMarkSize = new System.Windows.Forms.NumericUpDown();
             this.label20 = new System.Windows.Forms.Label();
@@ -78,6 +81,8 @@
             this.label19 = new System.Windows.Forms.Label();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.label24 = new System.Windows.Forms.Label();
+            this.textBoxPath = new System.Windows.Forms.TextBox();
             this.btnOpenFile = new System.Windows.Forms.LinkLabel();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.groupBox10 = new System.Windows.Forms.GroupBox();
@@ -117,11 +122,6 @@
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.flpQualifiedPannel = new System.Windows.Forms.FlowLayoutPanel();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.textBoxPath = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label25 = new System.Windows.Forms.Label();
-            this.cbMainGrid = new System.Windows.Forms.CheckBox();
-            this.cbMarkDisturb = new System.Windows.Forms.CheckBox();
             this.toolStrip1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -325,6 +325,7 @@
             this.cmbDefectModelFile.Name = "cmbDefectModelFile";
             this.cmbDefectModelFile.Size = new System.Drawing.Size(125, 20);
             this.cmbDefectModelFile.TabIndex = 38;
+            this.cmbDefectModelFile.SelectedIndexChanged += new System.EventHandler(this.cmbDefectModelFile_SelectedIndexChanged);
             // 
             // label29
             // 
@@ -370,6 +371,7 @@
             this.cmbClasses.Name = "cmbClasses";
             this.cmbClasses.Size = new System.Drawing.Size(125, 20);
             this.cmbClasses.TabIndex = 35;
+            this.cmbClasses.SelectedValueChanged += new System.EventHandler(this.cmbClasses_SelectedValueChanged);
             // 
             // label17
             // 
@@ -403,46 +405,46 @@
             // 
             this.dgvBatchList.AllowUserToAddRows = false;
             this.dgvBatchList.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.dgvBatchList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvBatchList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvBatchList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvBatchList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colBatchId,
             this.colTargetCount,
             this.colCompleteCount,
             this.colCreateTime});
-            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.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvBatchList.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvBatchList.DefaultCellStyle = dataGridViewCellStyle6;
             this.dgvBatchList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvBatchList.Location = new System.Drawing.Point(2, 16);
             this.dgvBatchList.Margin = new System.Windows.Forms.Padding(2);
             this.dgvBatchList.MultiSelect = false;
             this.dgvBatchList.Name = "dgvBatchList";
             this.dgvBatchList.ReadOnly = true;
-            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.dgvBatchList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            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.dgvBatchList.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvBatchList.RowHeadersVisible = false;
             this.dgvBatchList.RowHeadersWidth = 62;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvBatchList.RowTemplate.Height = 30;
             this.dgvBatchList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvBatchList.Size = new System.Drawing.Size(532, 262);
@@ -628,6 +630,38 @@
             this.panel5.Size = new System.Drawing.Size(537, 237);
             this.panel5.TabIndex = 0;
             // 
+            // label25
+            // 
+            this.label25.AutoSize = true;
+            this.label25.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.label25.Location = new System.Drawing.Point(60, 116);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(161, 12);
+            this.label25.TabIndex = 8;
+            this.label25.Text = "在非[默认Mark]的情况下生效";
+            // 
+            // cbMainGrid
+            // 
+            this.cbMainGrid.AutoSize = true;
+            this.cbMainGrid.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.cbMainGrid.Location = new System.Drawing.Point(229, 145);
+            this.cbMainGrid.Name = "cbMainGrid";
+            this.cbMainGrid.Size = new System.Drawing.Size(72, 16);
+            this.cbMainGrid.TabIndex = 7;
+            this.cbMainGrid.Text = "是否主栅";
+            this.cbMainGrid.UseVisualStyleBackColor = true;
+            // 
+            // cbMarkDisturb
+            // 
+            this.cbMarkDisturb.AutoSize = true;
+            this.cbMarkDisturb.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.cbMarkDisturb.Location = new System.Drawing.Point(62, 145);
+            this.cbMarkDisturb.Name = "cbMarkDisturb";
+            this.cbMarkDisturb.Size = new System.Drawing.Size(120, 16);
+            this.cbMarkDisturb.TabIndex = 6;
+            this.cbMarkDisturb.Text = "是否存在Mark干扰";
+            this.cbMarkDisturb.UseVisualStyleBackColor = true;
+            // 
             // label21
             // 
             this.label21.AutoSize = true;
@@ -668,9 +702,9 @@
             "空心圆",
             "实心圆带栅线",
             "空心圆带栅线",
-            "圆环",
-            "半圆环",
-            "十字线"});
+            "矩形",
+            "候补1",
+            "候补2"});
             this.cbMarkType.Location = new System.Drawing.Point(100, 67);
             this.cbMarkType.Margin = new System.Windows.Forms.Padding(2);
             this.cbMarkType.Name = "cbMarkType";
@@ -719,6 +753,24 @@
             this.panel4.Size = new System.Drawing.Size(537, 103);
             this.panel4.TabIndex = 0;
             // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.label24.Location = new System.Drawing.Point(17, 66);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(35, 12);
+            this.label24.TabIndex = 4;
+            this.label24.Text = "路径:";
+            // 
+            // textBoxPath
+            // 
+            this.textBoxPath.Location = new System.Drawing.Point(58, 63);
+            this.textBoxPath.Name = "textBoxPath";
+            this.textBoxPath.ReadOnly = true;
+            this.textBoxPath.Size = new System.Drawing.Size(465, 21);
+            this.textBoxPath.TabIndex = 3;
+            // 
             // btnOpenFile
             // 
             this.btnOpenFile.AutoSize = true;
@@ -1215,56 +1267,6 @@
             this.flpQualifiedPannel.Size = new System.Drawing.Size(547, 391);
             this.flpQualifiedPannel.TabIndex = 0;
             // 
-            // textBoxPath
-            // 
-            this.textBoxPath.Location = new System.Drawing.Point(58, 63);
-            this.textBoxPath.Name = "textBoxPath";
-            this.textBoxPath.ReadOnly = true;
-            this.textBoxPath.Size = new System.Drawing.Size(465, 21);
-            this.textBoxPath.TabIndex = 3;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label24.Location = new System.Drawing.Point(17, 66);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(35, 12);
-            this.label24.TabIndex = 4;
-            this.label24.Text = "路径:";
-            // 
-            // label25
-            // 
-            this.label25.AutoSize = true;
-            this.label25.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label25.Location = new System.Drawing.Point(60, 116);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(161, 12);
-            this.label25.TabIndex = 8;
-            this.label25.Text = "在非[默认Mark]的情况下生效";
-            // 
-            // cbMainGrid
-            // 
-            this.cbMainGrid.AutoSize = true;
-            this.cbMainGrid.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.cbMainGrid.Location = new System.Drawing.Point(229, 145);
-            this.cbMainGrid.Name = "cbMainGrid";
-            this.cbMainGrid.Size = new System.Drawing.Size(72, 16);
-            this.cbMainGrid.TabIndex = 7;
-            this.cbMainGrid.Text = "是否主栅";
-            this.cbMainGrid.UseVisualStyleBackColor = true;
-            // 
-            // cbMarkDisturb
-            // 
-            this.cbMarkDisturb.AutoSize = true;
-            this.cbMarkDisturb.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.cbMarkDisturb.Location = new System.Drawing.Point(62, 145);
-            this.cbMarkDisturb.Name = "cbMarkDisturb";
-            this.cbMarkDisturb.Size = new System.Drawing.Size(120, 16);
-            this.cbMarkDisturb.TabIndex = 6;
-            this.cbMarkDisturb.Text = "是否存在Mark干扰";
-            this.cbMarkDisturb.UseVisualStyleBackColor = true;
-            // 
             // ProductInfoFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.cs b/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.cs
index 156e108..ed6c2ba 100644
--- a/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.cs
+++ b/MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.cs
@@ -1,5 +1,6 @@
 using MaiMuAOI.SysCtrl;
 using MaiMuControl.Utils;
+using Models;
 using OpenCvSharp;
 using ProductionControl.UI;
 using ProductionControl.UIExtend;
@@ -94,8 +95,8 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     }
                     else
                         this.btnOpenFile.Left = 20;
-
-                    this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.NameTimestamp + attachmentFile.Name;
+                    this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.Name;
+                    //this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.NameTimestamp + attachmentFile.Name;
                 }
 
             }
@@ -126,13 +127,17 @@ namespace MaiMuAOI.SysUI.ProductAndStep
         {
             try
             {
+                Classes classtemp = null;
                 //显示的数据 
                 this.cmbClasses.DisplayMember = "Name";
                 this.cmbClasses.ValueMember = "Id";
                 var list = svcClasses.GetListNav(0);
                 this.cmbClasses.DataSource = list;
                 if (model.ClassesId > 0)
+                {
                     this.cmbClasses.SelectedValue = model.ClassesId;
+                    classtemp = svcClasses.GetById(model.ClassesId);
+                }
 
                 //缺陷项
                 //ArrayList lstDefect = new ArrayList();
@@ -142,7 +147,7 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                 //    DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
                 //    userCon.Code = item.ToString();
                 //    userCon.Title = EnumExtension.GetEnumDescription((DefectCodeEnum)item);
-                    
+
                 //    if (model != null && model.QualifiedCriterionList != null)
                 //    {
                 //        var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
@@ -156,12 +161,21 @@ namespace MaiMuAOI.SysUI.ProductAndStep
 
                 //    this.flpQualifiedPannel.Controls.Add(userCon);
                 //}
-                var lstDefect = GetArrayList<DefectCodeEnum>();
+                ArrayList lstDefect;
+                if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    lstDefect = GetArrayList<DefectCode2Enum>();
+                else
+                    lstDefect = GetArrayList<DefectCodeEnum>();
+                this.flpQualifiedPannel.Controls.Clear();
                 foreach (DictionaryEntry item in lstDefect)
                 {
+                    
                     DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
                     userCon.Code = item.Value.ToString();
-                    userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
+                    if ((classtemp != null) && (classtemp.Name == "钢网"))
+                        userCon.Title = ((DefectName2Enum)(int)item.Key).ToString();
+                    else
+                        userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
                     if (model != null && model.QualifiedCriterionList != null)
                     {
                         var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
@@ -524,5 +538,45 @@ namespace MaiMuAOI.SysUI.ProductAndStep
 
             model = service.GetModelNav(model.Code);
         }
+
+        private void cmbDefectModelFile_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void cmbClasses_SelectedValueChanged(object sender, EventArgs e)
+        {
+            this.flpQualifiedPannel.Controls.Clear();
+
+            Classes classtemp = svcClasses.GetById(this.cmbClasses.SelectedValue);
+
+            ArrayList lstDefect;
+            if ((classtemp != null) && (classtemp.Name == "钢网"))
+                lstDefect = GetArrayList<DefectCode2Enum>();
+            else
+                lstDefect = GetArrayList<DefectCodeEnum>();
+
+            foreach (DictionaryEntry item in lstDefect)
+            {
+                DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
+                userCon.Code = item.Value.ToString();
+                if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    userCon.Title = ((DefectName2Enum)(int)item.Key).ToString();
+                else
+                    userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
+                if (model != null && model.QualifiedCriterionList != null)
+                {
+                    var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
+                    if (qalifiedItem != null)
+                    {
+                        userCon.Checked = true;
+                        userCon.SizeValue = (decimal)qalifiedItem.Size;
+                        userCon.MaxDefectCount = qalifiedItem.MaxDefectCount;
+                    }
+                }
+
+                this.flpQualifiedPannel.Controls.Add(userCon);
+            }
+        }
     }
 }
diff --git a/MaiMuAOI/MaiMuAOI/SysUI/StepUI/FrmGetPosByPic.cs b/MaiMuAOI/MaiMuAOI/SysUI/StepUI/FrmGetPosByPic.cs
index b4638b6..4ef7131 100644
--- a/MaiMuAOI/MaiMuAOI/SysUI/StepUI/FrmGetPosByPic.cs
+++ b/MaiMuAOI/MaiMuAOI/SysUI/StepUI/FrmGetPosByPic.cs
@@ -180,11 +180,5 @@ namespace ProductionControl.UI
                 }
             }
         }
-
-        private void tsbtnDelectPos_Click(object sender, EventArgs e)
-        {
-            this.imageBox1.DelectOntPoint();
-            this.pickARoi.RemoveAt(pickARoi.Count - 1);
-        }
     }
 }
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/SysParamsConfig.ini b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/SysParamsConfig.ini
index 1fac788..ff839e9 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/SysParamsConfig.ini
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/SysParamsConfig.ini
@@ -57,7 +57,7 @@ DisableCam=False
 DisableLight=False
 [Sys]
 ImageProcessPath=C:\Users\user\AppData\Local\Programs\MVTec\HALCON-21.05-Progress\procedures\general
-AIModelPath=D:\AOI\Debug\ConfigFiles\onnxFiles
+AIModelPath=E:\CPL\����������Ŀ\2023\AOI �沩ʿ\����\MaiMuAOI\MaiMuAOI\bin\x64\Debug\ConfigFiles\onnxFiles
 HttpServerIP=127.0.0.1
 HttpServerPort=18082
 [ShowMainWin]
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/onnxFiles/GW.onnx b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/onnxFiles/GW.onnx
new file mode 100644
index 0000000..7e73418
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/onnxFiles/GW.onnx differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ImageBox.xml b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ImageBox.xml
index 56192b6..41fbf22 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ImageBox.xml
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/ImageBox.xml
@@ -123,7 +123,12 @@
         </member>
         <member name="F:ImageToolKits.ImageBox.CursorModeEnum.Low">
             <summary>
-            特色模式
+            低配选点模式
+            </summary>
+        </member>
+        <member name="F:ImageToolKits.ImageBox.CursorModeEnum.Point">
+            <summary>
+            高配选点模式
             </summary>
         </member>
         <member name="T:ImageToolKits.ImageBox.ImageModeEnum">
@@ -247,6 +252,11 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:ImageToolKits.ImageBox.ColorDrawParam">
+            <summary>
+            区域+颜色类型
+            </summary>
+        </member>
         <member name="T:ImageToolKits.ImageBox.Point">
             <summary>
             点类型
@@ -502,6 +512,15 @@
             <param name="gpROI">ROI图形路径</param>
             <param name="gpInteractive">交互图形路径</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.DrawROIByGraphicsPath(System.Drawing.Graphics,System.Drawing.Drawing2D.GraphicsPath,System.Drawing.Drawing2D.GraphicsPath,System.Drawing.Color)">
+            <summary>
+            根据绘图路径绘制ROI
+            </summary>
+            <param name="g"></param>
+            <param name="gpROI">ROI图形路径</param>
+            <param name="gpInteractive">交互图形路径</param>
+            <param name="color">颜色</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.GetInsideIndex(System.Drawing.PointF)">
             <summary>
             计算某个点是否在某些点内部
@@ -705,6 +724,14 @@
             <param name="region">一个或多个区域</param>
             <param name="imageMode">图像显示方式，见枚举ImageModeEnum</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.RefreshWindow(OpenCvSharp.Mat,System.Collections.Generic.List{ImageToolKits.ImageBox.ColorDrawParam},ImageToolKits.ImageBox.ImageModeEnum)">
+            <summary>
+            显示图像与区域
+            </summary>
+            <param name="image">图像</param>
+            <param name="colorRegion">一个或多个不同颜色区域</param>
+            <param name="imageMode">图像显示方式，见枚举ImageModeEnum</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.RefreshWindow(OpenCvSharp.Mat,ImageToolKits.ImageBox.BaseDrawParam,ImageToolKits.ImageBox.ImageModeEnum)">
             <summary>
             显示图像与区域
@@ -726,6 +753,12 @@
             </summary>
             <param name="lDrawParam">多个区域</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.DisplayROIs(System.Collections.Generic.List{ImageToolKits.ImageBox.ColorDrawParam})">
+            <summary>
+            显示多个区域分色
+            </summary>
+            <param name="lDrawParam">多个区域</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.DisplayROI(ImageToolKits.ImageBox.BaseDrawParam)">
             <summary>
             显示一个区域
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/Log.txt b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/Log.txt
index 67137e3..ef5e39b 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/Log.txt
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/Log.txt
@@ -106,3 +106,19 @@ Global捕获到未处理异常：System.ArgumentOutOfRangeException
    在 System.Windows.Forms.ComboBox.WndProc(Message& m)
    在 System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
 
+2024-02-01 08:38:01
+Global捕获到未处理异常：System.IndexOutOfRangeException
+异常信息：索引超出了数组界限。
+异常堆栈：   在 MaiMuControl.Device.AxisDev.Advantech.AdvantechMotion.GetAxisVelocity(Int32 Axis_no) 位置 E:\CPL\迈沐智能项目\模块化\Code\MaiMuControl\MaiMuControl\Device\AxisDev\Advantech\AdvantechMotion.cs:行号 452
+   在 ProductionControl.UI.UIAxisDev.refreshAxisVelParam() 位置 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\SysUI\StepUI\UIAxisDev.cs:行号 148
+   在 ProductionControl.UI.UIAxisDev.propertyGrid1_PropertyValueChanged(Object s, PropertyValueChangedEventArgs e) 位置 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\SysUI\StepUI\UIAxisDev.cs:行号 258
+   在 System.Windows.Forms.PropertyGrid.OnPropertyValueChanged(PropertyValueChangedEventArgs e)
+   在 System.Windows.Forms.PropertyGrid.OnPropertyValueSet(GridItem changedItem, Object oldValue)
+   在 System.Windows.Forms.PropertyGridInternal.PropertyGridView.CommitValue(GridEntry ipeCur, Object value, Boolean closeDropDown)
+   在 System.Windows.Forms.PropertyGridInternal.PropertyGridView.OnListClick(Object sender, EventArgs e)
+   在 System.Windows.Forms.Control.OnMouseUp(MouseEventArgs e)
+   在 System.Windows.Forms.Control.WmMouseUp(Message& m, MouseButtons button, Int32 clicks)
+   在 System.Windows.Forms.Control.WndProc(Message& m)
+   在 System.Windows.Forms.ListBox.WndProc(Message& m)
+   在 System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
+
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB38-A604.pma b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB38-A604.pma
deleted file mode 100644
index 8c18b1f..0000000
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB38-A604.pma and /dev/null differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB56-AA18.pma b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-65A9C4D4-D4E8.pma
similarity index 90%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB56-AA18.pma
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-65A9C4D4-D4E8.pma
index 2997b8b..2c480cb 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-657FAB56-AA18.pma and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/BrowserMetrics/BrowserMetrics-65A9C4D4-D4E8.pma differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Crashpad/settings.dat b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Crashpad/settings.dat
index d44530d..8d8c035 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Crashpad/settings.dat and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Crashpad/settings.dat differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_0
index c4b4d76..aee539d 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_1
index f401018..2d43b37 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_3 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_3
index 386f512..19f1474 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_3 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/data_3 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e7 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f2
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e7
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f2
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e8 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f3
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e8
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f3
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e9 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f4
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001e9
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f4
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ea b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f5
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ea
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f5
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ec b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f6
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ec
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f6
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001eb b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f7
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001eb
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f7
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ed b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f8
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ed
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f8
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f9
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f1
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f9
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fa
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001f0
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fa
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ef b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fb
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ef
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fb
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ee b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fc
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ee
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fc
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000183 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fd
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000183
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fd
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000160 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fe
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000160
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001fe
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000161 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ff
similarity index 100%
rename from MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_000161
rename to MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Cache/Cache_Data/f_0001ff
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/50b9b7b876104784_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/50b9b7b876104784_0
index f06f5df..ee350d2 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/50b9b7b876104784_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/50b9b7b876104784_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/65999fcedd2aa7fc_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/65999fcedd2aa7fc_0
index 961fb88..e068d7c 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/65999fcedd2aa7fc_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/65999fcedd2aa7fc_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/7a5b5304f6d2d82e_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/7a5b5304f6d2d82e_0
index a0b5d46..913a84d 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/7a5b5304f6d2d82e_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/7a5b5304f6d2d82e_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/912b7625694c957f_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/912b7625694c957f_0
index 7aeda50..c715876 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/912b7625694c957f_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/912b7625694c957f_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a4998faba9773fed_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a4998faba9773fed_0
index 7f712fe..2e4f955 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a4998faba9773fed_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a4998faba9773fed_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a5357004b662667b_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a5357004b662667b_0
index 1213bbf..3323cea 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a5357004b662667b_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a5357004b662667b_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a56309fd0965790c_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a56309fd0965790c_0
index 9232570..3053045 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a56309fd0965790c_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/a56309fd0965790c_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c289e89096398de5_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c289e89096398de5_0
index b314263..da4e227 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c289e89096398de5_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c289e89096398de5_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c449ac879821a2d7_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c449ac879821a2d7_0
index cb91dd4..ba0af64 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c449ac879821a2d7_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/c449ac879821a2d7_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/d26d26aec9c95f8f_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/d26d26aec9c95f8f_0
index a7e6348..33e935c 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/d26d26aec9c95f8f_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/d26d26aec9c95f8f_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/fbe62d242db699db_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/fbe62d242db699db_0
index 534e823..343a34b 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/fbe62d242db699db_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/fbe62d242db699db_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/index-dir/the-real-index b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/index-dir/the-real-index
index bf93b12..5d201dd 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/index-dir/the-real-index and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Code Cache/js/index-dir/the-real-index differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DIPS b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DIPS
index ebb3620..20204c1 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DIPS and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DIPS differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DawnCache/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DawnCache/data_1
index 4f0979b..f047871 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DawnCache/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/DawnCache/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeEDrop/EdgeEDropSQLite.db b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeEDrop/EdgeEDropSQLite.db
index 3cbcc40..5f9315a 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeEDrop/EdgeEDropSQLite.db and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeEDrop/EdgeEDropSQLite.db differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeHubAppUsage/EdgeHubAppUsageSQLite.db b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeHubAppUsage/EdgeHubAppUsageSQLite.db
index be03900..7971555 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeHubAppUsage/EdgeHubAppUsageSQLite.db and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/EdgeHubAppUsage/EdgeHubAppUsageSQLite.db differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG
index a2d6999..559b7f2 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.371 44a8 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
-2023/12/18-10:15:50.371 44a8 Recovering log #3
-2023/12/18-10:15:50.372 44a8 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
+2024/01/19-08:39:49.017 5cc0 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
+2024/01/19-08:39:49.017 5cc0 Recovering log #3
+2024/01/19-08:39:49.155 5cc0 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG.old
index 2082c19..a2d6999 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG.old	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG.old	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.831 b0dc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
-2023/12/18-10:15:20.832 b0dc Recovering log #3
-2023/12/18-10:15:20.832 b0dc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
+2023/12/18-10:15:50.371 44a8 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
+2023/12/18-10:15:50.371 44a8 Recovering log #3
+2023/12/18-10:15:50.372 44a8 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Favicons b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Favicons
index 7af8bc4..5ce19d9 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Favicons and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Favicons differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_0
index 02c353f..99a431f 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_1
index 3c376be..39974cd 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_2 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_2
index 3dfe7cb..7a1d330 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_2 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_2 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_3 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_3
index f6c6678..aa5175d 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_3 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/GPUCache/data_3 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/History b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/History
index 84268df..806630a 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/History and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/History differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/HubApps Icons b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/HubApps Icons
new file mode 100644
index 0000000..d4612db
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/HubApps Icons differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/HubApps Icons-journal b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/HubApps Icons-journal
new file mode 100644
index 0000000..e69de29
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG
index 6074cb0..0ed8921 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.361 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
-2023/12/18-10:15:50.364 cca4 Recovering log #3
-2023/12/18-10:15:50.366 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
+2024/01/19-08:39:49.022 ef9c Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
+2024/01/19-08:39:49.024 ef9c Recovering log #3
+2024/01/19-08:39:49.026 ef9c Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG.old
index e68ae87..6074cb0 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG.old	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG.old	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.824 c8bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
-2023/12/18-10:15:20.827 c8bc Recovering log #3
-2023/12/18-10:15:20.831 c8bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
+2023/12/18-10:15:50.361 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
+2023/12/18-10:15:50.364 cca4 Recovering log #3
+2023/12/18-10:15:50.366 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Preferences b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Preferences
index 1500a4d..bc74143 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Preferences
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Preferences
@@ -1 +1 @@
-{"aadc_info":{"age_group":0},"account_tracker_service_last_update":"13347335700154236","alternate_error_pages":{"backup":true,"enabled":false},"autocomplete":{"retention_policy_last_version":120},"autofill":{"autostuff_enabled":false,"credit_card_enabled":false,"custom_data_enabled":false,"custom_data_fill_enabled":false,"custom_data_identify_info_from_form_enabled":false,"custom_data_save_enabled":false,"last_version_deduped":119},"browser":{"available_dark_theme_options":"All","has_seen_welcome_page":false},"browser_content_container_height":1034,"browser_content_container_width":1920,"browser_content_container_x":0,"browser_content_container_y":0,"countryid_at_install":17230,"credentials_enable_service":false,"dips_timer_last_update":"13347339308783833","domain_diversity":{"last_reporting_timestamp":"13347335699783219"},"dual_engine":{"consumer_mode":{"ie_user":false},"consumer_site_list_with_ie_entries":true,"consumer_sitelist_location":"https://go.microsoft.com/fwlink/?linkid=2171760&bucket=15","consumer_sitelist_version":"58","external_consumer_shared_cookie_data":{},"sitelist_data_2":{"*":{"cpc.geely.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"crm.milkt.co.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.fudian-bank.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.gx966888.com":{"/pb_jump.html":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.tzbank.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"erp.samsungfire.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"genesis.tempstaff.co.jp":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"griffin3.hk.yusen-logistics.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"hy.seiip.com":{"/sesi":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ibank.bankofshanghai.com":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"icoa.cn":{"/mov":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"js96008.com":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"kms.chamc.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"mail.on-nara.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"myerp.countrygarden.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"neis.goe.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"paperless.quantatw.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"pbccrc.org.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"qrycorporbank.bankofbbg.com":{"/certupdateindex.do":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"skynet.skhynix.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"whsggzy.wuhu.gov.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.apollon.local":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.etrading.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.on-nara.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.w4c.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"zcoas.zoomx.net":{"/zcoas":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}},"http":{"app.honglitronic.com:8009":{"/efnet":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"bssupplier.soma.hk":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"cmp.tfcn.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"crm.kehua.com:8010":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE7","engine":2,"merge_type":0}}},"erp.panemirates.ae:8181":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ipos.naivee.com":{"/ipos":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"jzsgl.coc.gov.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"mh.wu.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.crsg.cn:8888":{"/portal":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.djtu.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.ranken.com.cn":{"/services":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.zgysqy.com:8888":{"/services":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"pmzq.auction.artron.net":{"/pmzq/christies2012":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"tfcmp.tfcn.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"xjxtczyh.xtczyh.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}},"https":{"bank.ecitic.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"cnpos.chowsangsang.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"co.hfbank.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"corporatebank.bjrcb.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"corporbank-simp.icbc.com.cn":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"corporbank.icbc.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"dbank.hxb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"dm.ynby.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.sdb.com.cn":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE7","engine":2,"merge_type":0}}},"ebank.ynrcc.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"firmadigital.scba.gov.ar":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"free.icoa.cn":{"/v":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"gov.epeople.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"grdms.bit.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"i-hn.meiyijia.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ibank.bankofdl.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"jy.sdada.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.gbe.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.gne.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.goe.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.sen.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"os.ezca.org":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"rfid.chowtaifook.sz":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"sbank.hxb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"sso.int.tepco.co.jp":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"uk.pinewooddms.training":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"v.beeb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.zj96596.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}}},"sitelist_has_consumer_data":true},"edge":{"msa_sso_info":{"allow_for_non_msa_profile":true},"perf_center":{"performance_detector":true},"profile_sso_info":{"is_msa_first_profile":true,"msa_sso_algo_state":1},"services":{"signin_scoped_device_id":"97590431-9926-400b-8626-2663163d61a2"}},"edge_rewards":{"cache_data":"CAA=","coachmark_promotions":{},"hva_promotions":[],"refresh_status_muted_until":"13347342850270018"},"edge_ux_config":{"assignmentcontext":"","dataversion":"0","experimentvariables":{},"flights":{}},"enable_edge_collections":false,"extensions":{"alerts":{"initialized":true},"chrome_url_overrides":{},"last_chrome_version":"120.0.2210.77","pdf_upsell_triggered":false,"pinned_extension_migration":true,"pinned_extensions":[]},"fsd":{"retention_policy_last_version":120},"google":{"services":{"consented_to_sync":false}},"history":{"thumbnail_ui_visibility":false},"intl":{"selected_languages":"zh-CN,en,en-GB,en-US"},"language_dwell_time_average":{"zh-CN":14.200000000000003},"language_usage_count":{"zh-CN":25},"muid":{"last_sync":"13347335699783195","values_seen":[]},"optimization_guide":{"store_file_paths_to_delete":{}},"personalization_data_consent":{"personalization_in_context_consent_can_prompt":true,"personalization_in_context_count":0},"privacy_sandbox":{"anti_abuse_initialized":true,"first_party_sets_data_access_allowed_initialized":true},"profile":{"avatar_index":20,"content_settings":{"enable_quiet_permission_ui_enabling_method":{"notifications":1},"exceptions":{"3pcd_heuristics_grants":{},"3pcd_support":{},"access_to_get_all_screens_media_in_session":{},"accessibility_events":{},"anti_abuse":{},"app_banner":{},"ar":{},"auto_picture_in_picture":{},"auto_select_certificate":{},"automatic_downloads":{},"autoplay":{},"background_sync":{},"bluetooth_chooser_data":{},"bluetooth_guard":{},"bluetooth_scanning":{},"camera_pan_tilt_zoom":{},"clear_browsing_data_cookies_exceptions":{},"client_hints":{},"clipboard":{},"cookie_controls_metadata":{"http://127.0.0.1,*":{"last_modified":"13347339350431094","setting":{}}},"cookies":{},"durable_storage":{},"edge_ad_targeting":{},"edge_ad_targeting_data":{},"edge_enhance_images":{},"edge_sdsm":{},"edge_u2f_api_request":{},"edge_user_agent_token":{},"fedcm_active_session":{},"fedcm_idp_registration":{},"fedcm_idp_signin":{},"fedcm_share":{},"file_system_access_chooser_data":{},"file_system_access_extended_permission":{},"file_system_last_picked_directory":{},"file_system_read_guard":{},"file_system_write_guard":{},"formfill_metadata":{},"geolocation":{},"hid_chooser_data":{},"hid_guard":{},"http_allowed":{},"https_enforced":{},"idle_detection":{},"images":{},"important_site_info":{},"insecure_private_network":{},"intent_picker_auto_display":{},"javascript":{},"javascript_jit":{},"legacy_cookie_access":{},"local_fonts":{},"media_engagement":{},"media_stream_camera":{},"media_stream_mic":{},"midi":{},"midi_sysex":{},"mixed_script":{},"nfc_devices":{},"notification_interactions":{},"notification_permission_review":{},"notifications":{},"password_protection":{},"payment_handler":{},"permission_autoblocking_data":{},"permission_autorevocation_data":{},"popups":{},"private_network_chooser_data":{},"private_network_guard":{},"protected_media_identifier":{},"protocol_handler":{},"reduced_accept_language":{},"safe_browsing_url_check_data":{},"secure_network":{},"secure_network_sites":{},"sensors":{},"serial_chooser_data":{},"serial_guard":{},"site_engagement":{"http://127.0.0.1:18082,*":{"last_modified":"13347339350431772","setting":{"lastEngagementTime":1.334733935043176e+16,"lastShortcutLaunchTime":0.0,"pointsAddedToday":15.0,"rawScore":11.247826736731705}},"http://127.0.0.1:18083,*":{"last_modified":"13347339320872478","setting":{"lastEngagementTime":1.3347339320872468e+16,"lastShortcutLaunchTime":0.0,"pointsAddedToday":4.5,"rawScore":6.7188148007356165}}},"sleeping_tabs":{},"sound":{},"ssl_cert_decisions":{},"storage_access":{},"subresource_filter":{},"subresource_filter_data":{},"third_party_storage_partitioning":{},"token_binding":{},"top_level_storage_access":{},"trackers":{},"trackers_data":{},"tracking_org_exceptions":{},"tracking_org_relationships":{},"unused_site_permissions":{},"usb_chooser_data":{},"usb_guard":{},"vr":{},"webid_api":{},"webid_auto_reauthn":{},"window_placement":{}},"pref_version":1},"created_by_version":"119.0.2151.44","creation_time":"13343901635300422","edge_profile_id":"41559b29-9b11-46f9-b374-cb0c75bcb6de","has_seen_signin_fre":false,"last_engagement_time":"13347339350431761","last_time_obsolete_http_credentials_removed":1699428095.622958,"last_time_password_store_metrics_reported":1701740259.153955,"managed_user_id":"","name":"用户配置 1","network_pbs":{},"observed_session_time":{"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.44":219.0,"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.72":2.0,"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.97":26.0},"signin_fre_seen_time":"13343901635308812","were_old_google_logins_removed":true},"reset_prepopulated_engines":false,"resolve_navigation_errors_use_web_service":{"enabled":false},"safebrowsing":{"event_timestamps":{},"metrics_last_log_time":"13347335699"},"sessions":{"event_log":[{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346738991494937","type":2,"window_count":0},{"crashed":false,"time":"13346739089324420","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346739098708757","type":2,"window_count":0},{"crashed":false,"time":"13346745404397702","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346745414174876","type":2,"window_count":0},{"crashed":false,"time":"13346746136577302","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346746157617678","type":2,"window_count":0},{"crashed":false,"time":"13347335699766250","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347335703964126","type":2,"window_count":0},{"crashed":false,"time":"13347339281746823","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339284045097","type":2,"window_count":0},{"crashed":false,"time":"13347339295375949","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339297683595","type":2,"window_count":0},{"crashed":false,"time":"13347339308551460","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339319491469","type":2,"window_count":0},{"crashed":false,"time":"13347339320721443","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339323312345","type":2,"window_count":0},{"crashed":false,"time":"13347339350263676","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339352689851","type":2,"window_count":0}],"session_data_status":3},"settings":{"a11y":{"apply_page_colors_only_on_increased_contrast":true}},"signin":{"allowed":true},"smart_explore":{"on_image_hover":false},"spellcheck":{"dictionaries":["zh-CN"]},"tracking_protection":{"tracking_protection_3pcd_enabled":false},"translate_site_blacklist":[],"translate_site_blocklist_with_time":{},"user_experience_metrics":{"personalization_data_consent_enabled_last_known_value":false},"variations":{"state_reset_on_profile_load":{"timestamp":"13345708479742956"}},"visual_search":{"dma_state":2,"in_context_menu":false}}
\ No newline at end of file
+{"aadc_info":{"age_group":0},"account_tracker_service_last_update":"13350098389128406","alternate_error_pages":{"backup":true,"enabled":false},"autocomplete":{"retention_policy_last_version":120},"autofill":{"autostuff_enabled":false,"credit_card_enabled":false,"custom_data_enabled":false,"custom_data_fill_enabled":false,"custom_data_identify_info_from_form_enabled":false,"custom_data_save_enabled":false,"last_version_deduped":119},"browser":{"available_dark_theme_options":"All","has_seen_welcome_page":false},"browser_content_container_height":1034,"browser_content_container_width":1920,"browser_content_container_x":0,"browser_content_container_y":0,"countryid_at_install":17230,"credentials_enable_service":false,"dips_timer_last_update":"13350098388811717","domain_diversity":{"last_reporting_timestamp":"13350098389238954"},"dual_engine":{"consumer_mode":{"ie_user":false},"consumer_site_list_with_ie_entries":true,"consumer_sitelist_location":"https://go.microsoft.com/fwlink/?linkid=2171760&bucket=15","consumer_sitelist_version":"58","external_consumer_shared_cookie_data":{},"sitelist_data_2":{"*":{"cpc.geely.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"crm.milkt.co.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.fudian-bank.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.gx966888.com":{"/pb_jump.html":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.tzbank.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"erp.samsungfire.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"genesis.tempstaff.co.jp":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"griffin3.hk.yusen-logistics.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"hy.seiip.com":{"/sesi":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ibank.bankofshanghai.com":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"icoa.cn":{"/mov":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"js96008.com":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"kms.chamc.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"mail.on-nara.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"myerp.countrygarden.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"neis.goe.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"paperless.quantatw.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"pbccrc.org.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"qrycorporbank.bankofbbg.com":{"/certupdateindex.do":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"skynet.skhynix.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"whsggzy.wuhu.gov.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.apollon.local":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.etrading.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.on-nara.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.w4c.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"zcoas.zoomx.net":{"/zcoas":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}},"http":{"app.honglitronic.com:8009":{"/efnet":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"bssupplier.soma.hk":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"cmp.tfcn.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"crm.kehua.com:8010":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE7","engine":2,"merge_type":0}}},"erp.panemirates.ae:8181":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ipos.naivee.com":{"/ipos":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"jzsgl.coc.gov.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"mh.wu.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.crsg.cn:8888":{"/portal":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.djtu.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.ranken.com.cn":{"/services":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"oa.zgysqy.com:8888":{"/services":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"pmzq.auction.artron.net":{"/pmzq/christies2012":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"tfcmp.tfcn.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"xjxtczyh.xtczyh.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}},"https":{"bank.ecitic.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"cnpos.chowsangsang.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"co.hfbank.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"corporatebank.bjrcb.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"corporbank-simp.icbc.com.cn":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"corporbank.icbc.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"dbank.hxb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"dm.ynby.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ebank.sdb.com.cn":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE7","engine":2,"merge_type":0}}},"ebank.ynrcc.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"firmadigital.scba.gov.ar":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"free.icoa.cn":{"/v":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"gov.epeople.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"grdms.bit.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"i-hn.meiyijia.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"ibank.bankofdl.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"jy.sdada.edu.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.gbe.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.gne.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.goe.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"klef.sen.go.kr":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"os.ezca.org":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"rfid.chowtaifook.sz":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"sbank.hxb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"sso.int.tepco.co.jp":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"uk.pinewooddms.training":{"/":{"consumer":{"allow_redirect":true,"compat_mode":"IE8","engine":2,"merge_type":0}}},"v.beeb.com.cn":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}},"www.zj96596.com":{"/":{"consumer":{"allow_redirect":true,"engine":2,"merge_type":0}}}}},"sitelist_has_consumer_data":true},"edge":{"msa_sso_info":{"allow_for_non_msa_profile":true},"perf_center":{"performance_detector":true},"profile_sso_info":{"is_msa_first_profile":true,"msa_sso_algo_state":1},"services":{"signin_scoped_device_id":"73dc07e4-6900-49d8-89be-111d8540e0c8"}},"edge_rewards":{"cache_data":"CAA=","coachmark_promotions":{},"hva_promotions":[],"refresh_status_muted_until":"13350703188886194"},"edge_ux_config":{"assignmentcontext":"","dataversion":"0","experimentvariables":{},"flights":{}},"enable_edge_collections":false,"extensions":{"alerts":{"initialized":true},"chrome_url_overrides":{},"last_chrome_version":"120.0.2210.133","pdf_upsell_triggered":false,"pinned_extension_migration":true,"pinned_extensions":[]},"fsd":{"retention_policy_last_version":120},"google":{"services":{"consented_to_sync":false}},"history":{"thumbnail_ui_visibility":false},"intl":{"selected_languages":"zh-CN,en,en-GB,en-US"},"language_dwell_time_average":{"zh-CN":15.30769230769231},"language_usage_count":{"zh-CN":26},"muid":{"last_sync":"13350098388773304","values_seen":[]},"optimization_guide":{"store_file_paths_to_delete":{}},"personalization_data_consent":{"personalization_in_context_consent_can_prompt":true,"personalization_in_context_count":0},"privacy_sandbox":{"anti_abuse_initialized":true,"first_party_sets_data_access_allowed_initialized":true},"profile":{"avatar_index":20,"content_settings":{"enable_quiet_permission_ui_enabling_method":{"notifications":1},"exceptions":{"3pcd_heuristics_grants":{},"3pcd_support":{},"access_to_get_all_screens_media_in_session":{},"accessibility_events":{},"anti_abuse":{},"app_banner":{},"ar":{},"auto_picture_in_picture":{},"auto_select_certificate":{},"automatic_downloads":{},"autoplay":{},"background_sync":{},"bluetooth_chooser_data":{},"bluetooth_guard":{},"bluetooth_scanning":{},"camera_pan_tilt_zoom":{},"clear_browsing_data_cookies_exceptions":{},"client_hints":{},"clipboard":{},"cookie_controls_metadata":{"http://127.0.0.1,*":{"last_modified":"13350098389629464","setting":{}}},"cookies":{},"durable_storage":{},"edge_ad_targeting":{},"edge_ad_targeting_data":{},"edge_enhance_images":{},"edge_sdsm":{},"edge_u2f_api_request":{},"edge_user_agent_token":{},"fedcm_active_session":{},"fedcm_idp_registration":{},"fedcm_idp_signin":{},"fedcm_share":{},"file_system_access_chooser_data":{},"file_system_access_extended_permission":{},"file_system_last_picked_directory":{},"file_system_read_guard":{},"file_system_write_guard":{},"formfill_metadata":{},"geolocation":{},"hid_chooser_data":{},"hid_guard":{},"http_allowed":{},"https_enforced":{},"idle_detection":{},"images":{},"important_site_info":{},"insecure_private_network":{},"intent_picker_auto_display":{},"javascript":{},"javascript_jit":{},"legacy_cookie_access":{},"local_fonts":{},"media_engagement":{},"media_stream_camera":{},"media_stream_mic":{},"midi":{},"midi_sysex":{},"mixed_script":{},"nfc_devices":{},"notification_interactions":{},"notification_permission_review":{},"notifications":{},"password_protection":{},"payment_handler":{},"permission_autoblocking_data":{},"permission_autorevocation_data":{},"popups":{},"private_network_chooser_data":{},"private_network_guard":{},"protected_media_identifier":{},"protocol_handler":{},"reduced_accept_language":{},"safe_browsing_url_check_data":{},"secure_network":{},"secure_network_sites":{},"sensors":{},"serial_chooser_data":{},"serial_guard":{},"site_engagement":{"http://127.0.0.1:18082,*":{"last_modified":"13350098425320199","setting":{"lastEngagementTime":1.3350098425320184e+16,"lastShortcutLaunchTime":0.0,"pointsAddedToday":15.0,"rawScore":10.957284124295187}},"http://127.0.0.1:18083,*":{"last_modified":"13350098388861305","setting":{"lastEngagementTime":1.3350069559301992e+16,"lastShortcutLaunchTime":0.0,"pointsAddedToday":4.5,"rawScore":6.7188148007356165}}},"sleeping_tabs":{},"sound":{},"ssl_cert_decisions":{},"storage_access":{},"subresource_filter":{},"subresource_filter_data":{},"third_party_storage_partitioning":{},"token_binding":{},"top_level_storage_access":{},"trackers":{},"trackers_data":{},"tracking_org_exceptions":{},"tracking_org_relationships":{},"unused_site_permissions":{},"usb_chooser_data":{},"usb_guard":{},"vr":{},"webid_api":{},"webid_auto_reauthn":{},"window_placement":{}},"pref_version":1},"created_by_version":"119.0.2151.44","creation_time":"13343901635300422","edge_profile_id":"41559b29-9b11-46f9-b374-cb0c75bcb6de","has_seen_signin_fre":false,"last_engagement_time":"13350098425320183","last_time_obsolete_http_credentials_removed":1699428095.622958,"last_time_password_store_metrics_reported":1705624818.818423,"managed_user_id":"","name":"用户配置 1","network_pbs":{},"observed_session_time":{"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.44":219.0,"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.72":2.0,"feedback_rating_in_product_help_observed_session_time_key_119.0.2151.97":26.0,"feedback_rating_in_product_help_observed_session_time_key_120.0.2210.133":43.0},"signin_fre_seen_time":"13343901635308812","were_old_google_logins_removed":true},"reset_prepopulated_engines":false,"resolve_navigation_errors_use_web_service":{"enabled":false},"safebrowsing":{"event_timestamps":{},"metrics_last_log_time":"13347335699"},"sessions":{"event_log":[{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346739098708757","type":2,"window_count":0},{"crashed":false,"time":"13346745404397702","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346745414174876","type":2,"window_count":0},{"crashed":false,"time":"13346746136577302","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13346746157617678","type":2,"window_count":0},{"crashed":false,"time":"13347335699766250","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347335703964126","type":2,"window_count":0},{"crashed":false,"time":"13347339281746823","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339284045097","type":2,"window_count":0},{"crashed":false,"time":"13347339295375949","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339297683595","type":2,"window_count":0},{"crashed":false,"time":"13347339308551460","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339319491469","type":2,"window_count":0},{"crashed":false,"time":"13347339320721443","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339323312345","type":2,"window_count":0},{"crashed":false,"time":"13347339350263676","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13347339352689851","type":2,"window_count":0},{"crashed":false,"time":"13350098388755907","type":0},{"did_schedule_command":false,"first_session_service":true,"tab_count":0,"time":"13350098436909901","type":2,"window_count":0}],"session_data_status":3},"settings":{"a11y":{"apply_page_colors_only_on_increased_contrast":true}},"signin":{"allowed":true},"smart_explore":{"on_image_hover":false},"spellcheck":{"dictionaries":["zh-CN"]},"tracking_protection":{"tracking_protection_3pcd_enabled":false},"translate_site_blacklist":[],"translate_site_blocklist_with_time":{},"user_experience_metrics":{"personalization_data_consent_enabled_last_known_value":false},"variations":{"state_reset_on_profile_load":{"timestamp":"13345708479742956"}},"visual_search":{"dma_state":2,"in_context_menu":false}}
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG
index 8604968..add93e0 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.445 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
-2023/12/18-10:15:50.446 cca4 Recovering log #3
-2023/12/18-10:15:50.448 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
+2024/01/19-08:39:49.635 ef9c Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
+2024/01/19-08:39:49.636 ef9c Recovering log #3
+2024/01/19-08:39:49.716 ef9c Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG.old
index 2cb24dd..8604968 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG.old	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG.old	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.844 c8bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
-2023/12/18-10:15:20.845 c8bc Recovering log #3
-2023/12/18-10:15:20.848 c8bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
+2023/12/18-10:15:50.445 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
+2023/12/18-10:15:50.446 cca4 Recovering log #3
+2023/12/18-10:15:50.448 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG
index 60122d9..d5aa345 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.260 b7bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
-2023/12/18-10:15:50.261 b7bc Recovering log #3
-2023/12/18-10:15:50.261 b7bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
+2024/01/19-08:39:48.753 b84 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
+2024/01/19-08:39:48.754 b84 Recovering log #3
+2024/01/19-08:39:48.853 b84 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG.old
index 09bbc75..60122d9 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG.old	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG.old	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.719 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
-2023/12/18-10:15:20.719 aa58 Recovering log #3
-2023/12/18-10:15:20.719 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
+2023/12/18-10:15:50.260 b7bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
+2023/12/18-10:15:50.261 b7bc Recovering log #3
+2023/12/18-10:15:50.261 b7bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG
index 3231cf6..b5d4ca4 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.260 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
-2023/12/18-10:15:50.260 420 Recovering log #3
-2023/12/18-10:15:50.261 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
+2024/01/19-08:39:48.753 7f94 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
+2024/01/19-08:39:48.754 7f94 Recovering log #3
+2024/01/19-08:39:48.754 7f94 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG.old
index 961a778..3231cf6 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG.old	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG.old	
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.718 25a0 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
-2023/12/18-10:15:20.718 25a0 Recovering log #3
-2023/12/18-10:15:20.719 25a0 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
+2023/12/18-10:15:50.260 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
+2023/12/18-10:15:50.260 420 Recovering log #3
+2023/12/18-10:15:50.261 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Web Data b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Web Data
index 821e745..58668b6 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Web Data and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Web Data differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG
index e0fd59c..182d3fa 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.290 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
-2023/12/18-10:15:50.290 420 Recovering log #3
-2023/12/18-10:15:50.290 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
+2024/01/19-08:39:49.017 6bc4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
+2024/01/19-08:39:49.017 6bc4 Recovering log #3
+2024/01/19-08:39:49.167 6bc4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG.old
index ae52639..e0fd59c 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG.old
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG.old
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.747 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
-2023/12/18-10:15:20.747 aa58 Recovering log #3
-2023/12/18-10:15:20.748 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
+2023/12/18-10:15:50.290 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
+2023/12/18-10:15:50.290 420 Recovering log #3
+2023/12/18-10:15:50.290 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG
index 012642e..5d93a23 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG
@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.286 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
-2023/12/18-10:15:50.287 420 Recovering log #3
-2023/12/18-10:15:50.287 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
+2024/01/19-08:39:48.776 6bc4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
+2024/01/19-08:39:48.776 6bc4 Recovering log #3
+2024/01/19-08:39:48.838 6bc4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG.old b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG.old
index 291635b..012642e 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG.old
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG.old
@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.744 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
-2023/12/18-10:15:20.744 aa58 Recovering log #3
-2023/12/18-10:15:20.744 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
+2023/12/18-10:15:50.286 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
+2023/12/18-10:15:50.287 420 Recovering log #3
+2023/12/18-10:15:50.287 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_0 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_0
index 8df3c47..20adda9 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_0 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_0 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_1
index 455f661..fc0b97f 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_3 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_3
index 359818c..93e21c4 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_3 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/data_3 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000027 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000027
new file mode 100644
index 0000000..2b6f52e
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000027 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000028 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000028
new file mode 100644
index 0000000..3947445
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000028 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000029 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000029
new file mode 100644
index 0000000..e11016b
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GrShaderCache/f_000029 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GraphiteDawnCache/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GraphiteDawnCache/data_1
index 60ece6c..8d14116 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GraphiteDawnCache/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/GraphiteDawnCache/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Last Version b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Last Version
index 8619105..3ec2dcd 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Last Version	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Last Version	
@@ -1 +1 @@
-120.0.2210.77
\ No newline at end of file
+120.0.2210.133
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Local State b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Local State
index 2914a7f..37889ef 100644
--- a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Local State	
+++ b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Local State	
@@ -1 +1 @@
-{"cloned_install":{"count":4,"first_timestamp":"1699945468","last_timestamp":"1701234879"},"desktop_session_duration_tracker":{"last_session_end_timestamp":"1701740520"},"domain_actions_config":"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","dual_engine":{"consumer_mode":{"ie_usage_checked":"13344419645319234","ie_usage_times":[]},"ie_to_edge":{"redirection_mode":2}},"edge":{"mitigation_manager":{"renderer_app_container_compatible_count":12,"renderer_code_integrity_compatible_count":56},"tab_stabs":{"closed_without_unfreeze_never_unfrozen":0,"closed_without_unfreeze_previously_unfrozen":0,"discard_without_unfreeze_never_unfrozen":0,"discard_without_unfreeze_previously_unfrozen":0},"tab_stats":{"frozen_daily":0,"unfrozen_daily":0}},"edge_ci":{"num_healthy_browsers_since_failure":1},"fre":{"oem_bookmarks_set":true},"hardware_acceleration_mode_previous":true,"is_dsp_recommended":true,"legacy":{"profile":{"name":{"migrated":true}}},"network_time":{"network_time_mapping":{"local":1.702865709001546e+12,"network":1.702865708e+12,"ticks":419387844324.0,"uncertainty":1485904.0}},"os_crypt":{"audit_enabled":true,"encrypted_key":"RFBBUEkBAAAA0Iyd3wEV0RGMegDAT8KX6wEAAACrCWHbEcQHR7T7CZYlHLTzEAAAAB4AAABNAGkAYwByAG8AcwBvAGYAdAAgAEUAZABnAGUAAAAQZgAAAAEAACAAAADc9od9BkjFuFL4i3GQZl5gLMUEs4JtQDjiQhM9X0/aGQAAAAAOgAAAAAIAACAAAABzUidaYqQ6iFpXcwxQ7K1OYqnlWW/SYuQ/a3B7A2Ge5jAAAADYKQovTliGidHCe4r/VD9n/yBg/Mv5qHx/UQGJn2NlqpNn+zOeEkDBdWhxTvCiA/lAAAAASS1v0lLHwTnscTbLtNlm/q4bGHjrK5+NXRRlmg+p4EV2ByeF0c/S8qlYDGWFxsOxo1vcmOZr7fDA0MNhO3g7+A=="},"policy":{"last_statistics_update":"13347335699677277"},"profile":{"info_cache":{"Default":{"active_time":1701740504.038307,"avatar_icon":"chrome://theme/IDR_PROFILE_AVATAR_20","background_apps":false,"edge_account_cid":"","edge_account_first_name":"","edge_account_last_name":"","edge_account_oid":"","edge_account_sovereignty":0,"edge_account_tenant_id":"","edge_account_type":0,"edge_kids_mode":false,"edge_no_window_mode_incompatible_extension":false,"edge_test_on_premises":false,"edge_wam_aad_for_app_account_type":0,"force_signin_profile_locked":false,"gaia_given_name":"","gaia_id":"","gaia_name":"","hosted_domain":"","is_consented_primary_account":false,"is_ephemeral":false,"is_using_default_avatar":true,"is_using_default_name":true,"managed_user_id":"","metrics_bucket_index":1,"name":"用户配置 1","signin.with_credential_provider":false,"user_name":""}},"last_active_profiles":[],"metrics":{"next_bucket_index":2},"profile_counts_reported":"13347335699642279","profiles_order":["Default"]},"profile_network_context_service":{"http_cache_finch_experiment_groups":"None None None None"},"profiles":{"edge":{"multiple_profiles_with_same_account":false},"edge_sso_info":{"msa_first_profile_key":"Default","msa_sso_algo_state":1},"signin_last_seen_version":"120.0.2210.77","signin_last_updated_time":1702862099.770051},"sentinel_creation_time":"0","session_id_generator_last_value":"2065783425","startup_boost":{"last_browser_open_time":"13347339352689813"},"subresource_filter":{"ruleset_version":{"checksum":0,"content":"","format":0}},"tab_stats":{"discards_external":0,"discards_proactive":0,"discards_urgent":0,"last_daily_sample":"13347335699662095","max_tabs_per_window":1,"reloads_external":0,"reloads_urgent":0,"total_tab_count_max":1,"window_count_max":1},"telemetry_client":{"cloned_install":{"user_data_dir_id":13279226},"governance":{"last_known_cps":0},"host_telclient_path":"QzpcUHJvZ3JhbSBGaWxlcyAoeDg2KVxNaWNyb3NvZnRcRWRnZVdlYlZpZXdcQXBwbGljYXRpb25cMTIwLjAuMjIxMC43N1x0ZWxjbGllbnQuZGxs","sample_id":46724206},"uninstall_metrics":{"installation_date2":"1699428035"},"updateclientdata":{"apps":{"ahmaebgpfccdhgidjaidaoojjcijckba":{"cohort":"rrf@0.78","cohortname":"","installdate":-1},"alpjnmnfbgfkmmpcfpejmmoebdndedno":{"cohort":"rrf@0.51","cohortname":"","installdate":-1},"eeobbhfgfagbclfofmgbdfoicabjdbkn":{"cohort":"rrf@0.19","cohortname":"","installdate":-1},"fgbafbciocncjfbbonhocjaohoknlaco":{"cohort":"rrf@0.73","cohortname":"","installdate":-1},"fppmbhmldokgmleojlplaaodlkibgikh":{"cohort":"rrf@0.46","cohortname":"","installdate":-1},"jbfaflocpnkhbgcijpkiafdpbjkedane":{"cohort":"rrf@0.05","cohortname":"","installdate":-1},"jflhchccmppkfebkiaminageehmchikm":{"cohort":"rrf@0.38","cohortname":"","installdate":-1},"kpfehajjjbbcifeehjgfgnabifknmdad":{"cohort":"rrf@0.09","cohortname":"","installdate":-1},"ndikpojcjlepofdkaaldkinkjbeeebkl":{"cohort":"rrf@0.15","cohortname":"","installdate":-1},"oankkpibpaokgecfckkdkgaoafllipag":{"cohort":"rrf@0.60","cohortname":"","installdate":-1},"ohckeflnhegojcjlcpbfpciadgikcohk":{"cohort":"rrf@0.61","cohortname":"","installdate":-1},"ojblfafjmiikbkepnnolpgbbhejhlcim":{"cohort":"rrf@0.06","cohortname":"","installdate":-1}}},"user_experience_metrics":{"client_id2":"{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}C:\\Users\\fang0s:19147D95-88B0-41E8-8510-98B02F5D6E70","diagnostics":{"last_data_collection_level_on_launch":1},"last_seen":{"CrashpadMetrics":"0"},"low_entropy_source3":6095,"machine_id":7385421,"payload_counter":1,"pseudo_low_entropy_source":7151,"reset_client_id_deterministic":true,"session_id":58,"stability":{"browser_last_live_timestamp":"13347339352691083","exited_cleanly":true,"stats_buildtime":"1702538041","stats_version":"120.0.2210.77-64","system_crash_count":0}},"variations":{"state_reset":{"timestamp":"13345708479672715"}},"variations_compressed_seed":"H4sIAAAAAAAAAJVW2W7bOBT9F76OmIqi1hTz4NrZpkmqiW0ExbgwaOlGIiKRGpJK4gb59wElb2miBuMHA9f3nHNXkn5GYynueHEx0egYPS/QyXi6QMcLlOIbTNzYCyIXE0yIk+IJ9j0ax9jD4QI5C3SSF9Cz9wwS+dTzMMW+09uhGwQeJphu7MAjcYgpTja2Hyc+OcBT6kfRgU1oQAn2d3g3DkIPhzhythkSN8EUhxs7ikjkYrqN54Yu9XxMcLCxA5/4tqKNvusnCYn3+bkkdmlgK3a7H8LYj3ycYOL1phuSCEfY671+QCOKYxz36n7ohQH2fRtm16GJrBkXo8xwKfRBaxPq+V2gbeY0SmiIybZS1/PDhB7YcejaQmifeRRT16JJ3Js09Dqz70tEXC/AASZ9WSElNjHs9bEC6vkUe5se+q6bUEy3ThpHvo8jnPReSuIkwR7BfuR2O0AIjemuZROcxJQSHGLq7Uo+5Uqbm1b8uhxuFMRdHlEHnUJRgzDMduZgg4IkiYP9xAihCQmwF+B40wgb0XaizzcM3Wg/QGtFO3LoxrFdvn54PnXj/Sr6nq2TYG+BXpBzsMzo+LmzjiZcs1UFo9U6l3oCd6CmYM6ZyB8VN1wUU8MMWHTeA0+BmVaBRsf/oFp/QPvx4ryKcg3mUar7sRQCMsMfuFkPSJ8I+8sZmHco51yYUXqxU08V1/W0ZsqcPDWVVHADBZfiUmb3g4l/E+fywSbNVFZeiCnPYcUUclCt+9Cd6EZPjVojU6m5HeIQZqN4KtWoquaq0h3wFeTVKXnrnpUK4EtrjBR6vi9vWsqm4aJIFc9gLOuGKRjll0wU3x5AKZ4fjBTE21K3/Dlr+MlTQ38rfAO6kUL/P0nSS9aNWb89Ge9rANyprKN95VU1feQmK8ezcTpvcmYs5N25jUEZfsczZmCmmNA2Y5Gtbe5SgDA9247xK6xTLgQXxRvn66BzDdejWeifSnWRPviX3IBi1UD8AbBVvJQst0vPteGZvpRF0Xd2cAN/JTymim9oneB2uCcPIIwemkTvHVWVfLzk2qAfDmqYYjUYUBbyjASrAR1voVvVDuygB1a11nvFMyW1vDNHt7D6ouSjBnXUHalppgDE0VyzAhzieJ8/hKag7qSqmcgswf+MXg7LOefayEKxerCkPeLMHihhhT6qbcf5sL6TJwNC2wN4dCG0YVU1lq0wt9yUV2DYhBnmEMeh3ibvv+cXY5vp+5GzkgkB1UGkU/Ti7NzQyKw8cFK3/xxiFBi7yjU3xvZiKcXykStYGl6DbM2y5lXFNWRS5PpAyrMqNsFpnpX9dTS4I/as51nZrdUMKqjBqHUqmymrmwq6b7t1A/RTqTLY0XZop9vhYgbazAW3E59wbRRftfZ62w1keGqFkm3j7dJ4Vdthg3K4Y21lziz8PfQrcHtfD0ra8m9hNWpNmTKt72Gt5xf2JgDV3wUDZ3XDAWHszcOl2LO7lt5KVeXjtjmtJDPrzVPXG1cyH348DyBW5p5X1UoBy0ohDc+GedetMq3iovjSoSdgoHtSrnua1WpFw7L7JWyXfamgsNNZL0umy2VWwm/ext0RudmQzpkuxx3F+a37ihtedHczL4rupn1x0DmwvJv8M+pOmlqPu6ag8bX9RzJjBTpGC9QQvrr5Vz59Sv8I/4rXGvj08sb7/mmm3LhSwWj1nXlrnp79LPSfC4ReXv4D/ajzYtULAAA=","variations_config_ids":"{\"ECS\":\"P-R-1082570-1-11,P-D-42388-2-6\",\"EdgeConfig\":\"P-R-1174322-3-4,P-R-1160552-1-3,P-R-1152186-3-9,P-R-1148941-3-4,P-R-1133477-3-4,P-R-1113531-4-9,P-R-1108562-6-7,P-R-1082109-3-6,P-R-1077170-3-3,P-R-1060324-1-5,P-R-1054140-1-4,P-R-1049918-1-3,P-R-1018035-1-10,P-R-68474-9-12,P-R-60617-7-20,P-R-45373-8-85,P-R-46265-44-105\",\"EdgeDomainActions\":\"P-R-1093245-1-16,P-R-1037936-1-9,P-R-1024693-1-9,P-R-108604-1-34,P-R-78306-1-18,P-R-73626-1-17,P-R-71025-5-13,P-R-63165-4-26,P-R-53243-2-7,P-R-40093-3-26,P-R-38744-7-97,P-R-31899-21-470,P-D-1138318-1-3,P-D-98331-6-32\",\"EdgeFirstRunConfig\":\"P-R-1075865-4-7\",\"Segmentation\":\"P-R-1159985-1-5,P-R-1113915-25-8,P-R-1098334-1-6,P-R-66078-1-3,P-R-66077-1-5,P-R-60882-1-2,P-R-43082-1-3,P-R-42744-1-2\"}","variations_country":"CN","variations_crash_streak":0,"variations_failed_to_fetch_seed_streak":0,"variations_google_groups":{"Default":[]},"variations_last_fetch_time":"13347339311022086","variations_last_runtime_fetch_time":"13347335701372206","variations_permanent_consistency_country":["120.0.2210.77","CN"],"variations_runtime_compressed_seed":"H4sIAAAAAAAAAG2PTW+CQBRF/8rkrSEOg6GFxI0jFdNIGyXUoi6wPAhQPjJAU0vmvztad+323pObc0dwkww3Q93nFfKmTvMMnBHcqu3P/zZYx6dPfMK4HwR24OwBUXzAUUoNPIwTFN1tIIgVDgfIcB6lgx0977biJ8DOX8/DpcffraqcBMXAUt6G3otZ5kU2OwBo4H63+W0Z3jDRCLOJ33wRRplJqOUYU2dqkOU6UCRvlJw48yZBRXNfRdteeXX3hFEK8opd3VeLX6+/n+BV3+gGNR8fLKoz3QYpL+0ba0gWAQAA","variations_safe_compressed_seed":"H4sIAAAAAAAAAJVWW2/iOBT+L36OqzjOtaN9YKBM2emFKbAd7TKqTHIaLBI7sh0YpuK/r5xw67TZanlAOjnf952rnbygvhTPPB8NNLpEL3N01Z/M0eUcjfEDJm7sBZGLCSbEGeMB9j0ax9jD4Rw5c3SV5dCyTwwSukHgYYKp09qBR+IQUxzvbT9OfIIp9vc2pX4UndmEBpRgHyd7242D0MMhjpxDRsRNMMXh3o4iErmYHuK5oUs9HxMc7O3AJ76tYK/v+klC4lN+LoldGtgK3eZBGPuRjxNMvNZ0QxLhCHut1w9oRHGM41bdD70wwL5vwxw7MpAl46KXGi6FPmtlQj2/CXTInEYJDTE5VOp6fpjQMzsOXVsIbTOPYupaNGkbGdHQa8y2LxFxvQAHmLRlhZTYxLDXxgqo51Ps7Xvou25CMT04aRz5Po5w0nopiZMEewT7kdvMnBAa02PLBjiJKSU4xJQcSx5ypc1DLX5fBjcK4iaPqIFOIC9BGGY7c7YxQZLEwWlihNCEBNgLDivj2oi2E22+YehGpwFaKzqSQzeO7fK1w/OpG59W0fdsnQR7c7RDztnyosuXxroYcM0WBfQW20zqATyDmoC5ZiLbKG64yCeGGbDorAUOgZlagUaX/6BSf0D7sXNeRbkDs5Fq1ZdCQGr4mptth/SVsE++gHmHcs2F6Y1HR/Wx4rqclEyZq59VIRU8QM6luJHpqjPxe3Et1zZpptLlSEx4BgumkINK3YZuRPd6qlcbOZaa2yF2YfaKQ6l6RTFThW6AryCvTslb93SpAD7XxkihZ6fyJktZVVzkY8VT6MuyYgp62Q0T+f0alOLZ2UhBvC31wJ+xil/9rOh/Cj+ArqTQ/0+StJJlZbZvT8b7GgDPKm1oX3lRTDbcpMv+tD+eVRkzFvLu3PqgDH/mKTMwVUxom7FItzZ3KUCYlm3H+BW2Yy4EF/kb5+ugMw13vWnoD6Uajdf+DTegWNERvwNsFW8ky+zSc214qm9knred7dzA3wmbseJ7WiN4GO7VGoTRXZNovb2ikJsbrg364aCKKVaCAWUhL0iwEtDlAXpQbcAOWrOitt5bniqp5bO5eITFZyU3GtRFc6QmqQIQFzPNcnCI4336EDoG9SxVyURqCf4ntDsv55prI3PFys6STogv9kAJK/RRbUfOh/Vd/TQgtD2AFyOhDSuKvqyFeeRmeQuGDZhhDnEc6u3z/jYb9W2m70dOl0wIKM4iDdHOObqhkunyzEnd9neOUWDsKpfcGNuLJymeNlzBk+ElyNo8lbwouIZUikyfSXlWxSY4ydJlex117og961m6bNZqCgWUYNR2LKsJK6sCmn+7dR30oVQpHGlHtNPscD4FbWaC24kPuDaKL2p7vR0H0j21XMm68o5pvKrtvEEZPLO6MF8s/D30K3C9KjslbfmPsOjVZjlmWq9gq2cjexOAau+CjrO654Aw9ubhUpzYTUsfpSqyfl0NC8nMdv+qa41bmXW/PM8gVmbFi2KhgKVLIQ1Pu3l3tTK14iL/3KAHYKB5pdy1tB+7nYOugWVNv19Qs99q229SQf07+x0wZTm6RHNkfgXLfLS69Qf33/9c3f9K1d+Lsvq+Wd8tH8t1OUxWbKD60V/et80fc4R2u38BFZQvEzsLAAA=","variations_safe_seed_date":"13347011641000000","variations_safe_seed_fetch_time":"13346738053401545","variations_safe_seed_locale":"zh-CN","variations_safe_seed_milestone":120,"variations_safe_seed_permanent_consistency_country":"CN","variations_safe_seed_session_consistency_country":"CN","variations_safe_seed_signature":"","variations_seed_client_version_at_store":"120.0.2210.77","variations_seed_date":"13347339308000000","variations_seed_etag":"\"p1ibRqox/P+6J8yseiSLR2Y/Tr08lr5AbYa2yiPGzgs=\"","variations_seed_milestone":120,"variations_seed_runtime_etag":"\"geBZfu9ZKXSrzTesNMBVGHCY6mk/Tju2fCpVHO3kijg=\"","variations_seed_signature":"","was":{"restarted":false},"web_widget":{"disabled_due_extensions":false}}
\ No newline at end of file
+{"cloned_install":{"count":4,"first_timestamp":"1699945468","last_timestamp":"1701234879"},"desktop_session_duration_tracker":{"last_session_end_timestamp":"1705624836"},"domain_actions_config":"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","dual_engine":{"consumer_mode":{"ie_usage_checked":"13344419645319234","ie_usage_times":[]},"ie_to_edge":{"redirection_mode":2}},"edge":{"mitigation_manager":{"renderer_app_container_compatible_count":13,"renderer_code_integrity_compatible_count":57},"tab_stabs":{"closed_without_unfreeze_never_unfrozen":0,"closed_without_unfreeze_previously_unfrozen":0,"discard_without_unfreeze_never_unfrozen":0,"discard_without_unfreeze_previously_unfrozen":0},"tab_stats":{"frozen_daily":0,"unfrozen_daily":0}},"edge_ci":{"num_healthy_browsers_since_failure":1},"fre":{"oem_bookmarks_set":true},"hardware_acceleration_mode_previous":true,"is_dsp_recommended":true,"legacy":{"profile":{"name":{"migrated":true}}},"network_time":{"network_time_mapping":{"local":1.705624790246107e+12,"network":1.705624789e+12,"ticks":346325146826.0,"uncertainty":1389014.0}},"os_crypt":{"audit_enabled":true,"encrypted_key":"RFBBUEkBAAAA0Iyd3wEV0RGMegDAT8KX6wEAAACrCWHbEcQHR7T7CZYlHLTzEAAAAB4AAABNAGkAYwByAG8AcwBvAGYAdAAgAEUAZABnAGUAAAAQZgAAAAEAACAAAADc9od9BkjFuFL4i3GQZl5gLMUEs4JtQDjiQhM9X0/aGQAAAAAOgAAAAAIAACAAAABzUidaYqQ6iFpXcwxQ7K1OYqnlWW/SYuQ/a3B7A2Ge5jAAAADYKQovTliGidHCe4r/VD9n/yBg/Mv5qHx/UQGJn2NlqpNn+zOeEkDBdWhxTvCiA/lAAAAASS1v0lLHwTnscTbLtNlm/q4bGHjrK5+NXRRlmg+p4EV2ByeF0c/S8qlYDGWFxsOxo1vcmOZr7fDA0MNhO3g7+A=="},"policy":{"last_statistics_update":"13350098388514367"},"profile":{"info_cache":{"Default":{"active_time":1705624793.123095,"avatar_icon":"chrome://theme/IDR_PROFILE_AVATAR_20","background_apps":false,"edge_account_cid":"","edge_account_first_name":"","edge_account_last_name":"","edge_account_oid":"","edge_account_sovereignty":0,"edge_account_tenant_id":"","edge_account_type":0,"edge_kids_mode":false,"edge_no_window_mode_incompatible_extension":false,"edge_test_on_premises":false,"edge_wam_aad_for_app_account_type":0,"force_signin_profile_locked":false,"gaia_given_name":"","gaia_id":"","gaia_name":"","hosted_domain":"","is_consented_primary_account":false,"is_ephemeral":false,"is_using_default_avatar":true,"is_using_default_name":true,"managed_user_id":"","metrics_bucket_index":1,"name":"用户配置 1","signin.with_credential_provider":false,"user_name":""}},"last_active_profiles":[],"metrics":{"next_bucket_index":2},"profile_counts_reported":"13350098388477781","profiles_order":["Default"]},"profile_network_context_service":{"http_cache_finch_experiment_groups":"None None None None"},"profiles":{"edge":{"multiple_profiles_with_same_account":false},"edge_sso_info":{"msa_first_profile_key":"Default","msa_sso_algo_state":1},"signin_last_seen_version":"120.0.2210.133","signin_last_updated_time":1705624788.759251},"sentinel_creation_time":"0","session_id_generator_last_value":"2065783478","startup_boost":{"last_browser_open_time":"13350098436909785"},"subresource_filter":{"ruleset_version":{"checksum":0,"content":"","format":0}},"tab_stats":{"discards_external":0,"discards_proactive":0,"discards_urgent":0,"last_daily_sample":"13350098388500184","max_tabs_per_window":1,"reloads_external":0,"reloads_urgent":0,"total_tab_count_max":1,"window_count_max":1},"telemetry_client":{"cloned_install":{"user_data_dir_id":13279226},"governance":{"last_known_cps":0},"host_telclient_path":"QzpcUHJvZ3JhbSBGaWxlcyAoeDg2KVxNaWNyb3NvZnRcRWRnZVdlYlZpZXdcQXBwbGljYXRpb25cMTIwLjAuMjIxMC4xMzNcdGVsY2xpZW50LmRsbA==","sample_id":46724206},"uninstall_metrics":{"installation_date2":"1699428035"},"updateclientdata":{"apps":{"ahmaebgpfccdhgidjaidaoojjcijckba":{"cohort":"rrf@0.78","cohortname":"","installdate":-1},"alpjnmnfbgfkmmpcfpejmmoebdndedno":{"cohort":"rrf@0.51","cohortname":"","installdate":-1},"eeobbhfgfagbclfofmgbdfoicabjdbkn":{"cohort":"rrf@0.19","cohortname":"","installdate":-1},"fgbafbciocncjfbbonhocjaohoknlaco":{"cohort":"rrf@0.73","cohortname":"","installdate":-1},"fppmbhmldokgmleojlplaaodlkibgikh":{"cohort":"rrf@0.46","cohortname":"","installdate":-1},"jbfaflocpnkhbgcijpkiafdpbjkedane":{"cohort":"rrf@0.05","cohortname":"","installdate":-1},"jflhchccmppkfebkiaminageehmchikm":{"cohort":"rrf@0.38","cohortname":"","installdate":-1},"kpfehajjjbbcifeehjgfgnabifknmdad":{"cohort":"rrf@0.09","cohortname":"","installdate":-1},"ndikpojcjlepofdkaaldkinkjbeeebkl":{"cohort":"rrf@0.15","cohortname":"","installdate":-1},"oankkpibpaokgecfckkdkgaoafllipag":{"cohort":"rrf@0.60","cohortname":"","installdate":-1},"ohckeflnhegojcjlcpbfpciadgikcohk":{"cohort":"rrf@0.61","cohortname":"","installdate":-1},"ojblfafjmiikbkepnnolpgbbhejhlcim":{"cohort":"rrf@0.06","cohortname":"","installdate":-1}}},"user_experience_metrics":{"client_id2":"{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}C:\\Users\\fang0s:19147D95-88B0-41E8-8510-98B02F5D6E70","diagnostics":{"last_data_collection_level_on_launch":1},"last_seen":{"CrashpadMetrics":"0"},"low_entropy_source3":6095,"machine_id":7385421,"payload_counter":1,"pseudo_low_entropy_source":7151,"reset_client_id_deterministic":true,"session_id":59,"stability":{"browser_last_live_timestamp":"13350098436912013","exited_cleanly":true,"stats_buildtime":"1704936675","stats_version":"120.0.2210.133-64","system_crash_count":0}},"variations":{"state_reset":{"timestamp":"13345708479672715"}},"variations_compressed_seed":"H4sIAAAAAAAAAJVW207jOhT9Fz/HKLZzZTQPpYWhGmA6lIpz6agyySaxSOyM7cBUiH8/ctIbAxl0+lBpd6+19tV2n9FYyXtRTCcGHaPnJTodz5foeIlm+BoTP6Fh7GOCCfFmeIIDypIEUxwtkbdEp3kBPXvPIHFM/RATHHgbO2CUYrazIz8MKSaYbeyQkiTCDKcbO0jSgBzgGQvi+MAmLGQEBzu8n4QRxRGOvW3GxE8xw9HGjmMS+5ht4/mRz2iACQ43dhiQwN/n6wdpSpJ9fj5JfObqIX73Q5QEcYBTTGhv+hGJcYxp7w1CFjOc4KRXDyIahTgIXJhdxyaq5kKOMiuUNAetThkNukDbzFmcsgiTbaU+DaKU7TMhfhL5rhLWpx4nzHdwkvQmi2hn9o2JiU9DHGLS1xUx4jLDtA8WMhowTDdNDHw/ZZhtnSyJgwDHOO29jCRpiinBQex3S0EIS9iuZxOcJowRHGFGdzWfCW3sdSt/3xY/DpMuj7iDzqGoQVruWnOwUmGaJuF+ZISwlISYhjjZNMJFdJ3o840iP95P0Fnxjhz5SeK2r59ewPxkv4sBdXUSTJfoBXkH242On9FEGH5XwTXIHDToUdOMlbRcSNDOnffuM+C21WDQ8b/oXeiPl174aKM3ulvnykzgHvQc7DmX+ZMWVshibrmFAeXafED7PcoV2CelH8ZKSsiseBR2PSB9Kt0vX8C+QzkX0o5m0536TAtTz2uu7emvplIarqEQSl6o7GEw8W/yXD26pLnOyqmcixzuuEYeqk0fuhPd6OlRa9VMGeH2YQizUTxTelRVC12ZDvgK8urEvXXflBrgpLVWSbPYlzcvVdMIWcy0yGCs6oZrGOUXXBbfHkFrkR9sB8i3pW75C96I018N+6PwNZhGSfP/JEkvWTd2/faQva8BcK+zjvZVVNX8SdisHN+MZ4sm59ZB3p3bGLQV9yLjFm40l8ZlLLO1y11JkLZnuzF+hfVMSClk8cb5OujCwNXoJgrOlJ7OHoMLYUHzaiD+ANgpXiieu6UXxorMXKii6Ds7uIG/E55mWmxoneB2uKePIK0ZmkTvHVWVeroQxqIfHmq45jVY0A7yjCSvAR1voVvVDuyhR161znspMq2MurdHt3B3otWTAX3UHal5pgHk0cLwAjzi0U8fQmeg75WuucwcIfiEXg7LORfGqkLzerCkPeKLO1DSCX1U247zYX2nvyxI4w7g0VQay6tqrFppb4UtL8HyCbfcI57H6Cbv74vp2GX6fuSs5FJCdRDpDL14Ozc0KisPnMzvP4cYDdatci2sdb1YKbl6EhpWVtSgWruqRVUJA5mSuTmQok7FJTjPs7K/jgZ3xJ31PCu7tbqBCmqwej1TzZzXTQXdt9u6AfqZ0hnsaDu01+1wcQPGLqRwE58IY7W4a931thvI8NQKrdqG7tJ4Vdthg3K4521lvzj4e+hX4PahHpR05d/C3ai15Ywb8wBrs5i6mwB0fxcMnNUNB6R1N49Qcs/uWnqrdJWP2+asUtyuN09db1yqfPjxPIA4mQdRVXcaeFZKZUU2zLtqtW21kMVJh56Ahe5JueppTquVDc8eVrBd9pWGwk1nvSq5KVdZCX94G3dH5HpDOuemHHcU74/uS2FF0d3Noii6m/bFQ+fA827yz6g7aXo97pqCxlfuz80NL9AxWqLy+8ycXPwM6W0jf97aK1LYaZaXf8kTYr9n/8g146Jchyr/9vfnJUIvL/8Bo/VM8DEMAAA=","variations_config_ids":"{\"ECS\":\"P-R-1082570-1-11,P-D-42388-2-6\",\"EdgeConfig\":\"P-R-1174322-3-4,P-R-1160552-1-3,P-R-1152186-3-9,P-R-1148941-3-4,P-R-1133477-3-4,P-R-1113531-4-9,P-R-1108562-6-7,P-R-1082109-3-6,P-R-1077170-3-3,P-R-1060324-1-5,P-R-1054140-1-4,P-R-1049918-1-3,P-R-1018035-1-10,P-R-68474-9-12,P-R-60617-7-20,P-R-45373-8-85,P-R-46265-44-105\",\"EdgeDomainActions\":\"P-R-1093245-1-16,P-R-1037936-1-9,P-R-1024693-1-9,P-R-108604-1-34,P-R-78306-1-18,P-R-73626-1-17,P-R-71025-5-13,P-R-63165-4-26,P-R-53243-2-7,P-R-40093-3-26,P-R-38744-7-97,P-R-31899-21-470,P-D-1138318-1-3,P-D-98331-6-32\",\"EdgeFirstRunConfig\":\"P-R-1075865-4-7\",\"Segmentation\":\"P-R-1159985-1-5,P-R-1113915-25-8,P-R-1098334-1-6,P-R-66078-1-3,P-R-66077-1-5,P-R-60882-1-2,P-R-43082-1-3,P-R-42744-1-2\"}","variations_country":"CN","variations_crash_streak":0,"variations_failed_to_fetch_seed_streak":0,"variations_google_groups":{"Default":[]},"variations_last_fetch_time":"13350098393505139","variations_last_runtime_fetch_time":"13350098393618298","variations_permanent_consistency_country":["120.0.2210.133","CN"],"variations_runtime_compressed_seed":"H4sIAAAAAAAAAG2PQU/CQBhE/0oz523cbhXtJl5YC1UDGmiIIh5W+7Up2G2z3U1E0v9uQG96nZm8vDkgLSpaeOPqhlRryrqCPCBtOrf/tyGj3z5oQtp5Sz3kC4jsO16HgSEjXZDtT4BcV5DYoKLxuvTJ+v5pab9y6uez8WqaqedRszvLt16UqltlD/Gu3lbXG4Ah/ezqExkTW7MgSoI7bQLBxXnAIxkn8oIH01kOBtV64+xetQVBQs3BsHTa+f43EZxjOM6O7rc3P15/P+ExXIQRj68uRzwUYYJh+AaMSRkfFgEAAA==","variations_safe_compressed_seed":"H4sIAAAAAAAAAJVWW2/iOBT+L36OqzjOtaN9YKBM2emFKbAd7TKqTHIaLBI7sh0YpuK/r5xw67TZanlAOjnf952rnbygvhTPPB8NNLpEL3N01Z/M0eUcjfEDJm7sBZGLCSbEGeMB9j0ax9jD4Rw5c3SV5dCyTwwSukHgYYKp09qBR+IQUxzvbT9OfIIp9vc2pX4UndmEBpRgHyd7242D0MMhjpxDRsRNMMXh3o4iErmYHuK5oUs9HxMc7O3AJ76tYK/v+klC4lN+LoldGtgK3eZBGPuRjxNMvNZ0QxLhCHut1w9oRHGM41bdD70wwL5vwxw7MpAl46KXGi6FPmtlQj2/CXTInEYJDTE5VOp6fpjQMzsOXVsIbTOPYupaNGkbGdHQa8y2LxFxvQAHmLRlhZTYxLDXxgqo51Ps7Xvou25CMT04aRz5Po5w0nopiZMEewT7kdvMnBAa02PLBjiJKSU4xJQcSx5ypc1DLX5fBjcK4iaPqIFOIC9BGGY7c7YxQZLEwWlihNCEBNgLDivj2oi2E22+YehGpwFaKzqSQzeO7fK1w/OpG59W0fdsnQR7c7RDztnyosuXxroYcM0WBfQW20zqATyDmoC5ZiLbKG64yCeGGbDorAUOgZlagUaX/6BSf0D7sXNeRbkDs5Fq1ZdCQGr4mptth/SVsE++gHmHcs2F6Y1HR/Wx4rqclEyZq59VIRU8QM6luJHpqjPxe3Et1zZpptLlSEx4BgumkINK3YZuRPd6qlcbOZaa2yF2YfaKQ6l6RTFThW6AryCvTslb93SpAD7XxkihZ6fyJktZVVzkY8VT6MuyYgp62Q0T+f0alOLZ2UhBvC31wJ+xil/9rOh/Cj+ArqTQ/0+StJJlZbZvT8b7GgDPKm1oX3lRTDbcpMv+tD+eVRkzFvLu3PqgDH/mKTMwVUxom7FItzZ3KUCYlm3H+BW2Yy4EF/kb5+ugMw13vWnoD6Uajdf+DTegWNERvwNsFW8ky+zSc214qm9knred7dzA3wmbseJ7WiN4GO7VGoTRXZNovb2ikJsbrg364aCKKVaCAWUhL0iwEtDlAXpQbcAOWrOitt5bniqp5bO5eITFZyU3GtRFc6QmqQIQFzPNcnCI4336EDoG9SxVyURqCf4ntDsv55prI3PFys6STogv9kAJK/RRbUfOh/Vd/TQgtD2AFyOhDSuKvqyFeeRmeQuGDZhhDnEc6u3z/jYb9W2m70dOl0wIKM4iDdHOObqhkunyzEnd9neOUWDsKpfcGNuLJymeNlzBk+ElyNo8lbwouIZUikyfSXlWxSY4ydJlex117og961m6bNZqCgWUYNR2LKsJK6sCmn+7dR30oVQpHGlHtNPscD4FbWaC24kPuDaKL2p7vR0H0j21XMm68o5pvKrtvEEZPLO6MF8s/D30K3C9KjslbfmPsOjVZjlmWq9gq2cjexOAau+CjrO654Aw9ubhUpzYTUsfpSqyfl0NC8nMdv+qa41bmXW/PM8gVmbFi2KhgKVLIQ1Pu3l3tTK14iL/3KAHYKB5pdy1tB+7nYOugWVNv19Qs99q229SQf07+x0wZTm6RHNkfgXLfLS69Qf33/9c3f9K1d+Lsvq+Wd8tH8t1OUxWbKD60V/et80fc4R2u38BFZQvEzsLAAA=","variations_safe_seed_date":"13347011641000000","variations_safe_seed_fetch_time":"13346738053401545","variations_safe_seed_locale":"zh-CN","variations_safe_seed_milestone":120,"variations_safe_seed_permanent_consistency_country":"CN","variations_safe_seed_session_consistency_country":"CN","variations_safe_seed_signature":"","variations_seed_client_version_at_store":"120.0.2210.133","variations_seed_date":"13350098388000000","variations_seed_milestone":120,"variations_seed_runtime_etag":"\"geBZfu9ZKXSrzTesNMBVGHCY6mk/Tju2fCpVHO3kijg=\"","variations_seed_signature":"","was":{"restarted":false},"web_widget":{"disabled_due_extensions":false}}
\ No newline at end of file
diff --git a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/ShaderCache/data_1 b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/ShaderCache/data_1
index 7fdb142..02ced16 100644
Binary files a/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/ShaderCache/data_1 and b/MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/ShaderCache/data_1 differ
diff --git a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.AmendantRecordFrm.resources b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.AmendantRecordFrm.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.AmendantRecordFrm.resources differ
diff --git a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.DataQueryFrm.resources b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.DataQueryFrm.resources
new file mode 100644
index 0000000..cbfd826
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.DataQueryFrm.resources differ
diff --git a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.HistoryViewFrm.resources b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.HistoryViewFrm.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.HistoryViewFrm.resources differ
diff --git a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.PageCtrl.resources b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.PageCtrl.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.SysUI.DefectPicShow.PageCtrl.resources differ
diff --git a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.csproj.FileListAbsolute.txt b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.csproj.FileListAbsolute.txt
index f2acce4..05ad22a 100644
--- a/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.csproj.FileListAbsolute.txt
+++ b/MaiMuAOI/MaiMuAOI/obj/x64/Debug/MaiMuAOI.csproj.FileListAbsolute.txt
@@ -192,7 +192,6 @@ E:\MaiMu\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.csproj.CopyComplete
 E:\MaiMu\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.exe
 E:\MaiMu\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.pdb
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.SysSet.SysLogFrm.resources
-E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuControl.dll
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\S7.Net.dll
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\BouncyCastle.Crypto.dll
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MySql.Data.dll
@@ -551,3 +550,8 @@ E:\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.pdb
 E:\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.DebugTestFrm.resources
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.DebugTestFrm.resources
 E:\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuControl.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuControl.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.DataQueryFrm.resources
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.PageCtrl.resources
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.AmendantRecordFrm.resources
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\obj\x64\Debug\MaiMuAOI.SysUI.DefectPicShow.HistoryViewFrm.resources
diff --git a/MaiMuAOI/Models/Order.cs b/MaiMuAOI/Models/Order.cs
index 78d6bf3..a06b44d 100644
--- a/MaiMuAOI/Models/Order.cs
+++ b/MaiMuAOI/Models/Order.cs
@@ -1,224 +1,224 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Models
-{
-    [SugarIndex("index_{table}_sn", nameof(Order.SN), OrderByType.Asc, isUnique: true)]
-    public class Order : BaseTable
-    {
-        /// <summary>
-        /// 产品
-        /// </summary>
-        public int ProductId { get; set; }
-        [Navigate(NavigateType.ManyToOne, nameof(ProductId))]
-        public Product ProductInfo { get; set; }
-
-        public string SN { get; set; }
-        public string BatchId { get; set; }
-        /// <summary>
-        /// 流程
-        /// </summary>
-        public int StepId { get; set; }
-        [Navigate(NavigateType.ManyToOne, nameof(StepId))]
-        public Step StepInfo { get; set; }
-
-        /// <summary>
-        /// 时长-秒
-        /// </summary>
-        public double TimeLen { get; set; }
-        /// <summary>
-        /// 是否合格
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public bool Qualified { get; set; } = true;
-
-        /// <summary>
-        /// 比对结果 0-未比对 1-通过 2-不通过
-        /// </summary>
-        public int CompareResult { get; set; } = 0;
-
-
-        //平均值
-        public double TensionValue { get; set; }
-        public double HeightValue { get; set; }
-        public double LineWidthValue { get; set; }
-        public double PTValue { get; set; }
-
-        //N次
-        #region 张力5次
-        public double Tension1 { get; set; }
-        public double Tension2 { get; set; }
-        public double Tension3 { get; set; }
-        public double Tension4 { get; set; }
-        public double Tension5 { get; set; }
-        #endregion
-        #region 厚度5次
-        public double Height1 { get; set; }
-        public double Height2 { get; set; }
-        public double Height3 { get; set; }
-        public double Height4 { get; set; }
-        public double Height5 { get; set; }
-        #endregion
-        #region 线宽9次
-        public double LineWidth1 { get; set; }
-        public double LineWidth2 { get; set; }
-        public double LineWidth3 { get; set; }
-        public double LineWidth4 { get; set; }
-        public double LineWidth5 { get; set; }
-        public double LineWidth6 { get; set; }
-        public double LineWidth7 { get; set; }
-        public double LineWidth8 { get; set; }
-        public double LineWidth9 { get; set; }
-        #endregion 
-        #region PT6次
-        public double PT1 { get; set; }
-        public double PT2 { get; set; }
-        public double PT3 { get; set; }
-        public double PT4 { get; set; }
-        public double PT5 { get; set; }
-        public double PT6 { get; set; }
-        #endregion
-        /// <summary>
-        /// 缺陷数
-        /// </summary>
-        public int DefectCount { get; set; }
-
-        #region 缺陷种类
-        public int DKCount { get; set; }//堵孔数量
-        public int ZWCount { get; set; }//脏污数量
-        public int GSYCCount { get; set; }//钢丝异常数量
-        public int XWSCount { get; set; }//纤维丝数量
-        public int QKCount { get; set; }//缺口数量
-        public int ZKCount { get; set; }//针孔数量
-        public int PPCount { get; set; }//泡泡数量
-        public int HSCount { get; set; }//划伤数量
-        public int YXCount { get; set; }//压线数量 
-        public int XBCount { get; set; }//斜边数量 new
-        public int SXCount { get; set; }//栅线数量 new
-        #endregion
-
-        /// <summary>
-        /// mark点数据:[X1,Y1,X2,Y2,X3,Y3,X4,Y4]
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string MarkData { get; set; }
-        //
-        public bool Succeed { get; set; }
-        /// <summary>
-        /// 失败分类
-        /// </summary>
-        public int FailType { get; set; }
-        /// <summary>
-        /// 失败的工序名称
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string FailProcessName { get; set; }
-        [SugarColumn(IsNullable = true, ColumnDataType = "text", Length = 2048)]
-        public string Note { get; set; }
-
-        /// <summary>
-        /// 0-初始; 5-已检测; 10-出现异常
-        /// </summary>
-        public int State { get; set; }
-
-        //----------
-        /// <summary>
-        /// 修改次数
-        /// </summary>
-        public int HistoryCount { get; set; } = 0;
-        /// <summary>
-        /// 修改历史记录
-        /// </summary>
-        [Navigate(NavigateType.OneToMany, nameof(OrderHistory.Pid))]
-        public List<OrderHistory> OrderHistoryList { get; set; }
-
-        /// <summary>
-        /// Defect和Size比对失败的坐标位置
-        /// </summary>
-        [Navigate(NavigateType.OneToMany, nameof(DefectInfo.Pid))]
-        public List<DefectInfo> DefectInfoList { get; set; }
-
-        //-------IsIgnore = true  不保存
-        [SugarColumn(IsIgnore = true)]
-        //[Navigate(NavigateType.OneToMany, nameof(SizeTagData.Pid))]
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models
+{
+    [SugarIndex("index_{table}_sn", nameof(Order.SN), OrderByType.Asc, isUnique: true)]
+    public class Order : BaseTable
+    {
+        /// <summary>
+        /// 产品
+        /// </summary>
+        public int ProductId { get; set; }
+        [Navigate(NavigateType.ManyToOne, nameof(ProductId))]
+        public Product ProductInfo { get; set; }
+
+        public string SN { get; set; }
+        public string BatchId { get; set; }
+        /// <summary>
+        /// 流程
+        /// </summary>
+        public int StepId { get; set; }
+        [Navigate(NavigateType.ManyToOne, nameof(StepId))]
+        public Step StepInfo { get; set; }
+
+        /// <summary>
+        /// 时长-秒
+        /// </summary>
+        public double TimeLen { get; set; }
+        /// <summary>
+        /// 是否合格
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public bool Qualified { get; set; } = true;
+
+        /// <summary>
+        /// 比对结果 0-未比对 1-通过 2-不通过
+        /// </summary>
+        public int CompareResult { get; set; } = 0;
+
+
+        //平均值
+        public double TensionValue { get; set; }
+        public double HeightValue { get; set; }
+        public double LineWidthValue { get; set; }
+        public double PTValue { get; set; }
+
+        //N次
+        #region 张力5次
+        public double Tension1 { get; set; }
+        public double Tension2 { get; set; }
+        public double Tension3 { get; set; }
+        public double Tension4 { get; set; }
+        public double Tension5 { get; set; }
+        #endregion
+        #region 厚度5次
+        public double Height1 { get; set; }
+        public double Height2 { get; set; }
+        public double Height3 { get; set; }
+        public double Height4 { get; set; }
+        public double Height5 { get; set; }
+        #endregion
+        #region 线宽9次
+        public double LineWidth1 { get; set; }
+        public double LineWidth2 { get; set; }
+        public double LineWidth3 { get; set; }
+        public double LineWidth4 { get; set; }
+        public double LineWidth5 { get; set; }
+        public double LineWidth6 { get; set; }
+        public double LineWidth7 { get; set; }
+        public double LineWidth8 { get; set; }
+        public double LineWidth9 { get; set; }
+        #endregion 
+        #region PT6次
+        public double PT1 { get; set; }
+        public double PT2 { get; set; }
+        public double PT3 { get; set; }
+        public double PT4 { get; set; }
+        public double PT5 { get; set; }
+        public double PT6 { get; set; }
+        #endregion
+        /// <summary>
+        /// 缺陷数
+        /// </summary>
+        public int DefectCount { get; set; }
+
+        #region 缺陷种类
+        public int DKCount { get; set; }//堵孔数量
+        public int ZWCount { get; set; }//脏污数量
+        public int GSYCCount { get; set; }//钢丝异常数量
+        public int XWSCount { get; set; }//纤维丝数量
+        public int QKCount { get; set; }//缺口数量
+        public int ZKCount { get; set; }//针孔数量
+        public int PPCount { get; set; }//泡泡数量
+        public int HSCount { get; set; }//划伤数量
+        public int YXCount { get; set; }//压线数量 
+        public int XBCount { get; set; }//斜边数量 new
+        public int SXCount { get; set; }//栅线数量 new
+        #endregion
+
+        /// <summary>
+        /// mark点数据:[X1,Y1,X2,Y2,X3,Y3,X4,Y4]
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string MarkData { get; set; }
+        //
+        public bool Succeed { get; set; }
+        /// <summary>
+        /// 失败分类
+        /// </summary>
+        public int FailType { get; set; }
+        /// <summary>
+        /// 失败的工序名称
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string FailProcessName { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "text", Length = 2048)]
+        public string Note { get; set; }
+
+        /// <summary>
+        /// 0-初始; 5-已检测; 10-出现异常
+        /// </summary>
+        public int State { get; set; }
+
+        //----------
+        /// <summary>
+        /// 修改次数
+        /// </summary>
+        public int HistoryCount { get; set; } = 0;
+        /// <summary>
+        /// 修改历史记录
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(OrderHistory.Pid))]
+        public List<OrderHistory> OrderHistoryList { get; set; }
+
+        /// <summary>
+        /// Defect和Size比对失败的坐标位置
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(DefectInfo.Pid))]
+        public List<DefectInfo> DefectInfoList { get; set; }
+
+        //-------IsIgnore = true  不保存
+        [SugarColumn(IsIgnore = true)]
+        //[Navigate(NavigateType.OneToMany, nameof(SizeTagData.Pid))]
         public List<SizeTagData> SizeTagDataList { get; set; }
 
         //2023-10-30 添加异常列
-        /// <summary>
-        /// 异常情况
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
+        /// <summary>
+        /// 异常情况
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
         public string Abnormalities { get; set; }
-        /// <summary>
-        /// 修复人员
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string RepairCode { get; set; }
-    }
-    [SugarIndex("index_{table}_pid", nameof(OrderHistory.Pid), OrderByType.Asc, isUnique: false)]
-    public class OrderHistory : BaseTable
-    {
-        public int Pid { get; set; }
-        public bool Qualified { get; set; }//合格
-
-        //比对 
-        public int CompareResult { get; set; }
-        //平均值
-        public double TensionValue { get; set; }
-        public double HeightValue { get; set; }
-        public double LineWidthValue { get; set; }
-        public double PTValue { get; set; }
-
-        //外观
-        public int DKCount { get; set; }//堵孔数量
-        public int ZWCount { get; set; }//脏污数量
-        public int GSYCCount { get; set; }//钢丝异常数量
-        public int XWSCount { get; set; }//纤维丝数量
-        public int QKCount { get; set; }//缺口数量
-        public int ZKCount { get; set; }//针孔数量
-        public int PPCount { get; set; }//泡泡数量
-        public int HSCount { get; set; }//划伤数量
-        public int YXCount { get; set; }//压线数量 
-        public int XBCount { get; set; }//斜边数量 new
-        public int SXCount { get; set; }//栅线数量 new
-    }
-     
-    [SugarIndex("index_{table}_pid", nameof(SizeTagData.Pid), OrderByType.Asc, isUnique: false)]
-    public class SizeTagData : BaseTable
-    {
-        public int Pid { get; set; }
-        public string SizeTag { get; set; }
-        /// <summary>
-        /// 产生Tag工序索引
-        /// </summary>
-        public int CreateStepIndex { get; set; }
-        /// <summary>
-        /// 消费本数据工序索引和消费值索引：5-0,8-2 
-        /// </summary>
-        public string ConsumeStepIndex { get; set; }
-
-        /// <summary>
-        /// double[]
-        /// </summary>
-        public string posePT { get; set; } 
-    }
-
-    [SugarIndex("index_{table}_pid", nameof(DefectInfo.Pid), OrderByType.Asc, isUnique: false)]
-    public class DefectInfo : BaseTable
-    {
-        public int Pid { get; set; }
-        /// <summary>
-        /// 0-Defect 1-Size
-        /// </summary>
-        public int Type { get; set; }
-        public string Code { get;set; }
-
-        public double X { get; set; } 
-        public double Y { get; set; } 
-        public double ZXD { get; set; } 
-    }
+        /// <summary>
+        /// 修复人员
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string RepairCode { get; set; }
+    }
+    [SugarIndex("index_{table}_pid", nameof(OrderHistory.Pid), OrderByType.Asc, isUnique: false)]
+    public class OrderHistory : BaseTable
+    {
+        public int Pid { get; set; }
+        public bool Qualified { get; set; }//合格
+
+        //比对 
+        public int CompareResult { get; set; }
+        //平均值
+        public double TensionValue { get; set; }
+        public double HeightValue { get; set; }
+        public double LineWidthValue { get; set; }
+        public double PTValue { get; set; }
+
+        //外观
+        public int DKCount { get; set; }//堵孔数量
+        public int ZWCount { get; set; }//脏污数量
+        public int GSYCCount { get; set; }//钢丝异常数量
+        public int XWSCount { get; set; }//纤维丝数量
+        public int QKCount { get; set; }//缺口数量
+        public int ZKCount { get; set; }//针孔数量
+        public int PPCount { get; set; }//泡泡数量
+        public int HSCount { get; set; }//划伤数量
+        public int YXCount { get; set; }//压线数量 
+        public int XBCount { get; set; }//斜边数量 new
+        public int SXCount { get; set; }//栅线数量 new
+    }
+     
+    [SugarIndex("index_{table}_pid", nameof(SizeTagData.Pid), OrderByType.Asc, isUnique: false)]
+    public class SizeTagData : BaseTable
+    {
+        public int Pid { get; set; }
+        public string SizeTag { get; set; }
+        /// <summary>
+        /// 产生Tag工序索引
+        /// </summary>
+        public int CreateStepIndex { get; set; }
+        /// <summary>
+        /// 消费本数据工序索引和消费值索引：5-0,8-2 
+        /// </summary>
+        public string ConsumeStepIndex { get; set; }
+
+        /// <summary>
+        /// double[]
+        /// </summary>
+        public string posePT { get; set; } 
+    }
+
+    [SugarIndex("index_{table}_pid", nameof(DefectInfo.Pid), OrderByType.Asc, isUnique: false)]
+    public class DefectInfo : BaseTable
+    {
+        public int Pid { get; set; }
+        /// <summary>
+        /// 0-Defect 1-Size
+        /// </summary>
+        public int Type { get; set; }
+        public string Code { get;set; }
+
+        public double X { get; set; } 
+        public double Y { get; set; } 
+        public double ZXD { get; set; } 
+    }
 }
\ No newline at end of file
diff --git a/MaiMuAOI/Service/OrderService.cs b/MaiMuAOI/Service/OrderService.cs
index 58dfd1c..86c5467 100644
--- a/MaiMuAOI/Service/OrderService.cs
+++ b/MaiMuAOI/Service/OrderService.cs
@@ -50,6 +50,29 @@ namespace Service
             else
                 return sql.ToPageList(pageNum, pageSize, ref totalCount);
         }
+
+        public List<Order> GetListEx(string fields, string domain, string orderby, int pageNum, int pageSize, ref int totalCount)
+        {
+            var sql = base.AsSugarClient().Queryable<Order>()
+                 .Includes(m => m.StepInfo)
+                 .Includes(m => m.ProductInfo)
+                 .Includes(m => m.OrderHistoryList);
+            //var sql = base.AsSugarClient().Queryable(tablename, "");
+            if (!string.IsNullOrWhiteSpace(domain))
+                sql = sql.Where(base.Context.Utilities.JsonToConditionalModels(domain));
+            if (!string.IsNullOrWhiteSpace(fields) && fields != "*")
+                sql = sql.Select(fields);
+            if (!string.IsNullOrWhiteSpace(orderby))
+                sql = sql.OrderBy(orderby);
+            else
+                sql = sql.OrderBy("id desc");
+
+            if (pageNum == 0 && pageSize == 0)
+                return sql.ToList();
+            else
+                return sql.ToPageList(pageNum, pageSize, ref totalCount);
+        }
+
         public int DeleteList(string tablename, string domain)
         {
             var where = base.Context.Utilities.JsonToConditionalModels(domain);
@@ -85,6 +108,14 @@ namespace Service
             base.AsSugarClient().Ado.CommitTran();
             return result;
         }
+
+        public bool UpdateableListEx(Order order)
+        {
+            return base.AsSugarClient().UpdateNav(order)
+                .Include(m => m.OrderHistoryList)
+                .ExecuteCommand();
+        }
+
         public List<Order> GetListNav(int pageNum, int pageSize, ref int totalCount, Expression<Func<Order, bool>> exp)
         {
             return base.AsSugarClient().Queryable<Order>()
diff --git a/MaiMuAOI/Service/obj/Debug/Service.csproj.FileListAbsolute.txt b/MaiMuAOI/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
index c5696f7..ec859fc 100644
--- a/MaiMuAOI/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
+++ b/MaiMuAOI/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
@@ -93,3 +93,9 @@ E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\obj\Debug\S
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\obj\Debug\Service.csproj.CopyComplete
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\obj\Debug\Service.dll
 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\obj\Debug\Service.pdb
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\MySql.Data.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\MySqlBackup.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\Newtonsoft.Json.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\SqlSugar.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\ZstdSharp.dll
+E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\Service\bin\Debug\System.IO.Pipelines.dll
diff --git a/MaiMuAOI/软件更新.txt b/MaiMuAOI/软件更新.txt
new file mode 100644
index 0000000..79d5e2e
--- /dev/null
+++ b/MaiMuAOI/软件更新.txt
@@ -0,0 +1,8 @@
+1.0:
+	初版测试完成。
+1.0.1：
+	1.修改产品文件路径错误bug
+	2.启动之后不可修改产品料号的sn编码
+	3.去除无限sn编码保存问题
+	4.加入钢网检测
+	5.优化显示缺陷
\ No newline at end of file