RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整统计图

Browse Source
This commit is contained in:
qianhao.xu 2024-12-10 09:13:15 +08:00
parent 361bcdbc5f
commit e22a0d7b72
7 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs
View File

@ -31,6 +31,8 @@ public class ConsoleController : BaseController
return SUCCESS(response);
}
//TODO 产线 工单数/任务数
[HttpGet("get_moudel02")]
@ -48,6 +50,4 @@ public class ConsoleController : BaseController
var response = consoleService.GetGroupWorkOrderNum();
return SUCCESS(response);
}
}

2
DOAN.Admin.WebApi/appsettings.Development.json
View File

@ -45,7 +45,7 @@
"TokenType": "Bearer"
},
"InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类
"ShowDbLog": true, //是否打印db日志
"ShowDbLog": false, //是否打印db日志
"InitDb": false, //是否初始化db
"DemoMode": false, //是否演示模式
"SingleLogin": false, //是否单点登录

2
DOAN.Admin.WebApi/appsettings.Production.json
View File

@ -42,7 +42,7 @@
"TokenType": "Bearer"
},
"InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类
"ShowDbLog": true, //是否打印db日志
"ShowDbLog": false, //是否打印db日志
"InitDb": false, //是否初始化db
"DemoMode": false, //是否演示模式
"SingleLogin": false, //是否单点登录

14
DOAN.Service/MES/ERP/InteractERPService.cs
View File

@ -15,6 +15,7 @@ using DOAN.Model.MES.ERP;
using MimeKit.Tnef;
using NPOI.SS.Formula.Functions;
using static Aliyun.OSS.Model.LiveChannelConfiguration;
using Microsoft.VisualBasic;
namespace DOAN.Service.MES.ERP
{
@ -280,7 +281,18 @@ namespace DOAN.Service.MES.ERP
{
//ERP中的BOM
List<CustDevMesBom> ERPBoms = Context.AsTenant().QueryableWithAttr<CustDevMesBom>().ToList();
var childDb2 = Context.AsTenant().GetConnectionWithAttr<CustDevMesBom>();
//如何获取同种物料的最高BOM版本
var subQuery=childDb2.Queryable<CustDevMesBom>().GroupBy(it => it.McInvCode).Select(it => new
{
McInvCode = it.McInvCode,
BOMVersion = SqlFunc.AggregateMax(it.BOMVersion)
});
List<CustDevMesBom> ERPBoms = childDb2.Queryable(subQuery)
.LeftJoin<CustDevMesBom>((sub,cu)=>sub.McInvCode==cu.McInvCode&&sub.BOMVersion==cu.BOMVersion)
.Select((sub,cu)=>cu)
.Distinct()
.ToList();
var childDb = Context.AsTenant().GetConnectionWithAttr<BaseMaterialBom>();
Task.Run(() =>

8
DOAN.Service/MES/bigScreen/Product2BigScreenService.cs
View File

@ -163,14 +163,14 @@ namespace DOAN.Service.MES.bigScreen
}).ToList();
List<EchartsSeriesData> insertData2 = new List<EchartsSeriesData>();
insertData2 = Data2.Select(it => new EchartsSeriesData() { Name = it.Name, Value =Math.Round(it.Value,2)}).OrderBy(it=>it.Value).ToList();
insertData2 = Data2.Select(it => new EchartsSeriesData() { Name = it.Name, Value =Math.Round(it.Value,2)*100}).OrderBy(it=>it.Value).ToList();
XAxis.Data = insertData2.Select(it=>it.Name).ToList();
Series2.Data = insertData2;
Series2.Name = "报工数/计划数";
Series2.Type = "line";
Series2.Type = "bar";
List<EchartsSeries> Series = new List<EchartsSeries> { Series2 };
echartsOptions.Series = Series;
@ -207,14 +207,14 @@ namespace DOAN.Service.MES.bigScreen
}).ToList();
List<EchartsSeriesData> insertData2 = new List<EchartsSeriesData>();
insertData2 = Data2.Select(it => new EchartsSeriesData() { Name = it.Name, Value =Math.Round(it.Value,2)}).OrderBy(it=>it.Value).ToList();
insertData2 = Data2.Select(it => new EchartsSeriesData() { Name = it.Name, Value =Math.Round(it.Value,2)*100}).OrderBy(it=>it.Value).ToList();
XAxis.Data = insertData2.Select(it=>it.Name).ToList();
Series2.Data = insertData2;
Series2.Name = "报工数/计划数";
Series2.Type = "line";
Series2.Type = "bar";
List<EchartsSeries> Series = new List<EchartsSeries> { Series2 };
echartsOptions.Series = Series;

