版本-v1.2.4 修复台更新尺寸缺陷

halftoneproject-master/AssistClient/Config.cs

@@ -238,7 +238,13 @@ namespace AssistClient
                 case "sx":
                     return "栅线";
                 case "ds":
-                    return "断栅";
+                    return "断栅";
+                case "wtg":
+                    return "未通过";
+                case "qs":
+                    return "缺失";
+                case "dc":
+                    return "多出";
                 default:
                     return "未知"; 
         

halftoneproject-master/AssistClient/FrmLogin.Designer.cs

@@ -161,7 +161,7 @@
             this.Name = "FrmLogin";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "修复控制台 - v1.2";
+            this.Text = "修复控制台 - v1.2.1";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
             this.Load += new System.EventHandler(this.FrmLogin_Load);
             this.Shown += new System.EventHandler(this.FrmLogin_Shown);

halftoneproject-master/AssistClient/FrmMain.Designer.cs

@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
-            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.chkSyncMove = new System.Windows.Forms.CheckBox();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -421,7 +421,7 @@
             this.gpbDefectList.Margin = new System.Windows.Forms.Padding(2);
             this.gpbDefectList.Name = "gpbDefectList";
             this.gpbDefectList.Padding = new System.Windows.Forms.Padding(2);
-            this.gpbDefectList.Size = new System.Drawing.Size(428, 377);
+            this.gpbDefectList.Size = new System.Drawing.Size(434, 377);
             this.gpbDefectList.TabIndex = 4;
             this.gpbDefectList.TabStop = false;
             this.gpbDefectList.Text = "缺陷明细";
@@ -431,14 +431,14 @@
             this.dgvProcess.AllowUserToAddRows = false;
             this.dgvProcess.AllowUserToDeleteRows = false;
             this.dgvProcess.AllowUserToResizeRows = false;
-            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.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            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.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colKey,
@@ -449,14 +449,14 @@
             this.colDefectName,
             this.colDefectCC,
             this.colResult});
-            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.ControlText;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            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.ControlText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4;
             this.dgvProcess.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvProcess.Location = new System.Drawing.Point(2, 16);
             this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
@@ -465,11 +465,11 @@
             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.CellSelect;
-            this.dgvProcess.Size = new System.Drawing.Size(424, 359);
+            this.dgvProcess.Size = new System.Drawing.Size(430, 359);
             this.dgvProcess.TabIndex = 3;
             this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick);
             // 
@@ -496,9 +496,9 @@
             // colIndex
             // 
             this.colIndex.DataPropertyName = "Index";
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.colIndex.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.colIndex.DefaultCellStyle = dataGridViewCellStyle2;
             this.colIndex.HeaderText = "索引";
             this.colIndex.MinimumWidth = 50;
             this.colIndex.Name = "colIndex";
@@ -509,8 +509,8 @@
             // colX
             // 
             this.colX.DataPropertyName = "X";
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.colX.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            this.colX.DefaultCellStyle = dataGridViewCellStyle3;
             this.colX.HeaderText = "X轴";
             this.colX.MinimumWidth = 50;
             this.colX.Name = "colX";
@@ -738,10 +738,10 @@
             this.tsbtnGoDownPT.Margin = new System.Windows.Forms.Padding(2);
             this.tsbtnGoDownPT.Name = "tsbtnGoDownPT";
             this.tsbtnGoDownPT.Size = new System.Drawing.Size(90, 46);
-            this.tsbtnGoDownPT.TabIndex = 9;
+            this.tsbtnGoDownPT.TabIndex = 10;
             this.tsbtnGoDownPT.Text = "完成";
             this.tsbtnGoDownPT.UseVisualStyleBackColor = false;
-            this.tsbtnGoDownPT.Click += new System.EventHandler(this.tsbtnGoDownPT_Click);
+            this.tsbtnGoDownPT.Click += new System.EventHandler(this.tsbtnGoDownPT_Click_1);
             // 
             // tsbtnPause
             // 
@@ -975,7 +975,7 @@
             this.Name = "FrmMain";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "修复控制台 - v1.2";
