From 481b83a7ae5e0c604f8e4d398e99d6b2e4db7801 Mon Sep 17 00:00:00 2001
From: CPL <1179393954@qq.com>
Date: Wed, 27 Mar 2024 18:44:01 +0800
Subject: [PATCH] =?UTF-8?q?V2.0.5=20=E5=8F=91=E7=8E=B0=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=88=86=E5=B8=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BanBoShi/SysCtrl/SysMgr.cs                | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
index 5ba2c103..f8fa0f14 100644
--- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
+++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
@@ -8371,7 +8371,7 @@ namespace MaiMuAOI.SysCtrl
                                 Log($"{res.stepIndex + 1}-{res.processName}", $"转换后坐标数据：{JsonConvert.SerializeObject(res.defectInfor2RestorationDeskPage)}");
                                 if (order.DefectInfoList == null)
                                     order.DefectInfoList = new List<DefectInfo>();
-#if false                              
+#if true                              
                                 foreach (var item in res.defectInfor2RestorationDeskPage)
                                 order.DefectInfoList.Add(new DefectInfo()
                                 {
@@ -8381,7 +8381,7 @@ namespace MaiMuAOI.SysCtrl
                                     Y = double.Parse(item[2]),
                                     ZXD = double.Parse(item[4]), 
                                     Index = int.Parse(item[0]),
-                                    Area = item.Count>5?double.Parse(item[5]):0,
+                                    //Area = item.Count>5?double.Parse(item[5]):0,
                                     ModifyUserCode = UserMgr.LoginUser.Code,
                                     CreateUserCode = UserMgr.LoginUser.Code,
                                 });
@@ -8422,16 +8422,17 @@ namespace MaiMuAOI.SysCtrl
                             {
                                 //2024-03-07 图片index计算
                                 List<string> indexList = new List<string>();
-                                foreach (var item in res.defectInfor2RestorationDeskPage)
-                                {
-                                    if (indexList.Count == 0)
-                                        indexList.Add(item[0]);
-                                    else
+                                if (res.defectInfor2RestorationDeskPage != null && res.defectInfor2RestorationDeskPage.Count > 0)
+                                    foreach (var item in res.defectInfor2RestorationDeskPage)
                                     {
-                                        if (!indexList.Contains(item[0]))
+                                        if (indexList.Count == 0)
                                             indexList.Add(item[0]);
+                                        else
+                                        {
+                                            if (!indexList.Contains(item[0]))
+                                                indexList.Add(item[0]);
+                                        }
                                     }
-                                }
 
                                 path = Util.CreateSubDir(confMgr.SysConfigParams.DefectSmallImag.SavePath, new List<string> { order.CreateTime.ToString("yyyyMMdd"), order.SN });
                                 path += $"Defect_SN{order.SN}_I{res.index}_X{res.Xmm}_Y{res.Ymm}_{picName}";
@@ -8442,7 +8443,10 @@ namespace MaiMuAOI.SysCtrl
                                 {
                                     lock (ImageSaveObj)
                                     {
-                                        res.bmps_tag[i].Save(path + $"_i{i}_{indexList[i]}.bmp", ImageFormat.Bmp);
+                                        if (res.bmps_tag.Count() != indexList.Count)
+                                            res.bmps_tag[i].Save(path + $".bmp", ImageFormat.Bmp);
+                                        else
+                                            res.bmps_tag[i].Save(path + $"_i{i}_{indexList[i]}.bmp", ImageFormat.Bmp);
                                     }
                                     //res.bmps_tag[i].Save(path + $"_i{i}.bmp", ImageFormat.Bmp);
                                     //res.bmps_tag[i].Save(path + $"{indexList[i]}.bmp", ImageFormat.Bmp);