From caa7faac58611715cff9d5b084ce9acf3a7c53d6 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 27 Dec 2024 15:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FQC/QcFinishedproductDefectCollection.cs  |  7 +++
 .../FQC/QcFinishedproductDefectService.cs     | 45 ++++++++++++++++---
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs b/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
index d8d65fc..feb39d2 100644
--- a/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
+++ b/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
@@ -29,6 +29,13 @@ namespace DOAN.Model.MES.quality.FQC
         [SugarColumn(ColumnName = "defect_code")]
         public string DefectCode { get; set; }
 
+
+        /// <summary>
+        /// 缺陷描述 
+        /// </summary>
+        [SugarColumn(ColumnName = "defect_name")]
+        public string DefectName { get; set; }
+
         /// <summary>
         /// 数量 
         /// </summary>
diff --git a/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs b/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
index cf8e6f8..958e41c 100644
--- a/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
+++ b/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
@@ -3,9 +3,11 @@ using DOAN.Model.MES.quality.FQC;
 using DOAN.Model.MES.quality.IQC;
 using DOAN.Model.MES.quality.IQC.Dto;
 using DOAN.Model.MES.Quality.FQC.Dto;
+using DOAN.Model.System;
 using DOAN.Repository;
 using DOAN.Service.MES.quality.FQC.IService;
 using Infrastructure.Attribute;
+using SqlSugar.DistributedSystem.Snowflake;
 using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
 
 namespace DOAN.Service.MES.quality.FQC
@@ -19,7 +21,12 @@ namespace DOAN.Service.MES.quality.FQC
         public bool AddDefectNum(QueryFQCDto queryFQCDto)
         {
             int flag = 0;
-
+            if(!string.IsNullOrEmpty(queryFQCDto.CheckName))
+            {
+                string NickName = Context.Queryable<SysUser>().Where(it => it.UserName == queryFQCDto.CheckName).Select(it => it.NickName).First();
+                queryFQCDto.CheckName = string.IsNullOrEmpty(NickName) ? queryFQCDto.CheckName + "|异常人员|" : NickName;
+            }
+         
             // 检查 Workorder 是否存在
             var existingRecord = Context.Queryable<QcFinishedproductDefectCollection>()
                 .Where(it => it.Workorder == queryFQCDto.WorkOrder)
@@ -33,7 +40,9 @@ namespace DOAN.Service.MES.quality.FQC
                     .SetColumns(it => new QcFinishedproductDefectCollection
                     {
                         Number = it.Number + 1,
-                        UpdatedTime = DateTime.Now
+                        UpdatedTime = DateTime.Now,
+                        CheckDatetime = DateTime.Now,
+                        CheckName=queryFQCDto.CheckName
                     })
                      .Where(it => it.Workorder == queryFQCDto.WorkOrder)
                      .Where(it => it.DefectCode == queryFQCDto.DefectCode)
@@ -46,8 +55,11 @@ namespace DOAN.Service.MES.quality.FQC
                 qcFinishedproductDefect.Id = XueHua;
                 qcFinishedproductDefect.Workorder = queryFQCDto.WorkOrder;
                 qcFinishedproductDefect.DefectCode = queryFQCDto.DefectCode;
+                qcFinishedproductDefect.DefectName = Context.Queryable<QcDefectConfig>().Where(it => it.Code == queryFQCDto.DefectCode).Select(it => it.Name).First();
+                qcFinishedproductDefect.CheckName = queryFQCDto.CheckName;
+                qcFinishedproductDefect.CheckDatetime = DateTime.Now;
                 qcFinishedproductDefect.CreatedTime = DateTime.Now;
-                qcFinishedproductDefect.UpdatedTime = DateTime.Now;
+            
                 qcFinishedproductDefect.Number = 1;
                 flag = Context.Insertable(qcFinishedproductDefect).ExecuteCommand();
             }
@@ -59,16 +71,39 @@ namespace DOAN.Service.MES.quality.FQC
         public bool UpdateDefectNum(QueryFQCDto queryFQCDto)
         {
             int flag = 0;
+            if (!string.IsNullOrEmpty(queryFQCDto.CheckName))
+            {
+                string NickName = Context.Queryable<SysUser>().Where(it => it.UserName == queryFQCDto.CheckName).Select(it => it.NickName).First();
+                queryFQCDto.CheckName = string.IsNullOrEmpty(NickName) ? queryFQCDto.CheckName + "|异常人员|" : NickName;
+                flag = Context.Updateable<QcFinishedproductDefectCollection>()
+                      .SetColumns(it => new QcFinishedproductDefectCollection
+                      {
+                          Number = queryFQCDto.num,
+                          UpdatedTime = DateTime.Now,
+                          CheckDatetime = DateTime.Now,
+                          CheckName = queryFQCDto.CheckName,
+                      })
+                       .Where(it => it.Workorder == queryFQCDto.WorkOrder)
+                       .Where(it => it.DefectCode == queryFQCDto.DefectCode)
+                      .ExecuteCommand();
 
-            flag = Context.Updateable<QcFinishedproductDefectCollection>()
+            }
+            else
+            {
+                flag = Context.Updateable<QcFinishedproductDefectCollection>()
                   .SetColumns(it => new QcFinishedproductDefectCollection
                   {
                       Number = queryFQCDto.num,
-                      UpdatedTime = DateTime.Now
+                      UpdatedTime = DateTime.Now,
+                      CheckDatetime = DateTime.Now,
+
                   })
                    .Where(it => it.Workorder == queryFQCDto.WorkOrder)
                    .Where(it => it.DefectCode == queryFQCDto.DefectCode)
                   .ExecuteCommand();
+            }
+
+            
             return flag > 0 ? true : false;
         }