Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

成品缺陷收集 修改表结构

Browse Source
This commit is contained in:
qianhao.xu
2024-12-27 15:06:06 +08:00
parent 3e3497bed3
commit 219e88418c
6 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcFinishedproductDefectController.cs
View File

@@ -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);
}

4
DOAN.Model/DOAN.Model.csproj
View File

@@ -12,8 +12,4 @@
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.169" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="MES\Quality\FQC\Dto\" />
</ItemGroup>
</Project>

37
DOAN.Model/MES/Quality/FQC/Dto/QueryFQCDto.cs Normal file
View File

@@ -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
{
/// <summary>
/// 工单号
/// </summary>
public string WorkOrder { get; set; }
/// <summary>
/// 缺陷code
/// </summary>
public string DefectCode { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime CheckDateTime { get; set; }
/// <summary>
/// 检查人名称
/// </summary>
public string CheckName { get; set; }
/// <summary>
/// 修改的数量
/// </summary>
public int num { get; set; }
}
}

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

@@ -33,6 +33,23 @@ namespace DOAN.Model.MES.quality.FQC
/// 数量
/// </summary>
public int? Number { get; set; }
/// <summary>
/// 检查时间
/// </summary>
[SugarColumn(ColumnName = "check_datetime")]
public DateTime? CheckDatetime { get; set; }
/// <summary>
/// 检查人
/// </summary>
[SugarColumn(ColumnName = "check_name")]
public string CheckName { get; set; }
/// <summary>
/// CreatedBy

5
DOAN.Service/MES/Quality/FQC/IService/IQcFinishedproductDefectService.cs
View File

@@ -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<QcFinishedproductDefectCollection> SearchDefectList(string WorkOrder);
}
}

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

@@ -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<QcFinishedproductDefectCollection>, IQcFinishedproductDefectService
{
public bool AddDefectNum(string WorkOrder, string DefectCode)
public bool AddDefectNum(QueryFQCDto queryFQCDto)
{
int flag = 0;
// 检查 Workorder 是否存在
var existingRecord = Context.Queryable<QcFinishedproductDefectCollection>()
.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<QcFinishedproductDefectCollection>()
.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;
}