From 2dcc0769bc73d224dae133fc7f8de46d4aadf088 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 8 Oct 2024 14:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=90=8C=E7=A7=8D=E7=89=A9?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/QcDefectCollectionController.cs | 23 ++++++++--- .../IService/IQcDefectCollectionService.cs | 10 +++++ .../MES/quality/QcDefectCollectionService.cs | 39 ++++++++++++++++++- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs b/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs index 27ebcdf..8e4cb9a 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs @@ -29,14 +29,14 @@ namespace DOAN.Admin.WebApi.Controllers //TODO 生成指定产线和日期的 缺陷收集计划 [HttpGet("generate_defectCollection")] - public IActionResult GenerateDefectConllectionPlan(string line_code,DateTime dateTime) + public IActionResult GenerateDefectConllectionPlan(string line_code, DateTime dateTime) { - dateTime= ConvertDateTime.ConvertLocalDate(dateTime); - if(string.IsNullOrEmpty(line_code)||dateTime== DateTime.MinValue) + dateTime = ConvertDateTime.ConvertLocalDate(dateTime); + if (string.IsNullOrEmpty(line_code) || dateTime == DateTime.MinValue) { throw new CustomException("请求数据为空"); } - var response = _QcDefectCollectionService.GenerateDefectConllectionPlan( line_code, dateTime,HttpContext.GetName()); + var response = _QcDefectCollectionService.GenerateDefectConllectionPlan(line_code, dateTime, HttpContext.GetName()); return SUCCESS(response); } @@ -64,7 +64,7 @@ namespace DOAN.Admin.WebApi.Controllers public IActionResult GetQcDefectCollection(string Id) { var response = _QcDefectCollectionService.GetInfo(Id); - + var info = response.Adapt(); return SUCCESS(info); } @@ -85,6 +85,19 @@ namespace DOAN.Admin.WebApi.Controllers return SUCCESS(response); } + //TODO 复制同种物料 + [HttpGet] + public IActionResult CopySameMaterial(string id) + { + if(string.IsNullOrEmpty(id)) + { + throw new CustomException("id为空"); + } + var response = _QcDefectCollectionService.CopySameMaterial(id); + + return SUCCESS(response); + } + /// /// 更新缺陷收集 /// diff --git a/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs b/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs index 0fab5a3..00cbf06 100644 --- a/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs +++ b/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs @@ -16,14 +16,24 @@ namespace DOAN.Service.MES.quality { bool GenerateDefectConllectionPlan(string line_code, DateTime dateTime, string CreatedBy); + + PagedInfo GetList(QcDefectCollectionQueryDto parm); + + QcDefectCollection GetInfo(string Id); + + QcDefectCollection AddQcDefectCollection(QcDefectCollection parm); + bool CopySameMaterial(string id); + int UpdateQcDefectCollection(QcDefectCollection parm); + + List GetAllLines(); } diff --git a/DOAN.Service/MES/quality/QcDefectCollectionService.cs b/DOAN.Service/MES/quality/QcDefectCollectionService.cs index 8fd0a1b..ad61e68 100644 --- a/DOAN.Service/MES/quality/QcDefectCollectionService.cs +++ b/DOAN.Service/MES/quality/QcDefectCollectionService.cs @@ -33,7 +33,7 @@ namespace DOAN.Service.MES.quality /// public bool GenerateDefectConllectionPlan(string line_code, DateTime dateTime, string CreatedBy) { - bool isGenerate=Context.Queryable().Where(it=>it.LineCode==line_code).Where(it=>it.DateTime==dateTime).Any(); + bool isGenerate = Context.Queryable().Where(it => it.LineCode == line_code).Where(it => it.DateTime == dateTime).Any(); if (isGenerate) { return false; } List qcDefectCollections = new List(); //1 查询 产线物料需求计划 @@ -58,7 +58,7 @@ namespace DOAN.Service.MES.quality qcDefect.DateTime = dateTime; qcDefect.MaterialCode = item.MaterialCode; qcDefect.MaterialName = item.MaterialName; - var itemm = ActualDistributionQuantityOfMaterials.Where(it => it.MaterialCode == item.MaterialCode).First(); + var itemm = ActualDistributionQuantityOfMaterials.Where(it => it.MaterialCode == item.MaterialCode).FirstOrDefault(); qcDefect.Specification = item.Specification; qcDefect.Unit = item.Unit; qcDefect.PlanNum = item.RequireNum; @@ -101,6 +101,7 @@ namespace DOAN.Service.MES.quality var response = Queryable() .Where(predicate.ToExpression()) + .OrderBy(it => it.MaterialCode) .ToPage(parm); return response; @@ -132,6 +133,40 @@ namespace DOAN.Service.MES.quality return Context.Insertable(model).ExecuteReturnEntity(); } + + public bool CopySameMaterial(string id) + { + QcDefectCollection qcDefect = Context.Queryable().Where(it => it.Id == id).First(); + + QcDefectCollection newqcDefect = new QcDefectCollection(); + newqcDefect.Id = XueHua; + newqcDefect.LineCode = qcDefect.LineCode; + newqcDefect.DateTime = qcDefect.DateTime; + newqcDefect.MaterialCode = qcDefect.MaterialCode; + newqcDefect.MaterialName = qcDefect.MaterialName; + newqcDefect.Unit = qcDefect.Unit; + newqcDefect.Specification = qcDefect.Specification; + newqcDefect.PlanNum = qcDefect.PlanNum; + newqcDefect.ActualNum = qcDefect.ActualNum; + newqcDefect.CreatedBy = qcDefect.CreatedBy; + newqcDefect.CreatedTime=DateTime.Now; + + + + + + int result = Context.Insertable(newqcDefect).ExecuteCommand(); + if (result == 0) + { + return false; + } + else + { + return true; + } + + } + /// /// 修改缺陷收集 ///