From e22a0d7b7289cc06f947d5cf50e963ff213ab183 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 10 Dec 2024 09:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MES/Console/ConsoleController.cs | 4 +- .../appsettings.Development.json | 2 +- DOAN.Admin.WebApi/appsettings.Production.json | 2 +- DOAN.Service/MES/ERP/InteractERPService.cs | 14 ++++++- .../MES/bigScreen/Product2BigScreenService.cs | 8 ++-- .../exception/ProWorkorderUpdateLogService.cs | 1 - DOAN.Service/MES/mm/MmRequirePlanService.cs | 38 ++++++------------- 7 files changed, 33 insertions(+), 36 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs index f5808de..dd490cf 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs @@ -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); } - - } \ No newline at end of file diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 5965398..4d85919 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -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, //是否单点登录 diff --git a/DOAN.Admin.WebApi/appsettings.Production.json b/DOAN.Admin.WebApi/appsettings.Production.json index 35242e0..17d2678 100644 --- a/DOAN.Admin.WebApi/appsettings.Production.json +++ b/DOAN.Admin.WebApi/appsettings.Production.json @@ -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, //是否单点登录 diff --git a/DOAN.Service/MES/ERP/InteractERPService.cs b/DOAN.Service/MES/ERP/InteractERPService.cs index 4609cfd..25dc5e1 100644 --- a/DOAN.Service/MES/ERP/InteractERPService.cs +++ b/DOAN.Service/MES/ERP/InteractERPService.cs @@ -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 ERPBoms = Context.AsTenant().QueryableWithAttr().ToList(); + var childDb2 = Context.AsTenant().GetConnectionWithAttr(); + //如何获取同种物料的最高BOM版本 + var subQuery=childDb2.Queryable().GroupBy(it => it.McInvCode).Select(it => new + { + McInvCode = it.McInvCode, + BOMVersion = SqlFunc.AggregateMax(it.BOMVersion) + }); + List ERPBoms = childDb2.Queryable(subQuery) + .LeftJoin((sub,cu)=>sub.McInvCode==cu.McInvCode&&sub.BOMVersion==cu.BOMVersion) + .Select((sub,cu)=>cu) + .Distinct() + .ToList(); var childDb = Context.AsTenant().GetConnectionWithAttr(); Task.Run(() => diff --git a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs index 6919490..1123aa5 100644 --- a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs @@ -163,14 +163,14 @@ namespace DOAN.Service.MES.bigScreen }).ToList(); List insertData2 = new List(); - 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 Series = new List { Series2 }; echartsOptions.Series = Series; @@ -207,14 +207,14 @@ namespace DOAN.Service.MES.bigScreen }).ToList(); List insertData2 = new List(); - 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 Series = new List { Series2 }; echartsOptions.Series = Series; diff --git a/DOAN.Service/MES/exception/ProWorkorderUpdateLogService.cs b/DOAN.Service/MES/exception/ProWorkorderUpdateLogService.cs index 239d288..6edf860 100644 --- a/DOAN.Service/MES/exception/ProWorkorderUpdateLogService.cs +++ b/DOAN.Service/MES/exception/ProWorkorderUpdateLogService.cs @@ -47,7 +47,6 @@ namespace DOAN.Service.exception.Service Specification = rw.Specification },true) - .ToPage(parm); return response; diff --git a/DOAN.Service/MES/mm/MmRequirePlanService.cs b/DOAN.Service/MES/mm/MmRequirePlanService.cs index 60d58c8..884808c 100644 --- a/DOAN.Service/MES/mm/MmRequirePlanService.cs +++ b/DOAN.Service/MES/mm/MmRequirePlanService.cs @@ -322,8 +322,6 @@ namespace DOAN.Service.MES.mm List boms = Context.Queryable().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() { 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().Where(it => it.RequireDate == parm.RequireDate).ExecuteCommand(); + Context.Deleteable().Where(it => it.RequireDate == parm.RequireDate).WhereIF(!string.IsNullOrEmpty(parm.line_code),it => it.LineCode == parm.line_code).ExecuteCommand(); result = Context.Insertable(mmRequirePlans).ExecuteCommand(); });