RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

质量模块_质量统计: 添加颜色

Browse Source
This commit is contained in:
qianhao.xu 2024-03-20 14:16:24 +08:00
parent a3d7b47a88
commit 2074ea2e84
8 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ZR.Admin.WebApi/wwwroot/workorder/20240319161050周2生产计划 .xlsx Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/workorder/20240320082622周3生产计划 .xlsx Normal file
View File

Binary file not shown.

10
ZR.Model/MES/qc/QcQualityStatisticsAgain.cs
View File

@ -31,6 +31,16 @@ namespace ZR.Model.MES.qc
///</summary>
[SugarColumn(ColumnName = "product_description")]
public string ProductDescription { get; set; }
/// <summary>
/// 颜色
///</summary>
[SugarColumn(ColumnName = "color")]
public string Color { get; set; }
/// <summary>
/// 生产投入数
///</summary>

10
ZR.Model/MES/qc/QcQualityStatisticsFinal.cs
View File

@ -26,6 +26,16 @@ namespace ZR.Model.MES.qc
///</summary>
[SugarColumn(ColumnName = "finished_part_number")]
public string FinishedPartNumber { get; set; }
/// <summary>
/// 颜色
///</summary>
[SugarColumn(ColumnName = "color")]
public string Color { get; set; }
/// <summary>
/// 班次
///</summary>

8
ZR.Model/MES/qc/QcQualityStatisticsFirst.cs
View File

@ -31,6 +31,14 @@ namespace ZR.Model.MES.qc
///</summary>
[SugarColumn(ColumnName = "product_description")]
public string ProductDescription { get; set; }
/// <summary>
/// 颜色
///</summary>
[SugarColumn(ColumnName = "color")]
public string Color { get; set; }
/// <summary>
/// 生产投入数
///</summary>

12
ZR.Model/MES/qc/QcQualityStatisticsTotal.cs
View File

@ -26,11 +26,23 @@ namespace ZR.Model.MES.qc
///</summary>
[SugarColumn(ColumnName = "finished_part_number")]
public string FinishedPartNumber { get; set; }
/// <summary>
/// 描述
///</summary>
[SugarColumn(ColumnName = "product_description")]
public string ProductDescription { get; set; }
/// <summary>
/// 颜色
///</summary>
[SugarColumn(ColumnName = "color")]
public string Color { get; set; }
/// <summary>
/// 生产投入数
///</summary>

2
ZR.Service/mes/pro/ProWorkorderServiceV2.cs
View File

@ -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<ProWorkorder_v2> proWorkorderList = Context.Queryable<ProWorkorder_v2>().Where(predicate).Where(it=>it.Remark3=="是").OrderBy(it => it.Sort).ToPageList(pageNum, pageSize, ref totalCount);

18
ZR.Service/mes/qc/FirstFQCService.cs
View File

@ -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<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
first.Color = workorder?.Colour;
ProWorkorder_v2 workorder_item = Context.Queryable<ProWorkorder_v2>().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<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
first2.Color = workorder2?.Colour;
ProWorkorder_v2 workorder_item2 = Context.Queryable<ProWorkorder_v2>().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<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
first3.Color = workorder3?.Colour;
ProWorkorder_v2 workorder_item3 = Context.Queryable<ProWorkorder_v2>().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<ProWorkorder_v2>().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<ProWorkorder_v2>().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<ProWorkorder_v2>().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<ProWorkorder_v2>().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;