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; }
+
+ ///
+ /// 缺陷描述
+ ///
+ [SugarColumn(ColumnName = "defect_name")]
+ public string DefectName { get; set; }
+
///
/// 数量
///
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().Where(it => it.UserName == queryFQCDto.CheckName).Select(it => it.NickName).First();
+ queryFQCDto.CheckName = string.IsNullOrEmpty(NickName) ? queryFQCDto.CheckName + "|异常人员|" : NickName;
+ }
+
// 检查 Workorder 是否存在
var existingRecord = Context.Queryable()
.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().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().Where(it => it.UserName == queryFQCDto.CheckName).Select(it => it.NickName).First();
+ queryFQCDto.CheckName = string.IsNullOrEmpty(NickName) ? queryFQCDto.CheckName + "|异常人员|" : NickName;
+ flag = Context.Updateable()
+ .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()
+ }
+ else
+ {
+ flag = Context.Updateable()
.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;
}