From 3e420f0a8da362be4ab54406d7bc7c1309e074da Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期五, 24 十月 2025 10:25:24 +0800
Subject: [PATCH] 修改销售订单接口和销售退货接口
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpORDER.cs | 5 +
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/service/Warehouse/MesReturnwareManager.cs | 198 +++++++++++++++++++++++++++++++++++++++++++++++++
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesSalesOrderDetail.cs | 6 +
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MES.Service/Modes/MesSalesOrder.cs | 6 +
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/service/MesSalesOrderManager.cs | 3
25 files changed, 218 insertions(+), 2 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpORDER.cs b/MES.Service/Dto/webApi/ErpORDER.cs
index b9615d4..5c8a74e 100644
--- a/MES.Service/Dto/webApi/ErpORDER.cs
+++ b/MES.Service/Dto/webApi/ErpORDER.cs
@@ -21,6 +21,11 @@
public string? FDebugDate { get; set; }
public string? FDeliverAddress { get; set; }
+
+ /// <summary>
+ /// 瀹屾垚鐘舵�佹爣璇� (0-鏈畬鎴�, 1-宸插畬鎴�)
+ /// </summary>
+ public decimal? FOver { get; set; }
}
}
diff --git a/MES.Service/Modes/MesSalesOrder.cs b/MES.Service/Modes/MesSalesOrder.cs
index 7a50e9f..10086e5 100644
--- a/MES.Service/Modes/MesSalesOrder.cs
+++ b/MES.Service/Modes/MesSalesOrder.cs
@@ -76,4 +76,10 @@
/// </summary>
[SugarColumn(ColumnName = "DELIVER_ADDRESS")]
public string DeliverAddress { get; set; }
+
+ /// <summary>
+ /// 瀹屾垚鐘舵�佹爣璇� (0-鏈畬鎴�, 1-宸插畬鎴�)
+ /// </summary>
+ [SugarColumn(ColumnName = "OVER")]
+ public decimal? Over { get; set; }
}
diff --git a/MES.Service/Modes/MesSalesOrderDetail.cs b/MES.Service/Modes/MesSalesOrderDetail.cs
index cd21dd2..2d34755 100644
--- a/MES.Service/Modes/MesSalesOrderDetail.cs
+++ b/MES.Service/Modes/MesSalesOrderDetail.cs
@@ -146,4 +146,10 @@
/// </summary>
[SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
public string CustomerOrderId { get; set; }
+
+ /// <summary>
+ /// 閿�閫�鍑鸿揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "XTCH")]
+ public decimal? Xtch { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 0984c8b..9bf440e 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index d37f6e6..777e803 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 118b88d..d59ddf7 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 496504a..3fe0871 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/MesSalesOrderManager.cs b/MES.Service/service/MesSalesOrderManager.cs
index d938127..c7cc082 100644
--- a/MES.Service/service/MesSalesOrderManager.cs
+++ b/MES.Service/service/MesSalesOrderManager.cs
@@ -112,7 +112,8 @@
Remarks = dto.FNote,
Approver = dto.FApproverId,
DebugDate = !string.IsNullOrEmpty(dto.FDebugDate) && (DateTime.TryParseExact(dto.FDebugDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime debugDate) || DateTime.TryParseExact(dto.FDebugDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out debugDate)) ? (DateTime?)debugDate : null,
- DeliverAddress = dto.FDeliverAddress
+ DeliverAddress = dto.FDeliverAddress,
+ Over = dto.FOver
};
return entity;
}
diff --git a/MES.Service/service/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
index 7bb85c8..34b1397 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -200,6 +200,11 @@
{
return UseTransaction(db =>
{
+ // 鍦ㄥ垹闄ゅ墠锛屽厛鑾峰彇瑕佸垹闄ょ殑閫�璐ч�氱煡鍗曟槑缁嗭紝鐢ㄤ簬鍚庣画閲嶆柊璁＄畻閿�鍞鍗曠姸鎬�
+ var returnDetailsToDelete = db.Queryable<MesReturnwareDetails>()
+ .Where(it => it.ReturnNo == data.FBillNo && it.ReturnType == data.FBillTypeID)
+ .ToList();
+
// 鍏堝垹闄ら��璐ч�氱煡鍗曟槑缁�
var detailsDeleted = db.Deleteable<MesReturnwareDetails>()
.Where(it => it.ReturnNo == data.FBillNo &&
@@ -216,6 +221,13 @@
{
// 鍒犻櫎鎴愬姛鍚庯紝璋冪敤瀛樺偍杩囩▼鍒犻櫎瀵瑰簲鐨勬楠屽崟
DeleteInspectionOrder(db, data.FBillTypeID, data.FBillNo);
+
+ // 閲嶆柊璁＄畻骞舵洿鏂扮浉鍏抽攢鍞鍗曠殑over鐘舵�侊紙涓庣敓鎴愭椂閫昏緫鐩稿悓锛�
+ if (returnDetailsToDelete.Any())
+ {
+ UpdateSalesOrderOverStatusAfterDelete(db, returnDetailsToDelete);
+ }
+
return 1;
}
@@ -256,6 +268,9 @@
else
{
Console.WriteLine($"鐢熸垚妫�楠屽崟鎴愬姛: {message}");
+
+ // 鐢熸垚妫�楠屽崟鎴愬姛鍚庯紝鏇存柊鐩稿叧閿�鍞鍗曠殑over瀛楁
+ UpdateSalesOrderOverStatus(db, mesReturnwareDetails);
}
}
catch (Exception ex)
@@ -266,6 +281,189 @@
}
/// <summary>
+ /// 鏇存柊閿�鍞鍗曠殑over鐘舵��
+ /// 浣跨敤缁熶竴閫昏緫锛歄RDER_QUANTITY + GIFT_QUANTITY + 閫�璐ф暟閲� = DELIVERED_QUANTITY + DELIVERED_GIFT_QUANTITY + XTCH
+ /// </summary>
+ /// <param name="db">鏁版嵁搴撹繛鎺�</param>
+ /// <param name="mesReturnwareDetails">閫�璐ч�氱煡鍗曟槑缁嗗垪琛�</param>
+ private void UpdateSalesOrderOverStatus(SqlSugarScope db, List<MesReturnwareDetails> mesReturnwareDetails)
+ {
+ try
+ {
+ // 鑾峰彇鎵�鏈夐渶瑕佹洿鏂扮殑璁㈠崟淇℃伅锛堝幓閲嶏級
+ var orderUpdates = mesReturnwareDetails
+ .Where(detail => !string.IsNullOrEmpty(detail.OrderNo) && !string.IsNullOrEmpty(detail.OrderType))
+ .Select(detail => new { detail.OrderNo, detail.OrderType })
+ .Distinct()
+ .ToList();
+
+ foreach (var orderInfo in orderUpdates)
+ {
+ // 鑾峰彇璇ヨ鍗曠殑鎵�鏈夋槑缁�
+ var orderDetails = db.Queryable<MesSalesOrderDetail>()
+ .Where(it => it.OrderId == orderInfo.OrderNo && it.OrderType == orderInfo.OrderType)
+ .ToList();
+
+ if (!orderDetails.Any())
+ {
+ Console.WriteLine($"鏈壘鍒伴攢鍞鍗曟槑缁� {orderInfo.OrderType}-{orderInfo.OrderNo}锛岃烦杩囨洿鏂�");
+ continue;
+ }
+
+ // 妫�鏌ユ瘡涓鍗曟槑缁嗘槸鍚﹀畬鎴�
+ bool allCompleted = true;
+
+ foreach (var orderDetail in orderDetails)
+ {
+ // 鏌ユ壘鍖归厤鐨勯��璐ф槑缁嗭細閫氳繃ORDER_TYPE, ORDER_ID, LINE_NUMBER, PRODUCT_CODE杩涜鍖归厤
+ var matchingReturnDetails = mesReturnwareDetails
+ .Where(detail => detail.OrderType == orderDetail.OrderType &&
+ detail.OrderNo == orderDetail.OrderId &&
+ detail.OrderNumber == orderDetail.OrderNumber &&
+ detail.ItemNo == orderDetail.ProductCode)
+ .ToList();
+
+ // 璁＄畻鍖归厤鐨勯��璐ф暟閲�
+ var returnQuantity = matchingReturnDetails.Sum(x => (x.Quantity ?? 0) + (x.ActualQuantity ?? 0));
+
+ // 璁＄畻璁㈠崟鎬绘暟閲忥細ORDER_QUANTITY + GIFT_QUANTITY + 閿�鍞��璐ч�氱煡鍗曚腑鐨勬暟閲�
+ var orderTotal = (orderDetail.OrderQuantity ?? 0) +
+ (orderDetail.GiftQuantity ?? 0) +
+ returnQuantity;
+
+ // 璁＄畻宸蹭氦浠樻�绘暟閲忥細DELIVERED_QUANTITY + DELIVERED_GIFT_QUANTITY + XTCH(閿�閫�鍑鸿揣鏁伴噺)
+ var deliveredTotal = (orderDetail.DeliveredQuantity ?? 0) +
+ (orderDetail.DeliveredGiftQuantity ?? 0) +
+ (orderDetail.Xtch ?? 0);
+
+ // 濡傛灉璁㈠崟鎬绘暟閲忎笉绛変簬宸蹭氦浠樻�绘暟閲忥紝鍒欒鏄庣粏鏈畬鎴�
+ if (orderTotal != deliveredTotal)
+ {
+ allCompleted = false;
+ Console.WriteLine($"璁㈠崟鏄庣粏 {orderDetail.ProductCode} 鏈畬鎴�: 璁㈠崟鎬绘暟閲�={orderTotal}, 宸蹭氦浠樻�绘暟閲�={deliveredTotal} (璁㈠崟:{orderDetail.OrderQuantity ?? 0} + 璧犲搧:{orderDetail.GiftQuantity ?? 0} + 閫�璐�:{returnQuantity} = 宸蹭氦浠�:{orderDetail.DeliveredQuantity ?? 0} + 宸蹭氦浠樿禒鍝�:{orderDetail.DeliveredGiftQuantity ?? 0} + 閿�閫�鍑鸿揣:{orderDetail.Xtch ?? 0})");
+ break;
+ }
+ }
+
+ // 鏍规嵁鏄惁鍏ㄩ儴瀹屾垚璁剧疆over鍊�
+ decimal overValue = allCompleted ? 1 : 0;
+
+ // 鏇存柊MES_SALES_ORDER琛ㄧ殑over瀛楁
+ var updateCount = db.Updateable<MesSalesOrder>()
+ .SetColumns(it => it.Over == overValue)
+ .Where(it => it.OrderId == orderInfo.OrderNo && it.OrderType == orderInfo.OrderType)
+ .ExecuteCommand();
+
+ if (updateCount > 0)
+ {
+ Console.WriteLine($"鎴愬姛鏇存柊閿�鍞鍗� {orderInfo.OrderType}-{orderInfo.OrderNo} 鐨刼ver鐘舵�佷负{overValue} ({(allCompleted ? "宸插畬鎴�" : "鏈畬鎴�")})");
+ }
+ else
+ {
+ Console.WriteLine($"鏈壘鍒伴攢鍞鍗� {orderInfo.OrderType}-{orderInfo.OrderNo}锛岃烦杩囨洿鏂�");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍閿欒鏃ュ織锛屼絾涓嶅奖鍝嶉��璐ч�氱煡鍗曠殑淇濆瓨
+ Console.WriteLine($"鏇存柊閿�鍞鍗昽ver鐘舵�佹椂鍙戠敓閿欒: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎閫�璐ч�氱煡鍗曞悗閲嶆柊璁＄畻骞舵洿鏂扮浉鍏抽攢鍞鍗曠殑over鐘舵��
+ /// 浣跨敤涓庣敓鎴愭椂鐩稿悓鐨勯�昏緫锛歄RDER_QUANTITY + GIFT_QUANTITY + 閫�璐ф暟閲� = DELIVERED_QUANTITY + DELIVERED_GIFT_QUANTITY + XTCH
+ /// </summary>
+ /// <param name="db">鏁版嵁搴撹繛鎺�</param>
+ /// <param name="deletedReturnDetails">宸插垹闄ょ殑閫�璐ч�氱煡鍗曟槑缁嗗垪琛�</param>
+ private void UpdateSalesOrderOverStatusAfterDelete(SqlSugarScope db, List<MesReturnwareDetails> deletedReturnDetails)
+ {
+ try
+ {
+ // 鑾峰彇鎵�鏈夐渶瑕侀噸鏂拌绠楃殑璁㈠崟淇℃伅锛堝幓閲嶏級
+ var orderUpdates = deletedReturnDetails
+ .Where(detail => !string.IsNullOrEmpty(detail.OrderNo) && !string.IsNullOrEmpty(detail.OrderType))
+ .Select(detail => new { detail.OrderNo, detail.OrderType })
+ .Distinct()
+ .ToList();
+
+ foreach (var orderInfo in orderUpdates)
+ {
+ // 鑾峰彇璇ヨ鍗曠殑鎵�鏈夋槑缁�
+ var orderDetails = db.Queryable<MesSalesOrderDetail>()
+ .Where(it => it.OrderId == orderInfo.OrderNo && it.OrderType == orderInfo.OrderType)
+ .ToList();
+
+ if (!orderDetails.Any())
+ {
+ Console.WriteLine($"鏈壘鍒伴攢鍞鍗曟槑缁� {orderInfo.OrderType}-{orderInfo.OrderNo}锛岃烦杩囨洿鏂�");
+ continue;
+ }
+
+ // 妫�鏌ユ瘡涓鍗曟槑缁嗘槸鍚﹀畬鎴�
+ bool allCompleted = true;
+
+ foreach (var orderDetail in orderDetails)
+ {
+ // 鏌ユ壘鎵�鏈夊尮閰嶇殑閫�璐ф槑缁嗭紙鍖呮嫭鍏朵粬鏈垹闄ょ殑閫�璐ч�氱煡鍗曪級
+ // 閫氳繃ORDER_TYPE, ORDER_ID, LINE_NUMBER, PRODUCT_CODE杩涜鍖归厤
+ var matchingReturnDetails = db.Queryable<MesReturnwareDetails>()
+ .Where(detail => detail.OrderType == orderDetail.OrderType &&
+ detail.OrderNo == orderDetail.OrderId &&
+ detail.OrderNumber == orderDetail.OrderNumber &&
+ detail.ItemNo == orderDetail.ProductCode)
+ .ToList();
+
+ // 璁＄畻鍖归厤鐨勯��璐ф暟閲�
+ var returnQuantity = matchingReturnDetails.Sum(x => (x.Quantity ?? 0) + (x.ActualQuantity ?? 0));
+
+ // 璁＄畻璁㈠崟鎬绘暟閲忥細ORDER_QUANTITY + GIFT_QUANTITY + 閿�鍞��璐ч�氱煡鍗曚腑鐨勬暟閲�
+ var orderTotal = (orderDetail.OrderQuantity ?? 0) +
+ (orderDetail.GiftQuantity ?? 0) +
+ returnQuantity;
+
+ // 璁＄畻宸蹭氦浠樻�绘暟閲忥細DELIVERED_QUANTITY + DELIVERED_GIFT_QUANTITY + XTCH(閿�閫�鍑鸿揣鏁伴噺)
+ var deliveredTotal = (orderDetail.DeliveredQuantity ?? 0) +
+ (orderDetail.DeliveredGiftQuantity ?? 0) +
+ (orderDetail.Xtch ?? 0);
+
+ // 濡傛灉璁㈠崟鎬绘暟閲忎笉绛変簬宸蹭氦浠樻�绘暟閲忥紝鍒欒鏄庣粏鏈畬鎴�
+ if (orderTotal != deliveredTotal)
+ {
+ allCompleted = false;
+ Console.WriteLine($"鍒犻櫎閫�璐ч�氱煡鍗曞悗锛岃鍗曟槑缁� {orderDetail.ProductCode} 鏈畬鎴�: 璁㈠崟鎬绘暟閲�={orderTotal}, 宸蹭氦浠樻�绘暟閲�={deliveredTotal} (璁㈠崟:{orderDetail.OrderQuantity ?? 0} + 璧犲搧:{orderDetail.GiftQuantity ?? 0} + 閫�璐�:{returnQuantity} = 宸蹭氦浠�:{orderDetail.DeliveredQuantity ?? 0} + 宸蹭氦浠樿禒鍝�:{orderDetail.DeliveredGiftQuantity ?? 0} + 閿�閫�鍑鸿揣:{orderDetail.Xtch ?? 0})");
+ break;
+ }
+ }
+
+ // 鏍规嵁鏄惁鍏ㄩ儴瀹屾垚璁剧疆over鍊�
+ decimal overValue = allCompleted ? 1 : 0;
+
+ // 鏇存柊MES_SALES_ORDER琛ㄧ殑over瀛楁
+ var updateCount = db.Updateable<MesSalesOrder>()
+ .SetColumns(it => it.Over == overValue)
+ .Where(it => it.OrderId == orderInfo.OrderNo && it.OrderType == orderInfo.OrderType)
+ .ExecuteCommand();
+
+ if (updateCount > 0)
+ {
+ Console.WriteLine($"鍒犻櫎閫�璐ч�氱煡鍗曞悗锛屾垚鍔熸洿鏂伴攢鍞鍗� {orderInfo.OrderType}-{orderInfo.OrderNo} 鐨刼ver鐘舵�佷负{overValue} ({(allCompleted ? "宸插畬鎴�" : "鏈畬鎴�")})");
+ }
+ else
+ {
+ Console.WriteLine($"鍒犻櫎閫�璐ч�氱煡鍗曞悗锛屾湭鎵惧埌閿�鍞鍗� {orderInfo.OrderType}-{orderInfo.OrderNo}锛岃烦杩囨洿鏂�");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍閿欒鏃ュ織锛屼絾涓嶅奖鍝嶉��璐ч�氱煡鍗曠殑鍒犻櫎
+ Console.WriteLine($"鍒犻櫎閫�璐ч�氱煡鍗曞悗鏇存柊閿�鍞鍗昽ver鐘舵�佹椂鍙戠敓閿欒: {ex.Message}");
+ }
+ }
+
+ /// <summary>
/// 璋冪敤瀛樺偍杩囩▼鍒犻櫎妫�楠屽崟
/// </summary>
/// <param name="db">鏁版嵁搴撹繛鎺�</param>
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0673601..5a0786d 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Desktop\鎺ュ彛\RD\RD_MES_Api\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-09-28T06:01:09.8976598Z||;True|2025-09-27T18:21:38.6643161+08:00||;True|2025-09-25T09:36:17.3207590+08:00||;True|2025-09-24T17:48:11.4770370+08:00||;True|2025-09-24T10:00:27.2652137+08:00||;True|2025-09-22T17:09:16.2235067+08:00||;True|2025-09-07T15:57:42.6492991+08:00||;True|2025-09-02T14:07:59.4933772+08:00||;True|2025-08-22T10:11:31.0216372+08:00||;True|2025-08-18T08:28:20.1447738+08:00||;True|2025-08-12T09:51:50.2822756+08:00||;True|2025-08-10T16:28:17.3559399+08:00||;True|2025-08-06T09:47:19.1451217+08:00||;True|2025-08-06T09:46:51.2621129+08:00||;True|2025-08-03T18:48:37.3295098+08:00||;True|2025-08-01T17:29:02.4576952+08:00||;True|2025-03-27T23:22:42.3501020+08:00||;True|2025-03-10T16:49:08.3476948+08:00||;True|2024-12-24T15:39:58.5366570+08:00||;True|2024-11-26T18:32:03.9568766+08:00||;True|2024-11-21T02:11:35.8050745+08:00||;True|2024-09-21T16:35:22.6651659+08:00||;True|2024-09-21T16:14:11.3450387+08:00||;True|2024-09-19T17:16:11.7338751+08:00||;True|2024-09-19T17:11:21.0116707+08:00||;True|2024-09-19T13:54:25.7455472+08:00||;True|2024-09-15T13:55:51.7095153+08:00||;True|2024-09-12T17:10:20.4734556+08:00||;True|2024-09-10T15:54:07.7463519+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <History>True|2025-10-24T02:18:03.9765680Z||;True|2025-10-22T09:45:29.8581213+08:00||;True|2025-09-28T14:01:09.8976598+08:00||;True|2025-09-27T18:21:38.6643161+08:00||;True|2025-09-25T09:36:17.3207590+08:00||;True|2025-09-24T17:48:11.4770370+08:00||;True|2025-09-24T10:00:27.2652137+08:00||;True|2025-09-22T17:09:16.2235067+08:00||;True|2025-09-07T15:57:42.6492991+08:00||;True|2025-09-02T14:07:59.4933772+08:00||;True|2025-08-22T10:11:31.0216372+08:00||;True|2025-08-18T08:28:20.1447738+08:00||;True|2025-08-12T09:51:50.2822756+08:00||;True|2025-08-10T16:28:17.3559399+08:00||;True|2025-08-06T09:47:19.1451217+08:00||;True|2025-08-06T09:46:51.2621129+08:00||;True|2025-08-03T18:48:37.3295098+08:00||;True|2025-08-01T17:29:02.4576952+08:00||;True|2025-03-27T23:22:42.3501020+08:00||;True|2025-03-10T16:49:08.3476948+08:00||;True|2024-12-24T15:39:58.5366570+08:00||;True|2024-11-26T18:32:03.9568766+08:00||;True|2024-11-21T02:11:35.8050745+08:00||;True|2024-09-21T16:35:22.6651659+08:00||;True|2024-09-21T16:14:11.3450387+08:00||;True|2024-09-19T17:16:11.7338751+08:00||;True|2024-09-19T17:11:21.0116707+08:00||;True|2024-09-19T13:54:25.7455472+08:00||;True|2024-09-15T13:55:51.7095153+08:00||;True|2024-09-12T17:10:20.4734556+08:00||;True|2024-09-10T15:54:07.7463519+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 0984c8b..9bf440e 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index d37f6e6..777e803 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 672c2ff..02e898a 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index be978e5..4ecc5d6 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 729e841..60a1445 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 118b88d..d59ddf7 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 496504a..3fe0871 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 6ed8eac..7d65cd7 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index be978e5..4ecc5d6 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index d6e47ad..fe2840f 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 118b88d..d59ddf7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 496504a..3fe0871 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 6ed8eac..7d65cd7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index be978e5..4ecc5d6 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index d6e47ad..fe2840f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3