From 2074ea2e8404ea5bccf3c33b9139d04d990e65ba Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 20 Mar 2024 14:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=5F?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=BB=9F=E8=AE=A1:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workorder/20240319161050周2生产计划 .xlsx | Bin 0 -> 20588 bytes .../20240320082622周3生产计划 .xlsx | Bin 0 -> 21248 bytes ZR.Model/MES/qc/QcQualityStatisticsAgain.cs | 10 ++++++++++ ZR.Model/MES/qc/QcQualityStatisticsFinal.cs | 10 ++++++++++ ZR.Model/MES/qc/QcQualityStatisticsFirst.cs | 8 ++++++++ ZR.Model/MES/qc/QcQualityStatisticsTotal.cs | 12 ++++++++++++ ZR.Service/mes/pro/ProWorkorderServiceV2.cs | 2 +- ZR.Service/mes/qc/FirstFQCService.cs | 18 +++++++++++++++++- 8 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 ZR.Admin.WebApi/wwwroot/workorder/20240319161050周2生产计划 .xlsx create mode 100644 ZR.Admin.WebApi/wwwroot/workorder/20240320082622周3生产计划 .xlsx diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20240319161050周2生产计划 .xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20240319161050周2生产计划 .xlsx new file mode 100644 index 0000000000000000000000000000000000000000..a90f0147f9c2b0ae110fb35c90653457721ac016 GIT binary patch literal 20588 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

}M<@T{M;$7W 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 [SugarColumn(ColumnName = "product_description")] public string ProductDescription { get; set; } + + + + ///

+ /// 颜色 + /// + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } + + /// /// 生产投入数 /// diff --git a/ZR.Model/MES/qc/QcQualityStatisticsFinal.cs b/ZR.Model/MES/qc/QcQualityStatisticsFinal.cs index 64d969cf..b6607671 100644 --- a/ZR.Model/MES/qc/QcQualityStatisticsFinal.cs +++ b/ZR.Model/MES/qc/QcQualityStatisticsFinal.cs @@ -26,6 +26,16 @@ namespace ZR.Model.MES.qc /// [SugarColumn(ColumnName = "finished_part_number")] public string FinishedPartNumber { get; set; } + + + + /// + /// 颜色 + /// + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } + + /// /// 班次 /// diff --git a/ZR.Model/MES/qc/QcQualityStatisticsFirst.cs b/ZR.Model/MES/qc/QcQualityStatisticsFirst.cs index f1fcf791..6028d9f8 100644 --- a/ZR.Model/MES/qc/QcQualityStatisticsFirst.cs +++ b/ZR.Model/MES/qc/QcQualityStatisticsFirst.cs @@ -31,6 +31,14 @@ namespace ZR.Model.MES.qc /// [SugarColumn(ColumnName = "product_description")] public string ProductDescription { get; set; } + + /// + /// 颜色 + /// + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } + + /// /// 生产投入数 /// diff --git a/ZR.Model/MES/qc/QcQualityStatisticsTotal.cs b/ZR.Model/MES/qc/QcQualityStatisticsTotal.cs index 7f1c9b08..da86ecfa 100644 --- a/ZR.Model/MES/qc/QcQualityStatisticsTotal.cs +++ b/ZR.Model/MES/qc/QcQualityStatisticsTotal.cs @@ -26,11 +26,23 @@ namespace ZR.Model.MES.qc /// [SugarColumn(ColumnName = "finished_part_number")] public string FinishedPartNumber { get; set; } + + /// /// 描述 /// [SugarColumn(ColumnName = "product_description")] public string ProductDescription { get; set; } + + + + /// + /// 颜色 + /// + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } + + /// /// 生产投入数 /// diff --git a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs index 188ab921..591805d8 100644 --- a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs @@ -55,7 +55,7 @@ namespace ZR.Service.mes.pro .AndIF(year > 0, it => it.Year == year) .AndIF(week > 0, it => it.Week == week) .AndIF(date > 0, it => it.Date == date) - .ToExpression(); + .ToExpression(); int totalCount = 0; List proWorkorderList = Context.Queryable().Where(predicate).Where(it=>it.Remark3=="是").OrderBy(it => it.Sort).ToPageList(pageNum, pageSize, ref totalCount); diff --git a/ZR.Service/mes/qc/FirstFQCService.cs b/ZR.Service/mes/qc/FirstFQCService.cs index bed1cdf2..2a28a9d4 100644 --- a/ZR.Service/mes/qc/FirstFQCService.cs +++ b/ZR.Service/mes/qc/FirstFQCService.cs @@ -1398,6 +1398,8 @@ namespace ZR.Service.mes.qc QcQualityStatisticsFirst first = new QcQualityStatisticsFirst(); first.Id = SnowFlakeSingle.Instance.NextId().ToString(); first.WorkorderId = workorderID; + ProWorkorder_v2 workorder= Context.Queryable().Where(it => it.Id == first.WorkorderId).First(); + first.Color = workorder?.Colour; ProWorkorder_v2 workorder_item = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_item != null) @@ -1613,6 +1615,8 @@ namespace ZR.Service.mes.qc QcQualityStatisticsFirst first2 = new QcQualityStatisticsFirst(); first2.Id = SnowFlakeSingle.Instance.NextId().ToString(); first2.WorkorderId = workorderID; + ProWorkorder_v2 workorder2 = Context.Queryable().Where(it => it.Id == first.WorkorderId).First(); + first2.Color = workorder2?.Colour; ProWorkorder_v2 workorder_item2 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_item2 != null) @@ -1834,6 +1838,10 @@ namespace ZR.Service.mes.qc first3.Id = SnowFlakeSingle.Instance.NextId().ToString(); first3.WorkorderId = workorderID; + ProWorkorder_v2 workorder3 = Context.Queryable().Where(it => it.Id == first.WorkorderId).First(); + first3.Color = workorder3?.Colour; + + ProWorkorder_v2 workorder_item3 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_item3 != null) { @@ -2101,9 +2109,13 @@ namespace ZR.Service.mes.qc again2.Id = SnowFlakeSingle.Instance.NextId().ToString(); again2.WorkorderId = workorderID; + + + ProWorkorder_v2 workorder_again2 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_again2 != null) { + again2.Color = workorder_again2?.Colour; again2.FinishedPartNumber = workorder_again2.FinishedPartNumber; again2.ProductDescription = workorder_again2.ProductDescription; // XXX:二检入参修改为一检抛光记录值 @@ -2326,6 +2338,7 @@ namespace ZR.Service.mes.qc ProWorkorder_v2 workorder_again3 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_again3 != null) { + again3.Color = workorder_again3.Colour; again3.FinishedPartNumber = workorder_again3.FinishedPartNumber; again3.ProductDescription = workorder_again3.ProductDescription; // XXX:二检(抛光)报废分数据上件数为首检抛光数 @@ -2569,6 +2582,7 @@ namespace ZR.Service.mes.qc again3.DamoTotal = damo_total_again; again3.BaofeiTotal = baofei_total_again3; + var x_again_3 = Context.Storageable(again3).WhereColumns(it => new { it.WorkorderId, it.Remark2 }).ToStorage(); x_again_3.AsInsertable.ExecuteCommand();//不存在插入 @@ -2588,6 +2602,7 @@ namespace ZR.Service.mes.qc ProWorkorder_v2 workorder_final2 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_final2 != null) { + final2.Color = workorder_final2.Colour; final2.FinishedPartNumber = workorder_final2.FinishedPartNumber; final2.ProductDescription = workorder_final2.ProductDescription; @@ -2811,7 +2826,7 @@ namespace ZR.Service.mes.qc ProWorkorder_v2 workorder_final3 = Context.Queryable().Where(it => it.ClientWorkorder == workorderID).First(); if (workorder_again3 != null) - { + { final3.Color = workorder_final3.Colour; final3.FinishedPartNumber = workorder_final3.FinishedPartNumber; final3.ProductDescription = workorder_final3.ProductDescription; // XXX:三检(包装-投入数) @@ -3126,6 +3141,7 @@ namespace ZR.Service.mes.qc QcQualityStatisticsTotal total3 = new QcQualityStatisticsTotal(); total3.Id = SnowFlakeSingle.Instance.NextId().ToString(); total3.WorkorderId = workorderID; + total3.Color = again3.Color; total3.FinishedPartNumber = again3.FinishedPartNumber;