diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs index 4479e1ae..1f63fced 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs @@ -80,6 +80,8 @@ public string? process_name { get; set; } public string create_time { get; set; } + + public string workstation_name { get; set; } } } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs index 7a935ce2..7660b70e 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs @@ -11,5 +11,6 @@ namespace Tnb.ProductionMgr.Entities.Dto public int? plan_qty { get; set; } public int? scheduled_qty { get; set; } public string create_time { get; set; } + public string workstation_id { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs index 9d17bad3..5b3f9e23 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs @@ -1,6 +1,7 @@ using JNPF.Common.Filter; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.Permission; using JNPF.Systems.Entitys.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; @@ -103,10 +104,11 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b, c, d, e) => a.mold_id == e.id) .LeftJoin((a, b, c, d, e, f) => a.mo_id == f.id) .LeftJoin((a, b, c, d, e, f, g) => g.id == a.eqp_id) + .LeftJoin((a, b, c, d, e, f, g,h)=>a.workstation_id==h.Id) .WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => a.mo_task_code.Contains(moTaskCode)) .WhereIF(!string.IsNullOrEmpty(moTaskStatus), (a, b, c, d) => a.mo_task_status == moTaskStatus) .Where((a, b, c, d, e, f) => a.schedule_type == 1) - .Select((a, b, c, d, e, f, g) => new PrdMoTaskIssueListOutput + .Select((a, b, c, d, e, f, g,h) => new PrdMoTaskIssueListOutput { id = a.id, mo_task_code = a.mo_task_code, @@ -114,6 +116,7 @@ namespace Tnb.ProductionMgr mold_id = e.mold_code + "/" + e.mold_name, eqp_id = g.code + "/" + g.name, mo_task_status = d.FullName, + workstation_id = h.FullName, plan_qty = f.plan_qty, scheduled_qty = a.scheduled_qty, create_time = a.create_time == null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS), diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index dd5559b0..c69323d6 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -408,8 +408,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b, c) => a.workline_id == c.Id) .LeftJoin((a, b, c, d) => a.mo_id == d.id) .LeftJoin((a, b, c, d, e) => a.process_id == e.id) + .LeftJoin((a, b,c,d,e,f) => a.workstation_id == f.Id) .Where((a, b, c, d) => a.parent_id == mo_task_id) - .Select((a, b, c, d, e) => new PackSechelToBeIssueListOutput + .Select((a, b, c, d, e,f) => new PackSechelToBeIssueListOutput { mo_task_id = a.id, mo_task_code = a.mo_task_code, @@ -418,6 +419,7 @@ namespace Tnb.ProductionMgr workline_code = c.EnCode, workline_name = c.FullName, mo_task_status = a.mo_task_status, + workstation_name = f.FullName, scheduled_qty = a.scheduled_qty, plan_qty = d.plan_qty, process_task_qty = a.process_task_qty, diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs index 175bade1..db804733 100644 --- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs @@ -129,6 +129,10 @@ namespace Tnb.ProductionMgr Log.Information("【EmptyCarryOutStk】左输送线空箱入呼叫成功"); //_redisData.Set("YTCS_CallCtuEmptyIn_CS01_flag", true, TimeSpan.FromMinutes(20)); } + else + { + Log.Error($"【EmptyCarryOutStk】左输送线空箱入呼叫失败:{result.msg}"); + } return Task.CompletedTask; } @@ -150,6 +154,10 @@ namespace Tnb.ProductionMgr Log.Information("【EmptyCarryOutStk】右输送线空箱入呼叫成功"); //_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20)); } + else + { + Log.Error($"【EmptyCarryOutStk】右输送线空箱入呼叫失败:{result.msg}"); + } return Task.CompletedTask; } @@ -166,6 +174,7 @@ namespace Tnb.ProductionMgr string startLocationCode = cs01==false ? "SSX-021-001" : cs03==false ? "SSX-021-003" : ""; if (startLocationCode.IsEmpty()) { + Log.Error($"起始库位为空"); return Task.CompletedTask; } @@ -193,6 +202,10 @@ namespace Tnb.ProductionMgr Log.Information("【FixedPointDelivery】注塑定点配送成功"); //_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20)); } + else + { + Log.Error($"【FixedPointDelivery】注塑定点配送失败:{authResponse.msg}"); + } }