RIZO/BeizeValveBackend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加

Browse Source
This commit is contained in:
qianhao.xu 2024-12-27 15:28:05 +08:00
parent 219e88418c
commit caa7faac58
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
View File

@ -29,6 +29,13 @@ namespace DOAN.Model.MES.quality.FQC
[SugarColumn(ColumnName = "defect_code")] [SugarColumn(ColumnName = "defect_code")]
public string DefectCode { get; set; } public string DefectCode { get; set; }
/// <summary>
/// 缺陷描述
/// </summary>
[SugarColumn(ColumnName = "defect_name")]
public string DefectName { get; set; }
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>

45
DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
View File

@ -3,9 +3,11 @@ using DOAN.Model.MES.quality.FQC;
using DOAN.Model.MES.quality.IQC; using DOAN.Model.MES.quality.IQC;
using DOAN.Model.MES.quality.IQC.Dto; using DOAN.Model.MES.quality.IQC.Dto;
using DOAN.Model.MES.Quality.FQC.Dto; using DOAN.Model.MES.Quality.FQC.Dto;
using DOAN.Model.System;
using DOAN.Repository; using DOAN.Repository;
using DOAN.Service.MES.quality.FQC.IService; using DOAN.Service.MES.quality.FQC.IService;
using Infrastructure.Attribute; using Infrastructure.Attribute;
using SqlSugar.DistributedSystem.Snowflake;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData; using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
namespace DOAN.Service.MES.quality.FQC namespace DOAN.Service.MES.quality.FQC
@ -19,7 +21,12 @@ namespace DOAN.Service.MES.quality.FQC
public bool AddDefectNum(QueryFQCDto queryFQCDto) public bool AddDefectNum(QueryFQCDto queryFQCDto)
{ {
int flag = 0; 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 是否存在 // 检查 Workorder 是否存在
var existingRecord = Context.Queryable<QcFinishedproductDefectCollection>() var existingRecord = Context.Queryable<QcFinishedproductDefectCollection>()
.Where(it => it.Workorder == queryFQCDto.WorkOrder) .Where(it => it.Workorder == queryFQCDto.WorkOrder)
@ -33,7 +40,9 @@ namespace DOAN.Service.MES.quality.FQC
.SetColumns(it => new QcFinishedproductDefectCollection .SetColumns(it => new QcFinishedproductDefectCollection
{ {
Number = it.Number + 1, 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.Workorder == queryFQCDto.WorkOrder)
.Where(it => it.DefectCode == queryFQCDto.DefectCode) .Where(it => it.DefectCode == queryFQCDto.DefectCode)
@ -46,8 +55,11 @@ namespace DOAN.Service.MES.quality.FQC
qcFinishedproductDefect.Id = XueHua; qcFinishedproductDefect.Id = XueHua;
qcFinishedproductDefect.Workorder = queryFQCDto.WorkOrder; qcFinishedproductDefect.Workorder = queryFQCDto.WorkOrder;
qcFinishedproductDefect.DefectCode = queryFQCDto.DefectCode; 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.CreatedTime = DateTime.Now;
qcFinishedproductDefect.UpdatedTime = DateTime.Now;
qcFinishedproductDefect.Number = 1; qcFinishedproductDefect.Number = 1;
flag = Context.Insertable(qcFinishedproductDefect).ExecuteCommand(); flag = Context.Insertable(qcFinishedproductDefect).ExecuteCommand();
} }
@ -59,16 +71,39 @@ namespace DOAN.Service.MES.quality.FQC
public bool UpdateDefectNum(QueryFQCDto queryFQCDto) public bool UpdateDefectNum(QueryFQCDto queryFQCDto)
{ {
int flag = 0; 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 .SetColumns(it => new QcFinishedproductDefectCollection
{ {
Number = queryFQCDto.num, Number = queryFQCDto.num,
UpdatedTime = DateTime.Now UpdatedTime = DateTime.Now,
CheckDatetime = DateTime.Now,
}) })
.Where(it => it.Workorder == queryFQCDto.WorkOrder) .Where(it => it.Workorder == queryFQCDto.WorkOrder)
.Where(it => it.DefectCode == queryFQCDto.DefectCode) .Where(it => it.DefectCode == queryFQCDto.DefectCode)
.ExecuteCommand(); .ExecuteCommand();
}
return flag > 0 ? true : false; return flag > 0 ? true : false;
} }