From 29764a01914a42d5e743a7bf1c01546bfea0ee90 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 15 八月 2024 09:18:08 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business/MES/WoContext.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business/MES/WoContext.cs b/Tiger.Business/MES/WoContext.cs
index feb5542..f0184b1 100644
--- a/Tiger.Business/MES/WoContext.cs
+++ b/Tiger.Business/MES/WoContext.cs
@@ -1,4 +1,5 @@
锘縰sing Microsoft.AspNetCore.Http;
+using Rhea.Common;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,30 +17,75 @@
{
#region 宸ュ崟绠＄悊
/// <summary>
- /// 宸ュ崟鎵规瀛楀吀
+ ///
/// </summary>
public static Dictionary<string, WorkBatch> WoBatchDic { get; set; } = new Dictionary<string, WorkBatch>();
/// <summary>
/// 浠庡伐鍗曟壒娆″瓧鍏镐腑鑾峰彇涓�涓伐鍗曟壒娆″璞�
/// </summary>
- /// <param name="workOrder"></param>
+ /// <param name="workorder"></param>
/// <param name="lineCode"></param>
/// <returns></returns>
- public static WorkBatch GetBatch(string workOrder, string lineCode)
+ public static WorkBatch GetBatch(string workorder, string lineCode)
{
- return WoBatchDic.FirstOrDefault(q => q.Value.Batch.ORDER_NO == workOrder && q.Value.Batch.ACT_LINE == lineCode).Value;
+ return WoBatchDic.FirstOrDefault(q => q.Value.Batch.ORDER_NO == workorder && q.Value.Batch.ACT_LINE == lineCode).Value;
}
/// <summary>
/// 鍒ゆ柇宸ュ崟鎵规鏄惁瀛樺湪浜庡伐鍗曟壒娆″瓧鍏镐腑
/// </summary>
- /// <param name="workOrder"></param>
+ /// <param name="workorder"></param>
/// <param name="lineCode"></param>
/// <returns></returns>
- public static bool ExistsBatch(string workOrder, string lineCode)
+ public static bool ExistsBatch(string workorder, string lineCode)
{
- return WoBatchDic.Any(q => q.Value.Batch.ORDER_NO == workOrder && q.Value.Batch.ACT_LINE == lineCode);
+ return WoBatchDic.Any(q => q.Value.Batch.ORDER_NO == workorder && q.Value.Batch.ACT_LINE == lineCode);
+ }
+
+ /// 浠庡伐鍗曟壒娆″瓧鍏镐腑鍒犻櫎涓�涓伐鍗曟壒娆″璞�
+ /// </summary>
+ /// <param name="batchNo"></param>
+ /// <param name="lineCode"></param>
+ /// <returns></returns>
+ public static bool RemoveWo(string workorder)
+ {
+ try
+ {
+ var list = WoBatchDic.Keys.ToList().Where(q => q.Contains(workorder));
+ foreach (var batch in list)
+ {
+ WoBatchDic.Remove(batch);
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Logger.Default.Fatal(ex, $"浠庡伐鍗曟壒娆″瓧鍏镐腑鍒犻櫎涓�涓伐鍗昜{workorder}]瀵硅薄寮傚父");
+ return false;
+ }
+ }
+
+ /// 浠庡伐鍗曟壒娆″瓧鍏镐腑鍒犻櫎涓�涓伐鍗曟壒娆″璞�
+ /// </summary>
+ /// <param name="batchNo"></param>
+ /// <param name="lineCode"></param>
+ /// <returns></returns>
+ public static bool RemoveBatch(string batchNo)
+ {
+ try
+ {
+ if (WoBatchDic.ContainsKey(batchNo))
+ {
+ WoBatchDic.Remove(batchNo);
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Logger.Default.Fatal(ex, $"浠庡伐鍗曟壒娆″瓧鍏镐腑鍒犻櫎涓�涓伐鍗曟壒娆{batchNo}]瀵硅薄寮傚父");
+ return false;
+ }
}
#endregion
}
--
Gitblit v1.9.3