From f1deb7b024e17cba204de5fcb0dac15801436b90 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 28 七月 2025 20:56:41 +0800
Subject: [PATCH] 多组织修改
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/service/BasicData/MesRohInManager.cs | 5
MES.Service/Dto/webApi/ErpCAA.cs | 6
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 99 +++++++-------
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/Modes/SalesOrder.cs | 3
MES.Service/service/WomcaaManager.cs | 81 ++++++-----
MES.Service/service/WomcaaWWManager.cs | 74 +++++-----
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 77 +++++-----
MES.Service/service/BasicData/SalesOrderManager.cs | 26 ++-
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
21 files changed, 196 insertions(+), 177 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 435b50b..c7f976e 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -7,7 +7,7 @@
public string? FBillNo { get; set; }
public string? FWorkShopID { get; set; }
public string? FRoutingId { get; set; }
- public string? FREMWorkShopId { get; set; }
+ public string? FremWorkShopId { get; set; }
public string? FStockId { get; set; }
public string? FDate { get; set; }
public string? FBillType { get; set; }
@@ -38,8 +38,8 @@
public string? PLAN_ID { get; set; }
public string? PLAN_SEQ { get; set; }
public string? PLAN_NUM { get; set; }
- public string? erP_SCZZ { get; set; }
- public string? erP_WTZZ { get; set; }
+ public string? ERP_SCZZ { get; set; }
+ public string? ERP_WTZZ { get; set; }
public string? F_ZJXF_YHRQ { get; set; }
public string? F_ZSXG_KH { get; set; }
public string? FDescription { get; set; }
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
index ffbaf1f..ef46e35 100644
--- a/MES.Service/Modes/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder.cs
@@ -11,8 +11,7 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD",IsPrimaryKey = true)]
public decimal? Id { get; set; }
[SugarColumn(ColumnName = "ERP_ID")]
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 16647e7..b45773e 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 bc98886..e415c3b 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/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 4ac47b8..ec95218 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -61,7 +61,10 @@
}
var orUpdate = base.Insert(mesRohIn);
var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas);
- if (orUpdate && baOrUpdate) return true;
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 70d69b3..c04fc7a 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -10,68 +10,61 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- private readonly SalesDeliveryNoticeDetailManager
- _SalesDeliveryDetailManager = new();
+ private readonly SalesDeliveryNoticeDetailManager _SalesDeliveryDetailManager = new();
//ErpSalesRerurn
public bool Save(ErpSalesDelivery SalesDelivery)
{
var erpSalesDeliveryDto = SalesDelivery.OrderDto;
- var mesSalesDelivery =
- ConvertErpToSalesDelivery(SalesDelivery.OrderDto);
- var mesSalesDeliveryDatas =
- ConvertErpToSalesDeliveryDetail(SalesDelivery.Items);
+ var mesSalesDelivery = ConvertErpToSalesDelivery(SalesDelivery.OrderDto);
+ var mesSalesDeliveryDatas = ConvertErpToSalesDeliveryDetail(SalesDelivery.Items);
return UseTransaction(db =>
{
switch (erpSalesDeliveryDto.Type)
{
case "3":
- return DeleteData(db, mesSalesDelivery,
- mesSalesDeliveryDatas)
- ? 1
- : 0;
+ return DeleteData(db, mesSalesDelivery,mesSalesDeliveryDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesDelivery,
- mesSalesDeliveryDatas, erpSalesDeliveryDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException($"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool DeleteData(SqlSugarScope db,
- SalesDeliveryNotice mesSalesDelivery,
- List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
+ private bool DeleteData(SqlSugarScope db,SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
{
var decimals = mesSalesDeliveryDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesDelivery.Id);
- var insertOrUpdate = db.Deleteable<SalesDeliveryNoticeDetail>()
- .In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesDeliveryNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db,
- SalesDeliveryNotice mesSalesDelivery,
- List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
+ private bool SaveOrUpdateData(SqlSugarScope db,SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
{
- if (mesSalesDelivery.Id != null) base.DeleteById(mesSalesDelivery.Id);
+ if (mesSalesDelivery.Id != null)
+ {
+ base.DeleteById(mesSalesDelivery.Id);
+ }
if (mesSalesDeliveryDatas.Count > 0)
- db.Deleteable<SalesDeliveryNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesDelivery.ErpId)
- .ExecuteCommand();
+ {
+ db.Deleteable<SalesDeliveryNoticeDetail>().Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
+ }
+
var orUpdate = base.Insert(mesSalesDelivery);
- var baOrUpdate =
- _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
- if (orUpdate && baOrUpdate) return true;
-
+ var baOrUpdate =_SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -83,17 +76,17 @@
return result.All(b => b);
}
- private SalesDeliveryNotice ConvertErpToSalesDelivery(
- ErpSalesDeliveryDto erpDto)
+ private SalesDeliveryNotice ConvertErpToSalesDelivery(ErpSalesDeliveryDto erpDto)
{
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -141,13 +134,15 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(
- List<ErpSalesDeliveryDetailDto> erpDtoList)
+ private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(List<ErpSalesDeliveryDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
@@ -156,9 +151,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -182,8 +178,7 @@
OwnerId = erpDto.FOwnerIdHead, //璐т富
InventoryUnit = erpDto.FStockUnitID, //搴撳瓨鍗曚綅
InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty), //搴撳瓨鏁伴噺
- PlanDeliveryDate =
- ParseDateTime(erpDto.FPlanDeliveryDate), //璁″垝鍙戣揣鏃ユ湡
+ PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate), //璁″垝鍙戣揣鏃ユ湡
OutLmtUnit = erpDto.FOutLmtUnit, //瓒呭彂鎺у埗鍗曚綅
OutMaxQty = erpDto.FOutMaxQty, //鍑哄簱涓婇檺
OutMinQty = erpDto.FOutMinQty, //鍑哄簱涓嬮檺
@@ -203,13 +198,19 @@
};
if (erpDto.FRemainOutQty == 0)
+ {
salesOrderSub.IsFinish = 1;
+ }
else
+ {
salesOrderSub.IsFinish = 0;
+ }
- var single = _SalesDeliveryDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 31a57ba..d32846a 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -85,9 +85,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -126,15 +127,16 @@
EntryNote = erpDto.FEntryNote // 澶囨敞
};
- var single =
- base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
- if (single != null) salesOrder.Id = single.Id;
+ var single =base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
- List<ErpSalesOrderDetailDto> erpDtoList)
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesOrderDetail>();
@@ -182,9 +184,11 @@
Ddly = erpDto.F_ZJXF_DDLY
};
- var single = _SalesOrderDetailManager.GetSingle(it =>
- it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesOrderDetailManager.GetSingle(it =>it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index bb891dd..907735e 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -10,34 +10,26 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- private readonly SalesReturnDetailManager _SalesReturnDetailManager =
- new();
+ private readonly SalesReturnDetailManager _SalesReturnDetailManager = new();
//ErpSalesRerurn
public bool Save(ErpSalesRerurn SalesReturn)
{
var erpSalesReturnDto = SalesReturn.OrderDto;
var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
- var mesSalesReturnDatas =
- ConvertErpToSalesReturnDetail(SalesReturn.Items);
+ var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
return UseTransaction(db =>
{
switch (erpSalesReturnDto.Type)
{
case "3":
- return UpdateData(db, mesSalesReturn, mesSalesReturnDatas)
- ? 1
- : 0;
+ return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesReturn,
- mesSalesReturnDatas, erpSalesReturnDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesReturn,mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException($"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
@@ -47,28 +39,29 @@
{
var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesReturn.Id);
- var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>()
- .In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db,
- SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
+ private bool SaveOrUpdateData(SqlSugarScope db,SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
{
- if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
+ if (mesSalesReturn.Id != null)
+ {
+ base.DeleteById(mesSalesReturn.Id);
+ }
if (mesSalesReturnDatas.Count > 0)
- db.Deleteable<SalesReturnNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesReturn.ErpId)
- .ExecuteCommand();
-
+ {
+ db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesReturn);
- var baOrUpdate =
- _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
+ var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
if (orUpdate && baOrUpdate) return true;
@@ -89,9 +82,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -133,13 +127,15 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
- List<ErpSalesReturnDetailDto> erpDtoList)
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesReturnNoticeDetail>();
@@ -149,11 +145,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
-
-
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -188,9 +183,11 @@
CustOrder = erpDto.F_ZJXF_Text_re5_lee
};
- var single = _SalesReturnDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesReturnDetailManager.GetSingle(it => it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 5c0616d..beffc7d 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -40,8 +40,7 @@
case "5":
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException( $"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
@@ -49,10 +48,14 @@
private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+ if (mesWomcaa.Id != null)
+ {
+ base.DeleteById(mesWomcaa.Id);
+ }
if (mesWomcabs.Count > 0)
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
- .ExecuteCommand();
+ {
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
db.Ado.CommitTran();
@@ -64,18 +67,16 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
- inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
var result = int.Parse((string)outParam1.Value);
- var message = outParam2.Value == DBNull.Value
- ? string.Empty
- : (string)outParam2.Value;
+ var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
if (result == 1)
+ {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
+ }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
@@ -84,15 +85,17 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+ if (mesWomcaa.Id != null)
+ {
+ base.DeleteById(mesWomcaa.Id);
+ }
if (mesWomcabs.Count > 0)
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
- .ExecuteCommand();
-
+ {
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
db.Ado.CommitTran();
@@ -104,18 +107,16 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
- inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
var result = int.Parse((string)outParam1.Value);
- var message = outParam2.Value == DBNull.Value
- ? string.Empty
- : (string)outParam2.Value;
+ var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
if (result == 1)
+ {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
+ }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
@@ -124,15 +125,16 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
var decimals = mesWomcabs.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesWomcaa.Id);
- var insertOrUpdate =
- db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate =db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -165,7 +167,7 @@
Caa023 = dto.FStatus,
Caa024 = 0,
RoutingId = dto.FRoutingId,
- WorkShopId = dto.FREMWorkShopId,
+ WorkShopId = dto.FremWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
WorkGroupId = dto.FWorkGroupId,
@@ -185,8 +187,8 @@
SrcSplitBillno = dto.FSrcSplitBillNo,
F_ZSXG_KH = dto.F_ZSXG_KH,
F_ZJXF_YHRQ = dto.F_ZJXF_YHRQ,
- PrdOrg = dto.erP_SCZZ,
- TrustOrg = dto.erP_WTZZ,
+ PrdOrg = dto.ERP_SCZZ,
+ TrustOrg = dto.ERP_WTZZ,
TbTime = DateTime.Now,
JaBs = "0",
SupplierId = dto.SupplierId,
@@ -195,9 +197,13 @@
};
if (dto.Type == "5")
+ {
entity.IsXg = 1;
+ }
else
+ {
entity.IsXg = 0;
+ }
if (dto.FStatus == "6" || dto.FStatus == "7")
{
@@ -206,7 +212,10 @@
}
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
- if (single != null) entity.Id = single.Id;
+ if (single != null)
+ {
+ entity.Id = single.Id;
+ }
return entity;
}
@@ -248,9 +257,11 @@
ProcNo = dto.F_ZJXF_SSGX
};
- var entity = Db.Queryable<Womcab>()
- .Where(s => s.Erpid == womcab.Erpid).Single();
- if (entity != null) womcab.Id = entity.Id;
+ var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
+ if (entity != null)
+ {
+ womcab.Id = entity.Id;
+ }
womcabList.Add(womcab);
}
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index 2f06bd0..ad77733 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -43,19 +43,18 @@
case "5":
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException($"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabs.Count > 0)
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
- .ExecuteCommand();
+ {
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabs);
db.Ado.CommitTran();
@@ -67,18 +66,16 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
- inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
var result = int.Parse((string)outParam1.Value);
- var message = outParam2.Value == DBNull.Value
- ? string.Empty
- : (string)outParam2.Value;
+ var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
if (result == 1)
+ {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
+ }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
@@ -87,13 +84,16 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabss)
+ private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabss)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+ if (mesWomcaa.Id != null)
+ {
+ base.DeleteById(mesWomcaa.Id);
+ }
if (mesWomcabss.Count > 0)
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
- .ExecuteCommand();
+ {
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabss);
db.Ado.CommitTran();
@@ -105,18 +105,16 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
- inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
var result = int.Parse((string)outParam1.Value);
- var message = outParam2.Value == DBNull.Value
- ? string.Empty
- : (string)outParam2.Value;
+ var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
if (result == 1)
+ {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
+ }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
@@ -125,15 +123,13 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null)
{
decimals = mesWomcabs.Select(s => s.Id).ToArray();
update = base.DeleteById(mesWomcaa.Id);
- insertOrUpdate =
- db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
}
else
{
@@ -141,7 +137,10 @@
insertOrUpdate = true;
}
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -172,7 +171,7 @@
Caa023 = dto.FStatus,
Caa024 = 0,
RoutingId = dto.FRoutingId,
- WorkShopId = dto.FREMWorkShopId,
+ WorkShopId = dto.FremWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
WorkGroupId = dto.FWorkGroupId,
@@ -192,8 +191,8 @@
SrcSplitBillno = dto.FSrcSplitBillNo,
F_ZSXG_KH = dto.F_ZJXF_BASE_KH,
F_ZJXF_YHRQ = dto.F_ZJXF_DATETIME_YHRQ,
- PrdOrg = dto.erP_SCZZ,
- TrustOrg = dto.erP_WTZZ,
+ PrdOrg = dto.ErpRkhz, //鍏ュ簱璐т富
+ TrustOrg = dto.ErpRkzz, //鍏ュ簱缁勭粐
TbTime = DateTime.Now,
JaBs = "0",
FPURORDERNO = dto.FPurOrderNo,
@@ -216,7 +215,10 @@
}
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
- if (single != null) entity.Id = single.Id;
+ if (single != null)
+ {
+ entity.Id = single.Id;
+ }
return entity;
}
@@ -255,9 +257,11 @@
SalesOrder = dto.F_WWC_TEXT
};
- var entity = Db.Queryable<Womcab>()
- .Where(s => s.Erpid == womcab.Erpid).Single();
- if (entity != null) womcab.Id = entity.Id;
+ var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
+ if (entity != null)
+ {
+ womcab.Id = entity.Id;
+ }
womcabList.Add(womcab);
}
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index cf4cf17..b19b1e2 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Tool\TLM\TLM_JK\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-07-22T07:29:46.8848508Z||;False|2025-07-22T15:29:15.2781716+08:00||;False|2025-07-22T15:26:28.6544573+08:00||;True|2025-07-16T14:28:49.8020385+08:00||;True|2025-07-15T14:10:46.5966766+08:00||;True|2025-07-15T13:47:28.9454088+08:00||;True|2025-07-15T13:47:02.7000977+08:00||;False|2025-07-15T13:46:13.1024314+08:00||;True|2025-06-23T11:21:29.8285053+08:00||;True|2025-06-23T10:42:44.4782901+08:00||;True|2025-06-13T11:39:26.7350436+08:00||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+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||;</History>
+ <History>True|2025-07-23T05:05:59.4942121Z||;True|2025-07-23T10:12:43.2843130+08:00||;True|2025-07-22T15:29:46.8848508+08:00||;False|2025-07-22T15:29:15.2781716+08:00||;False|2025-07-22T15:26:28.6544573+08:00||;True|2025-07-16T14:28:49.8020385+08:00||;True|2025-07-15T14:10:46.5966766+08:00||;True|2025-07-15T13:47:28.9454088+08:00||;True|2025-07-15T13:47:02.7000977+08:00||;False|2025-07-15T13:46:13.1024314+08:00||;True|2025-06-23T11:21:29.8285053+08:00||;True|2025-06-23T10:42:44.4782901+08:00||;True|2025-06-13T11:39:26.7350436+08:00||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+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||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 16647e7..b45773e 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 bc98886..e415c3b 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 ac1129b..a1e20f0 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 3f77676..9702823 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 2010af8..7e67cbe 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 16647e7..b45773e 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 bc98886..e415c3b 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 ac1129b..a1e20f0 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 3f77676..9702823 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 2010af8..7e67cbe 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