From cfea43fe783cdb99faa14f59845e41cfcda7d974 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 16 五月 2024 17:22:48 +0800 Subject: [PATCH] AGV任务删除功能,取空托任务逻辑优化,检测上料任务下发逻辑优化(AGV备料两个) --- 代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" index dc21fdb..abb82b5 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" @@ -60,9 +60,10 @@ VOLContext context = new VOLContext(); Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(context); Idt_inventoryRepository inventoryRepository = new dt_inventoryRepository(context); + Idt_management_timeRepository timeRepository = new dt_management_timeRepository(context); - - var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum).ToList(); + var val = timeRepository.Find(x => x.management_name == "FinishMesWork").FirstOrDefault().management_numericalvalue; + var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum || x.CreateTime.AddDays(val) < DateTime.Now).ToList(); #region 妫�娴嬬嚎宸ュ崟 var mes_head_jcxs = mes_heads.Where(x => x.processCode == "28").ToList(); @@ -139,7 +140,7 @@ quantity = mes_Head.quantity, expectedStartTime = mes_Head.expectedStartTime, finishNum = mes_Head.finishNum, - FinishTime = DateTime.Now, + FinishTime = mes_Head.FinishTime, maxDiameterDiff = mes_Head.maxDiameterDiff, operatetype = operatetype, processCode = mes_Head.processCode, -- Gitblit v1.9.3