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 00000000..a90f0147
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20240319161050周2生产计划 .xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20240320082622周3生产计划 .xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20240320082622周3生产计划 .xlsx
new file mode 100644
index 00000000..69fd2278
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20240320082622周3生产计划 .xlsx differ
diff --git a/ZR.Model/MES/qc/QcQualityStatisticsAgain.cs b/ZR.Model/MES/qc/QcQualityStatisticsAgain.cs
index c9253f96..c934eb4f 100644
--- a/ZR.Model/MES/qc/QcQualityStatisticsAgain.cs
+++ b/ZR.Model/MES/qc/QcQualityStatisticsAgain.cs
@@ -31,6 +31,16 @@ 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/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;