diff --git a/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcFinishedproductDefectController.cs b/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcFinishedproductDefectController.cs
index 325cd16..0afa0c4 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcFinishedproductDefectController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcFinishedproductDefectController.cs
@@ -1,6 +1,7 @@
using DOAN.Admin.WebApi.Filters;
using DOAN.Model.MES.quality.IQC;
using DOAN.Model.MES.quality.IQC.Dto;
+using DOAN.Model.MES.Quality.FQC.Dto;
using DOAN.Service.MES.quality.FQC.IService;
using Microsoft.AspNetCore.Mvc;
@@ -23,26 +24,26 @@ namespace DOAN.WebApi.Controllers.MES.quality.FQC
//TODO 增加 缺陷数
[HttpGet("add_defect_num")]
- public IActionResult AddDefectNum(string WorkOrder, string DefectCode)
+ public IActionResult AddDefectNum([FromQuery] QueryFQCDto queryFQCDto)
{
- if (string.IsNullOrEmpty(WorkOrder) || string.IsNullOrEmpty(DefectCode))
+ if (string.IsNullOrEmpty(queryFQCDto.WorkOrder) || string.IsNullOrEmpty(queryFQCDto.DefectCode))
{
throw new CustomException("WorkOrder为空||DefectCode为空");
}
- var response = qcFinishedproductDefectService.AddDefectNum(WorkOrder, DefectCode);
+ var response = qcFinishedproductDefectService.AddDefectNum(queryFQCDto);
return SUCCESS(response);
}
//TODO 修改缺陷数
[HttpGet("update_defect_num")]
- public IActionResult UpdateDefectNum(string WorkOrder, string DefectCode, int num)
+ public IActionResult UpdateDefectNum([FromQuery] QueryFQCDto queryFQCDto)
{
- if (string.IsNullOrEmpty(WorkOrder) || string.IsNullOrEmpty(DefectCode))
+ if (string.IsNullOrEmpty(queryFQCDto.WorkOrder) || string.IsNullOrEmpty(queryFQCDto.DefectCode))
{
throw new CustomException("WorkOrder为空||DefectCode为空");
}
- var response = qcFinishedproductDefectService.UpdateDefectNum(WorkOrder, DefectCode, num);
+ var response = qcFinishedproductDefectService.UpdateDefectNum(queryFQCDto);
return SUCCESS(response);
}
diff --git a/DOAN.Model/DOAN.Model.csproj b/DOAN.Model/DOAN.Model.csproj
index 47eeff4..7f2c2ac 100644
--- a/DOAN.Model/DOAN.Model.csproj
+++ b/DOAN.Model/DOAN.Model.csproj
@@ -12,8 +12,4 @@
-
-
-
-
diff --git a/DOAN.Model/MES/Quality/FQC/Dto/QueryFQCDto.cs b/DOAN.Model/MES/Quality/FQC/Dto/QueryFQCDto.cs
new file mode 100644
index 0000000..b166e28
--- /dev/null
+++ b/DOAN.Model/MES/Quality/FQC/Dto/QueryFQCDto.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.Quality.FQC.Dto
+{
+ public class QueryFQCDto
+ {
+ ///
+ /// 工单号
+ ///
+ public string WorkOrder { get; set; }
+
+ ///
+ /// 缺陷code
+ ///
+ public string DefectCode { get; set; }
+
+ ///
+ /// 检查时间
+ ///
+ public DateTime CheckDateTime { get; set; }
+
+
+ ///
+ /// 检查人名称
+ ///
+ public string CheckName { get; set; }
+
+ ///
+ /// 修改的数量
+ ///
+ public int num { get; set; }
+ }
+}
diff --git a/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs b/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
index 400a5a8..d8d65fc 100644
--- a/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
+++ b/DOAN.Model/MES/Quality/FQC/QcFinishedproductDefectCollection.cs
@@ -33,6 +33,23 @@ namespace DOAN.Model.MES.quality.FQC
/// 数量
///
public int? Number { get; set; }
+
+
+
+ ///
+ /// 检查时间
+ ///
+ [SugarColumn(ColumnName = "check_datetime")]
+ public DateTime? CheckDatetime { get; set; }
+
+
+ ///
+ /// 检查人
+ ///
+ [SugarColumn(ColumnName = "check_name")]
+ public string CheckName { get; set; }
+
+
///
/// CreatedBy
diff --git a/DOAN.Service/MES/Quality/FQC/IService/IQcFinishedproductDefectService.cs b/DOAN.Service/MES/Quality/FQC/IService/IQcFinishedproductDefectService.cs
index 5916044..26fc38a 100644
--- a/DOAN.Service/MES/Quality/FQC/IService/IQcFinishedproductDefectService.cs
+++ b/DOAN.Service/MES/Quality/FQC/IService/IQcFinishedproductDefectService.cs
@@ -1,4 +1,5 @@
using DOAN.Model.MES.quality.FQC;
+using DOAN.Model.MES.Quality.FQC.Dto;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,8 +10,8 @@ namespace DOAN.Service.MES.quality.FQC.IService
{
public interface IQcFinishedproductDefectService
{
- bool AddDefectNum(string WorkOrder,string name);
- bool UpdateDefectNum(string WorkOrder,string name,int num);
+ bool AddDefectNum(QueryFQCDto queryFQCDto);
+ bool UpdateDefectNum(QueryFQCDto queryFQCDto);
List SearchDefectList(string WorkOrder);
}
}
diff --git a/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs b/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
index e5e5eb2..cf8e6f8 100644
--- a/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
+++ b/DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
@@ -2,6 +2,7 @@
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.Repository;
using DOAN.Service.MES.quality.FQC.IService;
using Infrastructure.Attribute;
@@ -15,14 +16,14 @@ namespace DOAN.Service.MES.quality.FQC
[AppService(ServiceType = typeof(IQcFinishedproductDefectService), ServiceLifetime = LifeTime.Transient)]
public class QcFinishedproductDefectService : BaseService, IQcFinishedproductDefectService
{
- public bool AddDefectNum(string WorkOrder, string DefectCode)
+ public bool AddDefectNum(QueryFQCDto queryFQCDto)
{
int flag = 0;
// 检查 Workorder 是否存在
var existingRecord = Context.Queryable()
- .Where(it => it.Workorder == WorkOrder)
- .Where(it => it.DefectCode == DefectCode)
+ .Where(it => it.Workorder == queryFQCDto.WorkOrder)
+ .Where(it => it.DefectCode == queryFQCDto.DefectCode)
.First();
if (existingRecord != null)
@@ -34,8 +35,8 @@ namespace DOAN.Service.MES.quality.FQC
Number = it.Number + 1,
UpdatedTime = DateTime.Now
})
- .Where(it => it.Workorder == WorkOrder)
- .Where(it => it.DefectCode == DefectCode)
+ .Where(it => it.Workorder == queryFQCDto.WorkOrder)
+ .Where(it => it.DefectCode == queryFQCDto.DefectCode)
.ExecuteCommand();
}
else
@@ -43,8 +44,8 @@ namespace DOAN.Service.MES.quality.FQC
// 插入新记录
QcFinishedproductDefectCollection qcFinishedproductDefect = new QcFinishedproductDefectCollection();
qcFinishedproductDefect.Id = XueHua;
- qcFinishedproductDefect.Workorder = WorkOrder;
- qcFinishedproductDefect.DefectCode = DefectCode;
+ qcFinishedproductDefect.Workorder = queryFQCDto.WorkOrder;
+ qcFinishedproductDefect.DefectCode = queryFQCDto.DefectCode;
qcFinishedproductDefect.CreatedTime = DateTime.Now;
qcFinishedproductDefect.UpdatedTime = DateTime.Now;
qcFinishedproductDefect.Number = 1;
@@ -55,18 +56,18 @@ namespace DOAN.Service.MES.quality.FQC
}
- public bool UpdateDefectNum(string WorkOrder, string DefectCode, int num)
+ public bool UpdateDefectNum(QueryFQCDto queryFQCDto)
{
int flag = 0;
flag = Context.Updateable()
.SetColumns(it => new QcFinishedproductDefectCollection
{
- Number = num,
+ Number = queryFQCDto.num,
UpdatedTime = DateTime.Now
})
- .Where(it => it.Workorder == WorkOrder)
- .Where(it => it.DefectCode == DefectCode)
+ .Where(it => it.Workorder == queryFQCDto.WorkOrder)
+ .Where(it => it.DefectCode == queryFQCDto.DefectCode)
.ExecuteCommand();
return flag > 0 ? true : false;
}