+            this.Text = "修复控制台 - v1.2.1";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMain_FormClosed);
@@ -1058,7 +1058,6 @@
         private System.Windows.Forms.SplitContainer splitContainer2;
         private System.Windows.Forms.Panel pnlPic;
         private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.Button tsbtnGoDownPT;
         private System.Windows.Forms.Button tsbtnPause;
         private System.Windows.Forms.GroupBox gpbLog;
         private System.Windows.Forms.ListBox lstLog;
@@ -1084,6 +1083,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn colY;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDefectName;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDefectCC;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colResult;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colResult;
+        private System.Windows.Forms.Button tsbtnGoDownPT;
     }
 }

halftoneproject-master/AssistClient/FrmMain.resx

@@ -458,32 +458,32 @@
   <data name="tsbtnPause1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
-        AElFTkSuQmCC
+        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
+        AABJRU5ErkJggg==
 </value>
   </data>
   <data name="tsbtnReset.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

halftoneproject-master/AssistClient/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.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]

halftoneproject-master/Code/FrmProductInfo.Designer.cs

@@ -121,6 +121,7 @@
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.flpQualifiedPannel = new System.Windows.Forms.FlowLayoutPanel();
+            this.cbHavePad = new System.Windows.Forms.CheckBox();
             this.groupBox10.SuspendLayout();
             this.panel10.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numTensionDownFloatValue)).BeginInit();
@@ -1039,6 +1040,7 @@
             // panel6
             // 
             this.panel6.BackColor = System.Drawing.Color.White;
+            this.panel6.Controls.Add(this.cbHavePad);
             this.panel6.Controls.Add(this.label24);
             this.panel6.Controls.Add(this.cbMainGrid);
             this.panel6.Controls.Add(this.cbMarkDisturb);
@@ -1061,7 +1063,7 @@
             // cbMainGrid
             // 
             this.cbMainGrid.AutoSize = true;
-            this.cbMainGrid.Location = new System.Drawing.Point(199, 47);
+            this.cbMainGrid.Location = new System.Drawing.Point(158, 47);
             this.cbMainGrid.Name = "cbMainGrid";
             this.cbMainGrid.Size = new System.Drawing.Size(72, 16);
             this.cbMainGrid.TabIndex = 1;
@@ -1235,6 +1237,16 @@
             this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 326);
             this.flpQualifiedPannel.TabIndex = 0;
             // 
+            // cbHavePad
+            // 
+            this.cbHavePad.AutoSize = true;
+            this.cbHavePad.Location = new System.Drawing.Point(236, 47);
+            this.cbHavePad.Name = "cbHavePad";
+            this.cbHavePad.Size = new System.Drawing.Size(102, 16);
+            this.cbHavePad.TabIndex = 6;
+            this.cbHavePad.Text = "是否存在Pad点";
+            this.cbHavePad.UseVisualStyleBackColor = true;
+            // 
             // FrmProductInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1392,5 +1404,6 @@
         private System.Windows.Forms.CheckBox cbMainGrid;
         private System.Windows.Forms.CheckBox cbMarkDisturb;
         private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.CheckBox cbHavePad;
     }
 }

halftoneproject-master/Code/FrmProductInfo.cs

@@ -76,6 +76,8 @@ namespace ProductionControl
                 this.cbMarkDisturb.Checked = (m.MarkDisturb == 1);
                 this.cbMainGrid.Checked = (m.MainGrid == 1);
 
