From a765da90e5ee63e04d2d8460a5ad1ebd0e8eb4db Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 15 七月 2024 21:43:59 +0800
Subject: [PATCH] 工单处理
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 50e67dd..bec1f3e 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).Take(10).ToList();
#region 妫�娴嬬嚎宸ュ崟
var mes_head_jcxs = mes_heads.Where(x => x.processCode == "28").ToList();
@@ -81,8 +82,7 @@
{
foreach (var mes_head in mes_head_jjgs)
{
- var inventorys = inventoryRepository.Find(x => x.jobID == mes_head.jobID).ToList();
- if (inventorys.Count == mes_head.finishNum)
+ if (mes_head.quantity == mes_head.agv_finishNum)
AddHtyMesWork(mes_head, mes_HeadRepository);
}
}
@@ -92,7 +92,7 @@
/// <summary>
/// 宸插畬鎴愬伐鍗曠Щ鍏ュ巻鍙�
/// </summary>
- public static void AddHtyMesWork(dt_mes_head mes_Head, Idt_mes_headRepository mes_HeadRepository, string compeletor = "绯荤粺", string operatetype = "鑷姩瀹屾垚")
+ public static void AddHtyMesWork(dt_mes_head mes_Head, Idt_mes_headRepository mes_HeadRepository, string compeletor = "system", string operatetype = "鑷姩瀹屾垚")
{
try
{
@@ -116,9 +116,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 +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,
@@ -154,14 +155,15 @@
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);
- WriteDBLog.Success("澶勭悊宸插畬鎴愬伐鍗�", $"宸ュ崟缂栧彿锛歿mes_Head.jobID}", "PCS");
+ WriteDBLog.Success("澶勭悊宸插畬鎴愬伐鍗�", $"宸ュ崟缂栧彿锛歿mes_Head.jobID}", "PCS", compeletor);
}
catch (Exception ex)
{
- WriteDBLog.Error("澶勭悊宸插畬鎴愬伐鍗�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+ WriteDBLog.Error("澶勭悊宸插畬鎴愬伐鍗�", $"閿欒淇℃伅锛歿ex.Message}", "PCS", compeletor);
}
}
}
--
Gitblit v1.9.3