CPL/banboshi_V1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
CPL 2024-03-06 09:51:15 +08:00
parent 1ea3b97ca5
commit 2d525bb984
8 changed files with 108 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
halftoneproject-master/AssistClient/FrmLogin.Designer.cs generated
View File

@ -161,7 +161,7 @@
this.Name = "FrmLogin";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "修复控制台 - v1.2.1";
this.Text = "修复控制台 - v1.2.2";
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);

6
halftoneproject-master/AssistClient/FrmMain.Designer.cs generated
View File

@ -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(434, 377);
this.gpbDefectList.Size = new System.Drawing.Size(437, 377);
this.gpbDefectList.TabIndex = 4;
this.gpbDefectList.TabStop = false;
this.gpbDefectList.Text = "缺陷明细";
@ -469,7 +469,7 @@
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
this.dgvProcess.RowTemplate.Height = 30;
this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dgvProcess.Size = new System.Drawing.Size(430, 359);
this.dgvProcess.Size = new System.Drawing.Size(433, 359);
this.dgvProcess.TabIndex = 3;
this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick);
//
@ -975,7 +975,7 @@
this.Name = "FrmMain";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "修复控制台 - v1.2.1";
this.Text = "修复控制台 - v1.2.2";
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);

9
halftoneproject-master/AssistClient/FrmMain.cs
View File