+                this.cbHavePad.Checked = (m.HavePad == 1);
+
                 Models.Attachment attachmentFile = model.AttachmentList.FirstOrDefault(x => x.Type == 0);
                 if (attachmentFile!=null)
                 {
@@ -240,6 +242,7 @@ namespace ProductionControl
                 //2023-12-18 主栅
                 model.MarkDisturb = this.cbMarkDisturb.Checked?1:0;
                 model.MainGrid = this.cbMainGrid.Checked ? 1 : 0;
+                model.HavePad = this.cbHavePad.Checked?1: 0;
 
                 bool result;
                 if (model.Id == 0)
@@ -336,6 +339,8 @@ namespace ProductionControl
                 //2023-12-18
                 int tMarkDistrub = this.cbMarkDisturb.Checked ? 1 : 0;
                 int tMainGrid = this.cbMainGrid.Checked ? 1 : 0;
+                //2024-1-24
+                int tHavePad = this.cbHavePad.Checked ? 1 : 0;
 
                 Task.Run(() =>
                 {
@@ -344,7 +349,7 @@ namespace ProductionControl
                     //2023-11-3 mark
                     
                     //yolo.gerber2image(targFilePath, bmpPath);
-                    double[] markParam = new double[6];
+                    double[] markParam = new double[7];
                     if(tempClass.Contains("乳剂"))
                         markParam[0] = 2;
                     else if (tempClass.Contains("PI"))
@@ -359,6 +364,7 @@ namespace ProductionControl
                         markParam[3] = 1;
                         markParam[4] = 0;
                         markParam[5] = 0;
+                        markParam[6] = 0;
                     }
                     else
                     {
@@ -367,6 +373,7 @@ namespace ProductionControl
                         markParam[3] = tempIndex == 1 ? 0 : 1;
                         markParam[4] = tMarkDistrub;
                         markParam[5] = tMainGrid;
+                        markParam[6] = tHavePad;
                     }
                     yolo.gerber2image(targFilePath, bmpPath, markParam);
 

halftoneproject-master/Code/FrmProductInfo.resx

@@ -127,16 +127,16 @@
   <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIeSURBVFhH7ZfLShxBFIaPCJKAIuQFghHdCO5MSFCzES/Z
-        zyKIduyq6q7TxoXkDdyJbhQfwEswgYAv4E506QVcZJmduE4IJoRcThU1PV2ZmpmunkYQ/OGjZ6rq/P1P
-        9emeGbiXQx0QJePEdGG4nAKeDBk/D1UqXcDiQxD4txQ4rhjnnBI4UmfSPhPGPYe4HEsLGX6hT7ALIt7z
-        R+5AiJ+1zxu8gijqNWdooSgZTQNw3DajxcTlauol5Ccz2kLZAELum9FiEnKz5qX9AjPTRNkADD+Y0fxi
-        uEA7F+nXHDesAK/xO4TJYz3XUO0EWF5+SHV/dK0Sx/XUq0oYn9BMh553qp0AYdhDdV+JG/2ey7XUy0K+
-        0/NOWT2A781oPiVJN0y++q1rlawmtDjQ807ZAZosbCB925rmFbiV8arRdGftAGo7X5gZPzEcptrrjFcN
-        jwAK1VSXxBk9YM5bQ+s4XkAQ/DL19XgGKJ+7GSAIvhWieldk8QqgTIScAcYeFSKOB8jn2PL02wFqrHYl
-        MLE8PS/BT+rqJRDJM29Y/JT8ptOv5Sp3swnLxDPADV2CeeCLg7qh1DEvan0UPQcmTy3P229CiZan9w4I
-        OQdC9MMCPtHH/1HjLvjbPqqnH7n6EZ0zQPZHqY36TvDD9RDSyI/mbA6pW8dZVCbNAgTBA1p0VF9UErOz
-        P2iXp8zZGqhS6aTFL6kf3H+7iiJwUvfFvSwB/AOYeWWRyPCtmgAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFMRCRegXkLbUi+CtFqXVS1v1
+        A+xBRKOZmWReqgfxG3iT9tLSD9BWUUHwC3gTe6wt9ODRm3hWRKVUfTPMZjPu7G4mGwqCf/iR3Zl5//x3
+        8pLdhXs51AFRMkKMF4bLMeBJv/HzUKXSCSzeAYHXpcBx2TjnlMAXdSbt88a45xCXr9NChof0Cb6DiFf9
+        kd8gxAPtM4tHEEU95gwtFCWv0gAcv5rRYuJyJfUScsuMtlA2gJDrZrSYhPxc89J+gZlpomwAhhtmNL8Y
+        ztHORfo1x09WgEk8gzDp1XMN1U6AxcWHVHela5U4fky9qoTxD5rp0PNOtRMgDLup7oQ41++5/JB6Wcgl
+        Pe+U1QO4ZkbzKUkewduJf7pWyWpCi20975QdoMnCBtK3rWlegV8yXjWa7qwdQG3nsJnxE8MBqj3OeNXw
+        CKBQTfWH2KcHzK/W0DqOvyEI/pr6ejwDlM/dDBAEp4Wo3hVZvAIoEyEngLHHhYjj5+SzZ3n67QA1VrsS
+        mFienpfgkrp6AUTy0hsWD5LfePq1XOVuNmGZeAY4p0swA/x9n24odcyLWh9FQ8DkT8vz/zehRMvTeweE
+        nAYhnsEcPtXH26hxF3z+CdXTj1z9iM4ZIPuj1EZ9J/jheghp5KY5m0Pq1nEWlUmzAEHQRYt264tKYmrq
+        gnZ5zJytgSqVB7R4lPrB/berKALf6b64lyWAG3A0ZYu/HkZSAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbtnAddFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

halftoneproject-master/Code/ProductionControl.sln

@@ -1,71 +1,61 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductionControl", "ProductionControl.csproj", "{9B356643-321E-4B70-ABF3-FF8E2F218F38}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "..\Models\Models.csproj", "{47694C39-2448-4BE5-80A4-70D78B59272B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "..\Service\Service.csproj", "{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssistClient", "..\AssistClient\AssistClient.csproj", "{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZDUtilLib", "..\..\Zhide\ZDUtilLib\ZDUtilLib.csproj", "{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|x64.ActiveCfg = Debug|x64
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|x64.Build.0 = Debug|x64
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|x64.ActiveCfg = Release|x64
-		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|x64.Build.0 = Release|x64
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|x64.Build.0 = Debug|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|x64.ActiveCfg = Release|Any CPU
-		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|x64.Build.0 = Release|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|x64.Build.0 = Debug|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|x64.ActiveCfg = Release|Any CPU
-		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|x64.Build.0 = Release|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|x64.Build.0 = Debug|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|x64.Build.0 = Release|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Debug|x64.Build.0 = Debug|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Release|x64.ActiveCfg = Release|Any CPU
-		{AEE51E6A-2AE7-4088-A5AD-C133D36BDE1D}.Release|x64.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F1DFE48E-C650-4D12-8043-E226DFD046C4}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductionControl", "ProductionControl.csproj", "{9B356643-321E-4B70-ABF3-FF8E2F218F38}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "..\Models\Models.csproj", "{47694C39-2448-4BE5-80A4-70D78B59272B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "..\Service\Service.csproj", "{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssistClient", "..\AssistClient\AssistClient.csproj", "{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|x64.ActiveCfg = Debug|x64
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Debug|x64.Build.0 = Debug|x64
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|x64.ActiveCfg = Release|x64
+		{9B356643-321E-4B70-ABF3-FF8E2F218F38}.Release|x64.Build.0 = Release|x64
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Debug|x64.Build.0 = Debug|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|x64.ActiveCfg = Release|Any CPU
+		{47694C39-2448-4BE5-80A4-70D78B59272B}.Release|x64.Build.0 = Release|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{1CCED98A-7AF6-47F3-B9F9-A9E7DAD461B4}.Release|x64.Build.0 = Release|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Debug|x64.Build.0 = Debug|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|x64.ActiveCfg = Release|Any CPU
+		{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}.Release|x64.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F1DFE48E-C650-4D12-8043-E226DFD046C4}
+	EndGlobalSection
+EndGlobal

halftoneproject-master/Models/Product.cs

@@ -118,6 +118,10 @@ namespace Models
         //2023-12-18 加入mark干扰判断，是否主栅
         public int MarkDisturb { get; set; }
         public int MainGrid { get; set; }
+
+        //2024-1-24 加入是否存在pad点
+        [SugarColumn(IsNullable = true)]
+        public int HavePad { get; set; }
     }
     /// <summary>
     /// 结束的批次才加入

更新日志.txt

@@ -27,4 +27,7 @@ V1.2.3：
 	3.更新上传图纸Mark点选项
 	4.增加pt和线宽补偿
 V1.2.4：
-	1.修复自动删除图片，设置天数存在小数点之后不起效问题1
+	1.修复自动删除图片，设置天数存在小数点之后不起效问题1
+	2.加入pad点检测
+V1.2.4:
+	新增比对缺陷：wtg未通过 qs缺失 dc多出   按顺序展示在修复台