1
DOAN.Service/MES/exception/ProWorkorderUpdateLogService.cs
View File

@ -47,7 +47,6 @@ namespace DOAN.Service.exception.Service
Specification = rw.Specification
},true)
.ToPage<ProWorkorderUpdateLogDto, ProWorkorderUpdateLogDto>(parm);
return response;

38
DOAN.Service/MES/mm/MmRequirePlanService.cs
View File

@ -322,8 +322,6 @@ namespace DOAN.Service.MES.mm
List<BaseMaterialBom> boms = Context.Queryable<BaseMaterialBom>().Where(it => it.InvCode == workorder_item.ProductionCode).ToList();
if (boms != null && boms.Count > 0)
{
//遍历所有子件
foreach (var item in boms)
{
@ -332,39 +330,31 @@ namespace DOAN.Service.MES.mm
{
float pre_num = need_Materials[item.SubInvCode];
need_Materials[item.SubInvCode] = pre_num + need_num;
if (item.SubInvCode== "20121240")
if (need_Materials.ContainsKey("20102806-Y73-01"))
{
logger.Error("====20121240 累加数量: "+ need_Materials[item.SubInvCode]+" 工单:"+ workorder_item.Workorder);
Console.WriteLine("子20102806-Y73-01--" + workorder_item.ProductionCode+"--"+need_Materials["20102806-Y73-01"]);
}
}
else
{
need_Materials.Add(item.SubInvCode, need_num);
if (need_Materials.ContainsKey("20102806-Y73-01"))
{
Console.WriteLine("子20102806-Y73-01--" + workorder_item.ProductionCode + "--" + "init" +need_Materials["20102806-Y73-01"]);
}
}
// 确定包含子件的工单
//if (need_Materials_workOrder.ContainsKey(item.SubInvCode))
//{
// need_Materials_workOrder[item.SubInvCode].Add(workorder_item.Workorder);
//}
//else
//{
// need_Materials_workOrder.Add(item.SubInvCode, new HashSet<string>() { workorder_item.Workorder });
//}
}
}
}
}
}
//20102901
if (need_Materials.Count > 0)
{
string[] SubInvCode = need_Materials.Keys.ToArray();
@ -385,11 +375,7 @@ namespace DOAN.Service.MES.mm
mmRequirePlan.MaterialName = item.Name;
mmRequirePlan.RequireNum = (decimal)(need_Materials.TryGetValue(item.Code, out float value) ? value : default(float));
if (mmRequirePlan.MaterialCode == "20121240")
{
logger.Error("====20121240 累加数量: " + mmRequirePlan.RequireNum);
}
mmRequirePlan.RequireDate = parm.RequireDate;
mmRequirePlan.LineCode = parm.line_code;
@ -421,7 +407,7 @@ namespace DOAN.Service.MES.mm
UseTran2(() =>
{
Context.Deleteable<MmRequirePlanByline>().Where(it => it.RequireDate == parm.RequireDate).ExecuteCommand();
Context.Deleteable<MmRequirePlanByline>().Where(it => it.RequireDate == parm.RequireDate).WhereIF(!string.IsNullOrEmpty(parm.line_code),it => it.LineCode == parm.line_code).ExecuteCommand();
result = Context.Insertable(mmRequirePlans).ExecuteCommand();
});