From 0cbf1fc2f581e5dc788a75eefcfbfc21f3c30f49 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 21 六月 2024 21:16:28 +0800
Subject: [PATCH] 工业大屏前端
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..73ba95a 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();
@@ -116,9 +117,10 @@
jobID = mes_Detail.jobID,
mes_detail_id = mes_Detail.mes_detail_id,
mes_headID = mes_Detail.mes_headID,
- operatetype = operatetype,
+ operatetype = string.IsNullOrEmpty(mes_Detail.Status) ? "瓒呮椂娓呯悊" : operatetype,
SN = mes_Detail.SN,
Status = mes_Detail.Status,
+ completedate = DateTime.Now,
};
mes_Details_hty.Add(mes_Detail_Hty);
mes_DetailRepository.Delete(mes_Detail, true);
@@ -139,7 +141,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,
@@ -154,6 +156,7 @@
reqIDLineNo = mes_Head.reqIDLineNo,
typeID = mes_Head.typeID,
workOrder = mes_Head.workOrder,
+ completedate = DateTime.Now,
};
mes_Head_HtyRepository.Add(mes_Head_Hty, true);
mes_HeadRepository.Delete(mes_Head, true);
--
Gitblit v1.9.3