From 89fa5f03903ed6161474dcbe8528503f69f804d1 Mon Sep 17 00:00:00 2001
From: CRZ <1278080563@qq.com>
Date: 星期二, 16 十二月 2025 17:08:34 +0800
Subject: [PATCH] 人员信息修改
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MES.Service/service/Warehouse/MesOutwareManager.cs | 4
MES.Service/service/BasicData/MesStaffManager.cs | 104 +++++++++++++++-----
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
MES.Service/service/WomcaaManager.cs | 134 ++++++++++++--------------
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
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 | 8 +
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
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Dto/webApi/ErpOutWareDetails.cs | 2
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesOutwareDetails.cs | 11 ++
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
26 files changed, 158 insertions(+), 107 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpOutWareDetails.cs b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
index 8d6630e..1b00c5a 100644
--- a/MES.Service/Dto/webApi/ErpOutWareDetails.cs
+++ b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
@@ -26,5 +26,7 @@
public string? CustBillNo { get; set; }
public string? MachineType { get; set; }
public string? FLot { get; set; }
+ public string? FOver { get; set; }
+ public string? FOveryy { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesOutwareDetails.cs b/MES.Service/Modes/MesOutwareDetails.cs
index 17965a0..b311618 100644
--- a/MES.Service/Modes/MesOutwareDetails.cs
+++ b/MES.Service/Modes/MesOutwareDetails.cs
@@ -93,6 +93,11 @@
[SugarColumn(ColumnName="TYPE" )]
public string? Type { get; set; }
/// <summary>
+ /// OVER
+ ///</summary>
+ [SugarColumn(ColumnName = "OVER")]
+ public string? Over { get; set; }
+ /// <summary>
/// 澶囨敞
///</summary>
[SugarColumn(ColumnName="REMARKS" )]
@@ -140,6 +145,12 @@
[SugarColumn(ColumnName = "MACHINE_TYPE")]
public string? MachineType { get; set; }
+ /// <summary>
+ /// OVERYY
+ ///</summary>
+ [SugarColumn(ColumnName = "OVERYY")]
+ public string? Overyy { get; set; }
+
}
}
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 32cc95b..48840a0 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 c0ceb04..574c777 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 881f045..b49ad2e 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 9368153..47dbcf5 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/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 746abd7..4ac8060 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -60,7 +60,7 @@
.SetColumns(s => s.Isdeparture == isDeparture)
.Where(s => s.Fcode == staffId)
.ExecuteCommand();
-
+
return true;
}
@@ -71,34 +71,68 @@
private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
MesStaff entity)
{
- var exists = db.Queryable<SysUser>().Any(u => u.Fcode == sysUser.Fcode);
- if (exists)
+ try
{
- var updateUser = db.Updateable<SysUser>()
- .SetColumns(s => s.Fname == sysUser.Fname)
- .SetColumns(s => s.Departmentid == sysUser.Departmentid) // 鏇存柊閮ㄩ棬淇℃伅
- .SetColumns(s => s.Isdeparture == sysUser.Isdeparture) // 鏇存柊绂昏亴鐘舵��
- .Where(s => s.Fcode == sysUser.Fcode)
- .ExecuteCommand();
- if (updateUser > 0)
+ var exists = db.Queryable<SysUser>().Any(u => u.Fcode == sysUser.Fcode);
+ if (exists)
{
- var updateStaff = db.Updateable(entity).ExecuteCommand();
- if (updateStaff > 0)
- return true;
+ // 鐢ㄦ埛宸插瓨鍦紝鎵ц鏇存柊鎿嶄綔
+ var updateUser = db.Updateable<SysUser>()
+ .SetColumns(s => s.Fname == sysUser.Fname)
+ .SetColumns(s => s.Departmentid == sysUser.Departmentid) // 鏇存柊閮ㄩ棬淇℃伅
+ .SetColumns(s => s.Isdeparture == sysUser.Isdeparture) // 鏇存柊绂昏亴鐘舵��
+ .Where(s => s.Fcode == sysUser.Fcode)
+ .ExecuteCommand();
+ if (updateUser > 0)
+ {
+ // 妫�鏌� MesStaff 鏄惁宸插瓨鍦�
+ var staffExists = db.Queryable<MesStaff>().Any(s => s.StaffNo == entity.StaffNo);
+ if (staffExists)
+ {
+ // 鍛樺伐宸插瓨鍦紝鎵ц鏇存柊
+ var updateStaff = db.Updateable(entity)
+ .Where(s => s.StaffNo == entity.StaffNo)
+ .ExecuteCommand();
+ if (updateStaff > 0)
+ return true;
+ throw new NotImplementedException(
+ $"MES_STAFF琛ㄦ洿鏂板け璐ワ細鍛樺伐 {entity.StaffNo}({entity.StaffName})");
+ }
+ else
+ {
+ // 鍛樺伐涓嶅瓨鍦紝鎵ц鎻掑叆
+ var insertStaff = db.Insertable(entity).ExecuteCommand();
+ if (insertStaff > 0)
+ return true;
+ throw new NotImplementedException(
+ $"MES_STAFF琛ㄦ彃鍏ュけ璐ワ細鍛樺伐 {entity.StaffNo}({entity.StaffName})");
+ }
+ }
+ throw new NotImplementedException(
+ $"SYS_USER琛ㄦ洿鏂板け璐ワ細鐢ㄦ埛 {sysUser.Fcode}({sysUser.Fname})");
+ }
+ else
+ {
+ // 鐢ㄦ埛涓嶅瓨鍦紝鎵ц鎻掑叆鎿嶄綔
+ var insertUser = db.Insertable(sysUser).ExecuteCommand();
+ if (insertUser > 0)
+ {
+ var insertStaff = db.Insertable(entity).ExecuteCommand();
+ if (insertStaff > 0)
+ return true;
+ throw new NotImplementedException(
+ $"MES_STAFF琛ㄦ彃鍏ュけ璐ワ細鍛樺伐 {entity.StaffNo}({entity.StaffName})");
+ }
+ throw new NotImplementedException(
+ $"SYS_USER琛ㄦ彃鍏ュけ璐ワ細鐢ㄦ埛 {sysUser.Fcode}({sysUser.Fname})");
}
}
- else
+ catch (Exception ex)
{
- var insertUser = db.Insertable(sysUser).ExecuteCommand();
- if (insertUser > 0)
- {
- var insertStaff = db.Insertable(entity).ExecuteCommand();
- if (insertStaff > 0)
- return true;
- }
+ // 鎹曡幏骞舵姏鍑鸿缁嗙殑寮傚父淇℃伅
+ throw new NotImplementedException(
+ $"鍛樺伐 {entity.StaffNo}({entity.StaffName}) 鍚屾澶辫触锛歿ex.Message}", ex);
}
-
- return false;
}
// 鍒犻櫎鍛樺伐鐨勬柟娉�
@@ -128,7 +162,8 @@
DepartmentName = staff.FPostDept,
PositionName = staff.FPost,
PhoneNumber = staff.FMobile,
- Remark = staff.FDescription,
+ // 灏� "None" 瀛楃涓茶浆鎹负 null锛岄伩鍏嶆暟鎹簱绾︽潫闂
+ Remark = staff.FDescription == "None" ? null : staff.FDescription,
FforbidStatus = staff.FForbidStatus
};
@@ -149,7 +184,7 @@
{
// 濡傛灉 FForbidStatus='B'锛屽垯 Isdeparture=1锛屽惁鍒欎负0
var isDeparture = staff.FForbidStatus == "B" ? 1 : 0;
-
+
return new SysUser
{
//Sid = Convert.ToDecimal(staff.Id),
@@ -252,7 +287,7 @@
.SetColumns(s => s.Isdeparture == isDeparture)
.Where(s => ids.Contains(s.Fcode))
.ExecuteCommand();
-
+
return true;
}
@@ -297,8 +332,21 @@
{
foreach (var sysUser in userList)
{
- var entity = staffList.First(s => s.StaffNo == sysUser.Fcode);
- if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
+ try
+ {
+ var entity = staffList.First(s => s.StaffNo == sysUser.Fcode);
+ if (!InsertOrUpdateStaff(db, sysUser, entity))
+ {
+ throw new NotImplementedException(
+ $"鍚屾澶辫触锛氬憳宸ョ紪鍙� {entity.StaffNo}({entity.StaffName}) 鏇存柊鎴栨彃鍏ユ搷浣滃け璐�");
+ }
+ }
+ catch (Exception ex)
+ {
+ // 鎶涘嚭璇︾粏鐨勫紓甯镐俊鎭紝鍖呭惈鍛樺伐缂栧彿鍜屽叿浣撻敊璇�
+ throw new NotImplementedException(
+ $"鍚屾澶辫触锛氬憳宸ョ紪鍙� {sysUser.Fcode}({sysUser.Fname}) 澶勭悊寮傚父 - {ex.Message}", ex);
+ }
}
return true;
diff --git a/MES.Service/service/Warehouse/MesOutwareManager.cs b/MES.Service/service/Warehouse/MesOutwareManager.cs
index 65c1a13..0a3ac4e 100644
--- a/MES.Service/service/Warehouse/MesOutwareManager.cs
+++ b/MES.Service/service/Warehouse/MesOutwareManager.cs
@@ -192,7 +192,9 @@
CustItemName = dto.CustItemName,
CustItemModel = dto.CustItemModel,
CustBillNo = dto.CustBillNo,
- MachineType = dto.MachineType
+ MachineType = dto.MachineType,
+ Over = dto.FOver,
+ Overyy = dto.FOveryy
};
diff --git a/MES.Service/service/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
index 299de47..8f0777e 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -226,9 +226,11 @@
// 閲嶆柊璁＄畻骞舵洿鏂扮浉鍏抽攢鍞鍗曠殑over鐘舵�侊紙涓庣敓鎴愭椂閫昏緫鐩稿悓锛�
if (returnDetailsToDelete.Any())
{
- UpdateSalesOrderOverStatusAfterDelete(db, returnDetailsToDelete);
+ //UpdateSalesOrderOverStatusAfterDelete(db, returnDetailsToDelete);
+ Console.WriteLine($"閫�璐ч�氱煡鍗曞凡鍒犻櫎锛屽凡璺宠繃閿�鍞鍗曠姸鎬佽嚜鍔ㄦ洿鏂�");
+
}
-
+
return 1;
}
@@ -271,7 +273,7 @@
Console.WriteLine($"鐢熸垚妫�楠屽崟鎴愬姛: {message}");
// 鐢熸垚妫�楠屽崟鎴愬姛鍚庯紝鏇存柊鐩稿叧閿�鍞鍗曠殑over瀛楁
- UpdateSalesOrderOverStatus(db, mesReturnwareDetails);
+ //UpdateSalesOrderOverStatus(db, mesReturnwareDetails);
}
}
catch (Exception ex)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 8b08ef5..c3a37d9 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -31,8 +31,8 @@
}
// 妫�鏌ユ槸鍚︽湁鏈夋晥鐨凚OM鏄庣粏锛堢墿鏂欑紪鐮佷笉涓虹┖涓旈渶棰嗙敤閲忓ぇ浜�0锛�
- var validBomItems = erpCabs.Where(cab =>
- !string.IsNullOrWhiteSpace(cab.FMaterialID2) &&
+ var validBomItems = erpCabs.Where(cab =>
+ !string.IsNullOrWhiteSpace(cab.FMaterialID2) &&
!string.IsNullOrWhiteSpace(cab.FNeedQty2) &&
decimal.TryParse(cab.FNeedQty2, out decimal qty) && qty > 0).ToList();
@@ -50,9 +50,9 @@
public bool Save(ErpWOM wom)
{
- var womErpCaa = wom. ErpCaa;
+ var womErpCaa = wom.ErpCaa;
var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
- var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs);
+ var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs);
// 楠岃瘉BOM鏄惁涓虹┖
ValidateBomNotEmpty(wom.ErpCabs, womErpCaa.FBillNo);
@@ -79,82 +79,68 @@
List<Womcab> mesWomcabs)
{
-
- if (mesWomcaa.Caa001 != null && mesWomcaa.SrcBillType != null)
- {
- db.Deleteable<Womcaa>()
- .Where(it => it.Caa001 == mesWomcaa.Caa001 &&
- it.SrcBillType == mesWomcaa.SrcBillType)
- .ExecuteCommand();
+ if (mesWomcaa.Caa001 != null && mesWomcaa.SrcBillType != null)
+ {
- };
+ db.Deleteable<Womcaa>()
+ .Where(it => it.Caa001 == mesWomcaa.Caa001 &&
+ it.SrcBillType == mesWomcaa.SrcBillType)
+ .ExecuteCommand();
-
- if (mesWomcabs.Count > 0)
- {
-
- var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
- //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002}).ToList();
-
-
+ // 鍒犻櫎璇ヤ换鍔″崟鐨勬墍鏈塛OMCAB璁板綍锛圔OM鏄庣粏锛�
+ // 杩欐牱鍙互纭繚WOMCAB涓嶫SON瀹屽叏涓�鑷�
db.Deleteable<Womcab>()
- .Where(it => mesWomcab
- .Any(p => p.CAB001 == it.Cab001
- && p.CAB002 == it.Cab002
- && p.CAB003 == it.Cab003))
- .ExecuteCommand();
- //db.Deleteable<Womcab>()
- // .Where(it => mesWomcab
- // .Any(p => p.CAB001 == it.Cab001
- // && p.CAB002 == it.Cab002))
- // .ExecuteCommand();
+ .Where(it => it.Cab001 == mesWomcaa.Caa001 &&
+ it.Cab002 == mesWomcaa.SrcBillType)
+ .ExecuteCommand();
- };
-
+ }
+ ;
- var orUpdate = db.Insertable(mesWomcaa).ExecuteCommand();
- var baOrUpdate = db.Insertable(mesWomcabs).ExecuteCommand();
-
- //瀹氫箟杈撳叆鍙傛暟
- var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
- var inputParam2 = new SugarParameter("P_WORK_TYPE", mesWomcaa.SrcBillType);
- // 瀹氫箟杈撳嚭鍙傛暟
- var outParam1 = new SugarParameter("c_Result",null,true);
- var outParam2 = new SugarParameter("C_MSG",null,true);
+ var orUpdate = db.Insertable(mesWomcaa).ExecuteCommand();
+ var baOrUpdate = db.Insertable(mesWomcabs).ExecuteCommand();
-
- // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:P_WORK_TYPE,:c_Result,:C_MSG); END;", inputParam1, inputParam2, outParam1, outParam2);
+ //瀹氫箟杈撳叆鍙傛暟
+ var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
+ var inputParam2 = new SugarParameter("P_WORK_TYPE", mesWomcaa.SrcBillType);
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outParam1 = new SugarParameter("c_Result", null, true);
+ var outParam2 = new SugarParameter("C_MSG", null, true);
- // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
-
- int result = int.Parse((string)outParam1.Value);
- string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:P_WORK_TYPE,:c_Result,:C_MSG); END;", inputParam1, inputParam2, outParam1, outParam2);
+
+
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+
+ int result = int.Parse((string)outParam1.Value);
+ string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
if (result == 1)
- {
- //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
- db.Ado.RollbackTran();
- throw new Exception(message);
-
- }
+ {
+ //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
+ db.Ado.RollbackTran();
+ throw new Exception(message);
- // 鎻愪氦浜嬪姟
- db.Ado.CommitTran();
- return true;
-
+ }
- throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ // 鎻愪氦浜嬪姟
+ db.Ado.CommitTran();
+ return true;
+
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
-
+
private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs)
{
@@ -182,30 +168,30 @@
{
- string DemandDate = !string.IsNullOrEmpty(dto.DemandDate) ? DateTime.ParseExact(dto.DemandDate, "yyyymmdd", CultureInfo.InvariantCulture).ToString("yyyy-mm-dd") : null;
+ string DemandDate = !string.IsNullOrEmpty(dto.DemandDate) ? DateTime.ParseExact(dto.DemandDate, "yyyymmdd", CultureInfo.InvariantCulture).ToString("yyyy-mm-dd") : null;
var entity = new Womcaa
{
SrcBillType = dto.FSrcBillType,
Caa001 = dto.FBillNo,
Caa021 = dto.FWorkShopID0,
-
+
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
Caa004 = dto.FBillType,
-
+
Caa006 = dto.FMaterialId,
Caa009 = dto.FUnitId,
Caa012 = !string.IsNullOrEmpty(dto.FQty)
? Convert.ToDecimal(dto.FQty)
: null,
-
+
Caa010 = dto.FPlanStartDate,
Caa011 = dto.FPlanFinishDate,
Caa005 = dto.FConveyDate,
-
+
Lot = dto.FLot,
-
+
Caa015 = dto.F_UNW_Text_xsddh,
CAA015_Head = dto.xsddh_type,
@@ -215,16 +201,16 @@
Suppno = dto.FSuppno,
Cust_no = dto.FCustno,
Cust_item_no = dto.FCustitemno,
- DemandDate = DemandDate,
- CustNumber = dto.CustNumber,
- ModelType = dto.ModelType,
- OrderNo = dto.FOrderNo
+ DemandDate = DemandDate,
+ CustNumber = dto.CustNumber,
+ ModelType = dto.ModelType,
+ OrderNo = dto.FOrderNo
};
-
+
return entity;
}
@@ -237,7 +223,7 @@
{
var womcab = new Womcab
{
-
+
Cab001 = dto.FBillNo,
Cab002 = dto.FBillNoType,
Cab003 = dto.FMaterialID2,
@@ -256,10 +242,10 @@
Cab014 = dto.FIsKeyItem,
Numerator = dto.FNumerator,
Denominator = dto.FDenominator
-
+
};
-
+
womcabList.Add(womcab);
}
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 3ec2eaf..62af0d4 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\crz\Desktop\鎺ュ彛\RD\RD_MES_Api\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-12-02T06:00:12.1806616Z||;True|2025-12-02T13:54:31.6495898+08:00||;True|2025-11-19T16:50:57.5297396+08:00||;True|2025-11-19T16:50:48.3510519+08:00||;True|2025-11-19T16:19:48.5826220+08:00||;True|2025-11-19T13:22:56.6277898+08:00||;True|2025-11-19T10:36:19.5039173+08:00||;True|2025-11-03T09:31:29.9960278+08:00||;True|2025-10-24T10:18:03.9765680+08:00||;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>
+ <History>True|2025-12-15T07:31:47.3166611Z||;True|2025-12-10T20:03:55.9695546+08:00||;True|2025-12-04T11:27:56.1218308+08:00||;True|2025-12-04T08:31:18.7116721+08:00||;True|2025-12-02T14:00:12.1806616+08:00||;True|2025-12-02T13:54:31.6495898+08:00||;True|2025-11-19T16:50:57.5297396+08:00||;True|2025-11-19T16:50:48.3510519+08:00||;True|2025-11-19T16:19:48.5826220+08:00||;True|2025-11-19T13:22:56.6277898+08:00||;True|2025-11-19T10:36:19.5039173+08:00||;True|2025-11-03T09:31:29.9960278+08:00||;True|2025-10-24T10:18:03.9765680+08:00||;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 32cc95b..48840a0 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 c0ceb04..574c777 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 f89c956..7f97e71 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 998d87a..832a148 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 3ad33d1..903f7a6 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 881f045..b49ad2e 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 9368153..47dbcf5 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 e126992..9fcdcd4 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 998d87a..832a148 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 16b9515..a19d79d 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 881f045..b49ad2e 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 9368153..47dbcf5 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 e126992..9fcdcd4 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 998d87a..832a148 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 16b9515..a19d79d 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