@ -1005,6 +1005,15 @@ namespace AssistClient
}
}
//2024-03-05 将尺寸未通过排到最前
for (int i = (defectList.Count - 1); i >=0 ; i--)
{
if (defectList[i].DefectName == Config.getDefectName("wtg"))
{
defectList.Insert(0, defectList[i]);
defectList.RemoveAt(i + 1);
}
}
this.Invoke(new System.Action(() =>
{
this.dgvProcess.DataSource = null;

52
halftoneproject-master/AssistClient/FrmMain.resx
View File

@ -458,32 +458,32 @@
<data name="tsbtnPause1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
AABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAW2SURBVFhH1ZZ/UFRVFMe3HG0Edve93dXGFBB/RQoOo9Wo
KegKgiCKICoqCYkgIprmaD9IxzRLnQrSqdEZx0zBsil/K9lkEzaaCoqIplZjoFHiOKEZDGGdvt/n29pf
rD//6cx8ZnbP+Z5z7rvv3vuu4X9lm5WO4cWKbVGJyXqwRLWVr1RtNwl/08cYNbr8wRkKzylRbGcPhIZJ
TUaO/LHhY2ncslv+PnNOg7/pY4waapmjp9+7bVGs6SVm26ETQ6KlaWup/PXNEbn50S5peWet/Ln4TWme
X6DB3/QxRg21xwfbhbmsoZe7OytRrcv2hfSU6++ul5ZPS6V5RZE0Pr9QGvPm+Qaa5hWrpWVbqVwvWi97
groJai3Ry96ZIaHwYHg/afpwhzS9vVZu5C+Q33Pm3BXMaSpcJ40fbBPWYk29vG/jaMvC+knjhk/kxpIV
0pCdLw1ZefdG9mzUWKnV+qpP39vPBN/Xri7Bcm15kVx7aalczZwhV7Gw7ovMGXL9lWVazR2dgwQ9Junt
PI2LpubZLGkoWCr1U6fL5fRpDwTWaih4XWozsoXbVW/natw2+7v3kivzX5ZfkVCXNvWBwppXFy6WUizs
YsUyS297y7YaDG1wmEiVfYRcwrTVpk72YF23XjLHqMhc8F7Xnh5x+hijhlr3OKnLypfKoTHcnqf11res
xGy17woKkerYRDmbkCQXxk7wYL6lgyzHIMkso9kjTp8jTq17nJxPTNF67OwcLMWqOlBvr737Nw70Dpeq
mJFyPGq4fD86xYMXrDZ5TbHKUpCHZu5x+hijhlr3ODmBpz+JHl8+Ec4dsUxvjwFgYRx+aqBU2mPlyKBI
qR6RIGfjx7gw22KVArNFXgXZRpNHnD7GqKHWPX46dpRWuxKv+fCTA2SzYtuvtzcYNqmW+oqoaCmPHK6J
jg0eikHEIynhX3JViywwq7IQZAYYXWKEPsaoodY9fmzIMK12BXpU4HdxgK1Gb28wrFFtzVXRcXL0mShN
5BjEScxI1fA4jSxFlbkmReaBdDRz+B3Qxxg11DrHyvXmhD04CxtVW4Pe3jGAeJcBOMTHh0bLiWExkoGi
s7DC80Gaf4Dmc4Y+xqihlj7mHsWDuNestMe5DoCv4KTbSJ3hbEw2K5KDhZYLUtGsItLuAn2MUTMFWuZ4
q0Utt6LLK+AiLB8UpY3aWxIZbzLLcwEmyQLJfv5aA2foY4waar3VIOxxbMBg10XIbXgwPEJOxcR7TSIs
mqk3SEIz9zh9jFHjawDs8XVYhOs2xDEctSewq5zBdmlt6lIwtRkoThLbew6APkecWvc44U5gj5344BVb
LE/r7W8Zr1HV0SNbnYV5wSEyCk3YKB+DdY/Txxg11LrHCc+XU9hZeOVVetv/jB+jL7o/LudxYnlbjDxI
fhg9TuNMXKJHnD5H3HHoOFM+xK7VLu3aAx8ja67e1tX4Oa4eNkK+wzS5b8n7gbV4Gp6Kwoeotc8xjReS
7Y92lh/HpHp9inuFtVjzs46dfF9IaLw2fY6LZM24NO0IvZ+ZYC6b16ZOkr1YI7e9kjkMwsL9wd2kNiVN
+zy3dkD5gu/8HHJrkyfKvsCQO7+UOoyj5euoSUiWixPStdlobYs6w63Gp76EnJ9GJglrYIEv0sve1h4C
bUB7YC4yKXkbVbW8rGeo1I2dKJenTNMuFlzxlVisFbg7EP6m7wKelnfAOmjKeoTKBsX27ftmyzTUegQ8
DFjfp1EUAIIAD4pkkDPdz387CtXvxa22qv8AuZgwVn5JGi+/4ZJJ+Js+xnZ3CpTVZnPdzPYBm5CbACJA
J8CHYn2fRoEfeAz0B0lgBngRLIlo0259rr//oVUm08+FZvXKGsXaTFaZ1fq3jMaLM/2MZX3atl0N7QKQ
BeJBX9AROGbBp3GKKKLYBJgYCEJAD9ALhILeIMwJ/qef8e6A+i6gAzCCdsBLc4PhH6BxWEGn/LtwAAAA
AElFTkSuQmCC
</value>
</data>
<data name="tsbtnReset.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

4
halftoneproject-master/AssistClient/Properties/AssemblyInfo.cs
View File

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

70
halftoneproject-master/Code/FrmMain.Designer.cs generated
View File

@ -30,11 +30,11 @@
{
this.components = new System.ComponentModel.Container();
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.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.管理HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.流程管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -742,27 +742,27 @@
//
this.dgvProcess.AllowUserToAddRows = false;
this.dgvProcess.AllowUserToDeleteRows = 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.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.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);
@ -771,8 +771,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(500, 141);
@ -792,9 +792,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";
@ -805,8 +805,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";
@ -1552,7 +1552,7 @@
this.splitContainer2.Panel2.Controls.Add(this.gboxDefectList);
this.splitContainer2.Panel2MinSize = 400;
this.splitContainer2.Size = new System.Drawing.Size(463, 523);
this.splitContainer2.SplitterDistance = 29;
this.splitContainer2.SplitterDistance = 31;
this.splitContainer2.SplitterWidth = 3;
this.splitContainer2.TabIndex = 10;
//
@ -1572,7 +1572,7 @@
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.picScanner2);
this.splitContainer3.Size = new System.Drawing.Size(29, 523);
this.splitContainer3.Size = new System.Drawing.Size(31, 523);
this.splitContainer3.SplitterDistance = 226;
this.splitContainer3.SplitterWidth = 3;
this.splitContainer3.TabIndex = 11;
@ -1586,7 +1586,7 @@
this.picScanner1.Location = new System.Drawing.Point(0, 0);
this.picScanner1.Margin = new System.Windows.Forms.Padding(2);
this.picScanner1.Name = "picScanner1";
this.picScanner1.Size = new System.Drawing.Size(29, 226);
this.picScanner1.Size = new System.Drawing.Size(31, 226);
this.picScanner1.TabIndex = 7;
this.picScanner1.TabStop = false;
//
@ -1598,7 +1598,7 @@
this.picScanner2.Location = new System.Drawing.Point(0, 0);
this.picScanner2.Margin = new System.Windows.Forms.Padding(2);
this.picScanner2.Name = "picScanner2";
this.picScanner2.Size = new System.Drawing.Size(29, 294);
this.picScanner2.Size = new System.Drawing.Size(31, 294);
this.picScanner2.TabIndex = 9;
this.picScanner2.TabStop = false;
//
@ -1612,7 +1612,7 @@
this.gboxDefectList.Margin = new System.Windows.Forms.Padding(2);
this.gboxDefectList.Name = "gboxDefectList";
this.gboxDefectList.Padding = new System.Windows.Forms.Padding(2);
this.gboxDefectList.Size = new System.Drawing.Size(431, 523);
this.gboxDefectList.Size = new System.Drawing.Size(429, 523);
this.gboxDefectList.TabIndex = 3;
this.gboxDefectList.TabStop = false;
this.gboxDefectList.Tag = "0";
@ -1624,7 +1624,7 @@
this.lblDefectAddTag.AutoSize = true;
this.lblDefectAddTag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDefectAddTag.ForeColor = System.Drawing.Color.Blue;
this.lblDefectAddTag.Location = new System.Drawing.Point(280, 2);
this.lblDefectAddTag.Location = new System.Drawing.Point(278, 2);
this.lblDefectAddTag.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblDefectAddTag.Name = "lblDefectAddTag";
this.lblDefectAddTag.Size = new System.Drawing.Size(0, 12);
@ -1639,7 +1639,7 @@
this.pnlBmpList.Location = new System.Drawing.Point(2, 16);
this.pnlBmpList.Margin = new System.Windows.Forms.Padding(2);
this.pnlBmpList.Name = "pnlBmpList";
this.pnlBmpList.Size = new System.Drawing.Size(427, 505);
this.pnlBmpList.Size = new System.Drawing.Size(425, 505);
this.pnlBmpList.TabIndex = 0;
//
// chkBuzzer

54
halftoneproject-master/Code/FrmMain.resx
View File

@ -643,20 +643,20 @@
<value>
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
</value>
</data>
<data name="tsbtnDefectImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -665,11 +665,11 @@
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG9SURBVFhHYxgS4F+GuvqvFGVjKJf24KW9KM+nEJnk3+kq
x/7nqf//l632H+iA/1+i5f6/DpC89MJVpOiRhQwnVDl1wbH6wmUPAjT/fwyV+Q90wH90B7wLkPr/wlX0
/0MbgRv3THjVodqoBx6Y8f1/7iRC0AFPbAT/3zfl+nzflCcQqhUveOkm2gtl4gekOOChOf9/kPpHFgIz
gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3Mlftz7dY
gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3PFftz7dY
hf80d8AzB+H/rz3F/38Ilv7/LU4BrPdfrhoYjzpg1AGjDhh1wNB3wM9s1ee/UhSv0s0BT92k/l8uDfkP
LM89/tdrsUGlGP6HarG9CZAxA7YHJgMd8JMmDrgU7/Z/44o1/+es34NXwxMrfoOH5tz3qO6A9QdO/1+x
8yhBB4DAXWNB/vumvDMJOeBLrDyopoyFasMPSHEADDyyEPR4Ziv8BN0BH5LVvv3NUZ32PUZOEaqUMCDH
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAGPc3znAtA5i
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAEpq3zdLEAiX
AAAAAElFTkSuQmCC
</value>
</data>
@ -695,15 +695,15 @@
<data name="tsbtnSizeImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhH7dYxSAJRGMBxJyEIWpuCIGiNLDOXBhssMmyw
IbAGLTTIqCGiBqulqSkIguaoISMKItMUypMzrSvOSuOyzEOx1DusQLC+LJ5DBSeaBsb9p7t373v8hoM7
QVkUGmXr7/SMCN2WPrKNrLzqozWUNorRw0kIjzzDvY6F6/4InCj950cyYhyTYBVoe3HbNuKrWC8JGQAE
tDH4DiCUFDhkZ2BucV7tNh3Vo7HiZRZj4Oq4yAmwtuKw04wlLRK8B41y5lb4F9Ald/kAPvYeSF2AtRPL
pCpQjY74UnCMqQtoYlsehR/QEneFAc4B76SSPjVtDeoT87Gp9BA78zobnUiZfIZIOjAYh5IDiB4KfOow
BPUMxKfTwM4APEykgDY8AQ/gATyAB5Q/IDTyHL7XJbx/BsAVXjicvITMR0ROqkCIHglIFSk8VVJih4xY
tLbaUiUB7A44YWPdCSubFs4BmxRvMDc6booO2LQfw9qeIyfgo32Ru8oixZdzAgbiSU/XtRqNcZcPIBsm
I+SZdyP0E8C8ZABLt9pELdqau0IA2Sg1XXOni3c/Tqc1zByIgmNv+f83/gZQlHgADzDZXcZPgMliREt8
/zmB4B2Be/U7rEZs4wAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMDxm4IgaG0KgqA1sg91abChIsMG
GwJz0EKDChsiatBampqCIGiOGlKiQDLNoDw5+7rkSjMuy7yMSj0xA+HqyeJtqOBE06C4/3T33vu8/IaD
O+xPFB5O1FzpWRG6LX5UM1Xm72E0tPYOZwaSEBlMwbUuAee9t3CoCHh3ZeQILsZL0fbCtmYkFvFuCjIA
CGqj8BVAKmhwyY7B1uT2W+t3a9BY4bI14uBpO80KcEgIWG/Ak3Yx0YVGeduXB2bQJX+5AN72bkk9gLeQ
85QyWIGO+FTIwFYHNdHVA3kA0BJ/+QG8QLTTyTMV4wjp49PRca4/YXqevBtNm31DN1ywLwZFB5BdNJyp
IhDSsxCb4CBhArgfTQMz9AgCQAAIAAHw9wHhwVTkWhc/+TUAIT+BnTEfZD4irZQSStAjjFJSJUcKutEl
I2cdEme6KACr2g0ry25YsNh5B5xSotZW57ooOMCyvQdLG66sgLc2RfvldikxnxWgjiUPOs5VaIy/XAAf
4TKyNfNuhL8D2KcMYO5SG69CW7OXD+AjWsVUXulinQ8TnIadAlHI8JL7f+NPAAVJAAgA87bH+A4w241o
Seg/h2GvTpv1N1uFB9AAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnLight.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -730,8 +730,8 @@
hSD+56M51fL5Z2xlyAfodJyTcaLd9RzkewtHdhEF7GHlB3rBESBlTn9ZbqhuHUoy5yd1CGFB5X0INOsc
4L/h+gBwY9z1HK5xfc9l/kNXwuEnFR5xPg+SPeSbaEdA2jGE5tYhtvQscppHcOj0ZaTXdCOysBEhtkr4
J9vxRUwe4CP3GVPPISY+MccdAdbY5FRj4lloBNJO9KCi8wouTs5iYoZNcO0mGvrGkXOyG1FFzdhxuP7v
CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLOHORSJw+26/EHt+arMuFBBR0PD/OL4D
z0PkL1DOc7dzBt5pAAAAAElFTkSuQmCC
CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLGHORSJw+26/EHt+arMuFBBR0PD/OL4D
z0PkL0wqc7U3HF6aAAAAAElFTkSuQmCC
</value>
</data>
<data name="tsbtnLog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

7
halftoneproject-master/Code/WebService.cs
View File

@ -494,6 +494,8 @@ namespace ProductionControl
string[] files;
//文件名格式：$"Size_SN{order.SN}_I{res.index}_X{res.Defects_X}_Y{res.Defects_Y}_.....json/bmp
//--缺陷
path = $"{Config.Defect_Compress_SavePath}\\{date}\\{sn}\\";
if (Directory.Exists(path))
@ -507,8 +509,9 @@ namespace ProductionControl
if (File.Exists(path + key + ".bmp"))
data.Add(key, JArray.Parse(File.ReadAllText(file)));
}
}
//--比对
}
//2024-3-5 先传输比对，再传输缺陷 ,取消
//--比对
path = $"{Config.SizeBmp_Zoom_Image_SavePath}\\{date}\\{sn}\\";
if (Directory.Exists(path))
{