From 49c8ac08b9e1a29d24266aef39af9519b792feae Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 14 一月 2025 13:21:42 +0800
Subject: [PATCH] 接收ERP其他出库订单，新增销售订单客户物料信息字段
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/service/BasicData/QTCKManager.cs | 78 +++++++
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/ErpSalesOrdeDetailDto.cs | 3
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
MES.Service/Modes/QTCK.cs | 133 ++++++++++++
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
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
MES.Service/Modes/SalesOrderDetail.cs | 18 +
MES.Service/Dto/webApi/ErpQTCK.cs | 10
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 4
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/Dto/webApi/ErpQTCKDetailDto.cs | 25 ++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/MESApplication.csproj.user | 2
MES.Service/Dto/webApi/ErpSalesReturnDto.cs | 1
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 1
MES.Service/service/BasicData/ErpQTCKManager.cs | 205 ++++++++++++++++++
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 10
MES.Service/Dto/webApi/ErpQTCKDto.cs | 27 ++
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 3
MES.Service/Modes/QTCKDetail.cs | 123 +++++++++++
MES.Service/service/BasicData/SalesOrderManager.cs | 4
MES.Service/Modes/SalesReturnNotice.cs | 5
37 files changed, 650 insertions(+), 6 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpQTCK.cs b/MES.Service/Dto/webApi/ErpQTCK.cs
new file mode 100644
index 0000000..4ee1188
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpQTCK.cs
@@ -0,0 +1,10 @@
+锘縰sing MES.Service.Modes;
+
+namespace MES.Service.Dto.webApi;
+
+public class ErpQTCK
+{
+ public ErpQTCKDto OrderDto { get; set; }
+
+ public List<ErpQTCKDetailDto> Items { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpQTCKDetailDto.cs b/MES.Service/Dto/webApi/ErpQTCKDetailDto.cs
new file mode 100644
index 0000000..8759e2e
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpQTCKDetailDto.cs
@@ -0,0 +1,25 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpQTCKDetailDto
+{
+ public string? Type { get; set; }
+ public string? ERPID { get; set; }
+ public string? ERP_HID { get; set; }
+ public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
+ public string? FMaterialName { get; set; } // 鐗╂枡鍚嶇О
+ public string? FModel { get; set; } // 瑙勬牸鍨嬪彿
+ public string? FUnitID { get; set; } // 鍗曚綅
+ public string? FQty { get; set; } // 鐢宠鏁伴噺
+ public string? FBaseUnitId { get; set; } // 鍩烘湰鍗曚綅
+ public string? FStockId { get; set; } // 浠撳簱
+ public string? FStockLocId { get; set; } // 浠撲綅
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷
+ public string? FOwnerId { get; set; } // 璐т富
+ public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FStockStatusId { get; set; } // 搴撳瓨鐘舵��
+ public string? FEntryNote { get; set; } // 澶囨敞
+ public string? FBUSINESSCLOSED { get; set; } // 涓氬姟鍏抽棴
+
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpQTCKDto.cs b/MES.Service/Dto/webApi/ErpQTCKDto.cs
new file mode 100644
index 0000000..f26dbd5
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpQTCKDto.cs
@@ -0,0 +1,27 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpQTCKDto
+{
+ public string? Type { get; set; }
+ public string? ERPID { get; set; }
+ public string? FBillNo { get; set; } // 鍗曟嵁缂栧彿
+ public string? FBillTypeID { get; set; } // 鍗曟嵁绫诲瀷
+ public string? FDate { get; set; } // 鐢宠鏃ユ湡
+ public string? FCustId { get; set; } // 瀹㈡埛
+ public string? FDeptId { get; set; } // 棰嗙敤閮ㄩ棬
+ public string? FBizType { get; set; } // 涓氬姟绫诲瀷
+ public string? FOwnerTypeIdHead { get; set; } // 璐т富绫诲瀷
+ public string? FNote { get; set; } // 澶囨敞
+ public string? FCreatorId { get; set; } // 鍒涘缓浜�
+ public string? FCreateDate { get; set; } // 鍒涘缓鏃ユ湡
+ public string? FModifierId { get; set; } // 鏈�鍚庝慨鏀逛汉
+ public string? FModifyDate { get; set; } // 鏈�鍚庝慨鏀规棩鏈�
+ public string? FApproverId { get; set; } // 瀹℃牳浜�
+ public string? FApproveDate { get; set; } // 瀹℃牳鏃ユ湡
+ public string? FCloseStatus { get; set; } // 鍏抽棴鐘舵��
+ public string? FCloserId { get; set; } // 鍏抽棴浜�
+ public string? FCloseDate { get; set; } // 鍏抽棴鏃ユ湡
+ public string? FApplyType { get; set; } // 鐢宠绫诲瀷
+
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 60c9165..8c4da82 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -42,5 +42,6 @@
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
+ public string? FEntrynote { get; set; } // 澶囨敞
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
index a3436a2..621726d 100644
--- a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -34,5 +34,8 @@
public string? FBASEARQTY { get; set; } // 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
+ public string? FCUST_INO { get; set; } // 瀹㈡埛鐗╂枡缂栫爜
+ public string? FCUST_INM { get; set; } // 瀹㈡埛鐗╂枡鍚嶇О
+ public string? FCUST_IMD { get; set; } // 瀹㈡埛鐗╂枡瑙勬牸
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
index 221f20b..a33635a 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
@@ -39,4 +39,5 @@
public string? FCancelDate { get; set; } // 浣滃簾鏃ユ湡
public string? FBillCloseStatus { get; set; } // 鍏抽棴鐘舵��
public string? FDocumentStatus { get; set; } // 鍗曟嵁鐘舵��
+ public string? F_UNW_Text_THYY { get; set; } // 閫�璐у師鍥�
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QTCK.cs b/MES.Service/Modes/QTCK.cs
new file mode 100644
index 0000000..4ca85dd
--- /dev/null
+++ b/MES.Service/Modes/QTCK.cs
@@ -0,0 +1,133 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞彂璐ч�氱煡鍗�
+ ///</summary>
+ [SugarTable("MES_ERPQTCK")]
+ public class QTCK
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_TBL", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
+ /// <summary>
+ /// ERPID
+ ///</summary>
+ [SugarColumn(ColumnName = "ERPID")]
+ public decimal? ERPID { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "FBillNo")]
+ public string BillNo { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "FBillTypeID")]
+ public string BillType { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "FDate")]
+ public DateTime? FDate { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛ID
+ ///</summary>
+ [SugarColumn(ColumnName = "FCustId")]
+ public decimal? CustId { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬ID
+ ///</summary>
+ [SugarColumn(ColumnName = "FDeptId")]
+ public string DeptId { get; set; }
+
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "FBizType")]
+ public string BizType { get; set; }
+
+ /// <summary>
+ /// 璐熻矗浜虹被鍨�
+ ///</summary>
+ [SugarColumn(ColumnName = "FOwnerTypeIdHead")]
+ public string OwnerTypeIdHead { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "FNote")]
+ public string Note { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒D
+ ///</summary>
+ [SugarColumn(ColumnName = "FCreatorId")]
+ public string CreatorId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "FCreateDate")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒D
+ ///</summary>
+ [SugarColumn(ColumnName = "FModifierId")]
+ public decimal? ModifierId { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "FModifyDate")]
+ public DateTime? ModifyDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃壒浜篒D
+ ///</summary>
+ [SugarColumn(ColumnName = "FApproverId")]
+ public decimal? ApproverId { get; set; }
+
+ /// <summary>
+ /// 瀹℃壒鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "FApproveDate")]
+ public DateTime? ApproveDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "FCloseStatus")]
+ public decimal? CloseStatus { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴浜篒D
+ ///</summary>
+ [SugarColumn(ColumnName = "FCloserId")]
+ public decimal? CloserId { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "FCloseDate")]
+ public DateTime? CloseDate { get; set; }
+
+ /// <summary>
+ /// 鐢宠绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "FApplyType")]
+ public string ApplyType { get; set; }
+
+
+ }
+}
diff --git a/MES.Service/Modes/QTCKDetail.cs b/MES.Service/Modes/QTCKDetail.cs
new file mode 100644
index 0000000..bd3a50b
--- /dev/null
+++ b/MES.Service/Modes/QTCKDetail.cs
@@ -0,0 +1,123 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞彂璐ч�氱煡鍗曟槑缁嗚〃
+ ///</summary>
+ [SugarTable("MES_ERPQTCK_DETAIL")]
+ public class QTCKDetail
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_TBL", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "PID")]
+ public decimal? PID { get; set; }
+ /// <summary>
+ /// ERPID
+ ///</summary>
+ [SugarColumn(ColumnName = "ERPID")]
+ public decimal? ERPID { get; set; }
+ /// <summary>
+ /// ERHPID
+ ///</summary>
+ [SugarColumn(ColumnName = "ERP_HID")]
+ public decimal? ERP_HID { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "FMaterialId")]
+ public string MaterialId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "FMaterialName")]
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName = "FModel")]
+ public string Model { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "FUnitID")]
+ public string UnitID { get; set; }
+
+ /// <summary>
+ /// 鐢宠鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "FQty")]
+ public decimal? Qty { get; set; }
+
+ /// <summary>
+ /// 鍩烘湰鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "FBaseUnitId")]
+ public string BaseUnitId { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName = "FStockId")]
+ public string StockId { get; set; }
+
+ /// <summary>
+ /// 浠撲綅
+ ///</summary>
+ [SugarColumn(ColumnName = "FStockLocId")]
+ public string StockLocId { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName = "FLot")]
+ public string Lot { get; set; }
+
+ /// <summary>
+ /// 璐т富绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "FOwnerTypeId")]
+ public string OwnerTypeId { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ ///</summary>
+ [SugarColumn(ColumnName = "FOwnerId")]
+ public decimal? OwnerId { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "FMtoNo")]
+ public string MtoNo { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "FStockStatusId")]
+ public string StockStatusId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "FEntryNote")]
+ public string EntryNote { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鍏抽棴
+ ///</summary>
+ [SugarColumn(ColumnName = "FBUSINESSCLOSED")]
+ public string BusinessClosed { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 6620ac6..ed1d29a 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -170,5 +170,15 @@
///</summary>
[SugarColumn(ColumnName="ERP_HEAD_ID" )]
public string ErpHeadId { get; set; }
+ /// <summary>
+ /// ERP澶碔D
+ ///</summary>
+ [SugarColumn(ColumnName = "f_UNW_Base_GDY")]
+ public string GDY { get; set; }
+ /// <summary>
+ /// ERP澶碔D
+ ///</summary>
+ [SugarColumn(ColumnName = "FEntrynote")]
+ public string NOTE { get; set; }
}
}
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 17ae63e..4d31f17 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -200,4 +200,22 @@
[SugarColumn(ColumnName = "BASEARQTY")]
public decimal? BASEARQTY { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_INO")]
+ public string? CUST_INO { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_INM")]
+ public string? CUST_INM { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_IMD")]
+ public string? CUST_IMD { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
index 3ca8eb3..77bced9 100644
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ b/MES.Service/Modes/SalesReturnNotice.cs
@@ -210,5 +210,10 @@
///</summary>
[SugarColumn(ColumnName = "BILL_STATUS")]
public string BillStatus { get; set; }
+ /// <summary>
+ /// 閫�璐у師鍥�
+ ///</summary>
+ [SugarColumn(ColumnName = "FUNWTextTHYY")]
+ public string FUNWTextTHYY { 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 e49d9be..512dcbb 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 0578a6e..555f589 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 9642463..b2bf1c4 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 7c75f47..e56eead 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/ErpQTCKManager.cs b/MES.Service/service/BasicData/ErpQTCKManager.cs
new file mode 100644
index 0000000..93c67cd
--- /dev/null
+++ b/MES.Service/service/BasicData/ErpQTCKManager.cs
@@ -0,0 +1,205 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+using MES.Service.Dto.webApi;
+using MES.Service.service.BasicData;
+using System.Globalization;
+
+namespace MES.Service.service
+{
+ public class QTCKManager : Repository<QTCK>
+ {
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ private readonly QTCKDetailManager QTCKDetailManager =
+ new();
+ //ErpSalesRerurn
+ public bool Save(ErpQTCK QTCK)
+ {
+ var erpQTCKDto = QTCK.OrderDto;
+ var mesQTCK = ConvertErpToQTCK(QTCK.OrderDto);
+ var mesQTCKDatas = ConvertErpToQTCKDetail(QTCK.Items);
+
+ return UseTransaction(db =>
+ {
+ switch (erpQTCKDto.Type)
+ {
+ // case "2":
+ // return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
+ // rohInErpRohIn.FBILLTYPE)
+ // ? 1
+ // : 0;
+ case "3":
+ return UpdateData(db, mesQTCK, mesQTCKDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesQTCK, mesQTCKDatas, erpQTCKDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpQTCKDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool UpdateData(SqlSugarScope db, QTCK mesQTCK,
+ List<QTCKDetail> mesQTCKDatas)
+ {
+ var decimals = mesQTCKDatas.Select(s => s.Id).ToArray();
+ var update = base.DeleteById(mesQTCK.Id);
+ var insertOrUpdate = db
+ .Deleteable<QTCKDetail>().In(decimals)
+ .ExecuteCommand() > 0;
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db, QTCK mesQTCK,
+ List<QTCKDetail> mesQTCKDatas, string type)
+ {
+ if (mesQTCK.Id != null) base.DeleteById(mesQTCK.Id);
+
+ if (mesQTCKDatas.Count > 0)
+ db.Deleteable<QTCKDetail>()
+ .Where(s => s.ERP_HID == mesQTCK.ERPID).ExecuteCommand();
+
+ //var orUpdate = base.Insert(mesQTCK);
+ //var baOrUpdate = QTCKDetailManager.InsertRange(mesQTCKDatas);
+ //if (orUpdate && baOrUpdate) return true;
+
+ UseTransaction(db =>
+ {
+
+ var id = db.Insertable(mesQTCK).ExecuteReturnIdentity();
+
+ for (int i = 0; i < mesQTCKDatas.Count; i++)
+ {
+ var item = mesQTCKDatas[i];
+ item.PID = id;
+ db.Insertable(item).IgnoreColumns(true).ExecuteCommand();
+ }
+
+ return 1;
+ });
+
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpQTCK> QTCKOrder)
+ {
+ var result = QTCKOrder.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private QTCK ConvertErpToQTCK(
+ ErpQTCKDto 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;
+
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
+ }
+
+ var QTCKOrder = new QTCK
+ {
+ ERPID = Convert.ToDecimal(erpDto.ERPID),//ERP琛孖D
+ BillNo = erpDto.FBillNo,
+ FDate = ParseDateTime(erpDto.FDate) ?? null,
+ BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
+ CustId = Convert.ToDecimal(erpDto.FCustId), // 瀹㈡埛ID
+ DeptId = erpDto.FDeptId, //閿�鍞儴闂�
+ BizType = erpDto.FBizType, //
+ OwnerTypeIdHead = erpDto.FOwnerTypeIdHead, //
+ Note = erpDto.FNote, //
+ CreatorId = erpDto.FCreatorId, //
+ CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, //
+ ModifierId = Convert.ToDecimal(erpDto.FModifierId), //
+ ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, //
+ ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, //
+ CloseStatus = Convert.ToDecimal(erpDto.FCloseStatus), //
+ CloserId = Convert.ToDecimal(erpDto.FCloserId), //
+ CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, //
+ ApplyType = erpDto.FApplyType
+
+ };
+
+ var single = base.GetSingle(it => it.ERPID == Convert.ToDecimal(erpDto.ERPID));
+ if (single != null) QTCKOrder.Id = single.Id;
+
+ return QTCKOrder;
+ }
+
+ private List<QTCKDetail> ConvertErpToQTCKDetail(
+ List<ErpQTCKDetailDto> erpDtoList)
+
+ {
+ var QTCKOrderSubList =
+ new List<QTCKDetail>();
+
+ 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;
+
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
+ }
+
+
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var QTCKOrderSub = new QTCKDetail
+ {
+ ERPID = Convert.ToDecimal(erpDto.ERPID),//ERP琛孖D
+ ERP_HID = Convert.ToDecimal(erpDto.ERP_HID),//ERP澶碔D
+ MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
+ MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
+ Model = erpDto.FModel,//瑙勬牸鍨嬪彿
+ UnitID = erpDto.FUnitID,//閿�鍞崟浣�
+ Qty = Convert.ToDecimal(erpDto.FQty),//鏁伴噺
+ BaseUnitId = erpDto.FBaseUnitId,//
+ StockId = erpDto.FStockId,//
+ StockLocId = erpDto.FStockLocId,//
+ Lot = erpDto.FLot,//
+ OwnerTypeId = erpDto.FOwnerTypeId,//
+ OwnerId = Convert.ToDecimal(erpDto.FOwnerId),//
+ MtoNo = erpDto.FMtoNo,//
+ StockStatusId = erpDto.FStockStatusId,//
+ EntryNote = erpDto.FEntryNote,//
+ BusinessClosed = erpDto.FBUSINESSCLOSED//
+
+ };
+
+ var single = QTCKDetailManager.GetSingle(it =>
+ it.ERPID == QTCKOrderSub.ERPID);
+ if (single != null) QTCKOrderSub.Id = single.Id;
+
+ QTCKOrderSubList.Add(QTCKOrderSub);
+ }
+
+ return QTCKOrderSubList;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/QTCKManager.cs b/MES.Service/service/BasicData/QTCKManager.cs
new file mode 100644
index 0000000..868569c
--- /dev/null
+++ b/MES.Service/service/BasicData/QTCKManager.cs
@@ -0,0 +1,78 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+
+namespace MES.Service.service
+{
+public class QTCKDetailManager : Repository<QTCKDetail>
+{
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 QTCKDetailManager.cs
+
+
+ #region 鏁欏鏂规硶
+ /// <summary>
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// </summary>
+ public void Study()
+ {
+
+ /*********鏌ヨ*********/
+
+ var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
+ var data2 = base.GetList();//鏌ヨ鎵�鏈�
+ var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
+
+ var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
+ var data5 = base.GetPageList(it => 1 == 1, p);
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel() { FieldName= typeof(QTCKDetail).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
+ var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+
+ base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
+
+
+ /*********鎻掑叆*********/
+ var insertData = new QTCKDetail() { };//娴嬭瘯鍙傛暟
+ var insertArray = new QTCKDetail[] { insertData };
+ base.Insert(insertData);//鎻掑叆
+ base.InsertRange(insertArray);//鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
+ base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+
+ /*********鏇存柊*********/
+ var updateData = new QTCKDetail() { };//娴嬭瘯鍙傛暟
+ var updateArray = new QTCKDetail[] { updateData };//娴嬭瘯鍙傛暟
+ base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ //base.Update(it => new QTCKDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new QTCKDetail() { };//娴嬭瘯鍙傛暟
+ base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
+ base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+ #endregion
+
+
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 99f79d2..2c41c13 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -208,7 +208,9 @@
TerminationStatus = erpDto.FTerminationStatus,//缁堟鐘舵��
TerminationDate = ParseDateTime(erpDto.FTerminateDate),//涓氬姟缁堟鏃ユ湡
SumOutQty = erpDto.FSumOutQty,//绱鍑哄簱鏁伴噺
- RemainOutQty = erpDto.FRemainOutQty//鏈嚭搴撴暟閲�
+ RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
+ GDY = erpDto.F_UNW_Base_GDY,//璺熷崟鍛�
+ NOTE = erpDto.FEntrynote//澶囨敞
};
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index c40369b..9ce59de 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -192,7 +192,9 @@
BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
-
+ CUST_INO = erpDto.FCUST_INO,
+ CUST_INM = erpDto.FCUST_INM,
+ CUST_IMD = erpDto.FCUST_IMD,
};
var single = _SalesOrderDetailManager.GetSingle(it =>
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index 41c8c09..a46c1c5 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -135,7 +135,8 @@
CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
- BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
+ BillStatus = erpDto.FDocumentStatus, //鍗曟嵁鐘舵��
+ FUNWTextTHYY = erpDto.F_UNW_Text_THYY //鍗曟嵁鐘舵��
};
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index 1e27644..dfe1ae2 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>F:\F鐩樻闈笓灞瀄椤圭洰浠ｇ爜绠＄悊鏂囦欢澶筡涓婃牸椤圭洰\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 398d3c5..efd05c6 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>F:\F鐩樻闈笓灞瀄椤圭洰浠ｇ爜绠＄悊鏂囦欢澶筡涓婃牸椤圭洰\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-12-06T08:11:01.2090466Z;True|2024-11-26T09:07:33.5654976+08:00;True|2024-11-20T15:49:27.1100474+08:00;True|2024-11-16T18:18:42.4224922+08:00;True|2024-11-15T09:32:12.6287354+08:00;True|2024-11-13T10:19:32.3283327+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>
+ <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2025-01-13T07:35:48.6521519Z||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+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 e49d9be..512dcbb 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 0578a6e..555f589 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 77f3f11..af99c12 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 96df49c..6f2c892 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 6ec3962..4582c7f 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 9642463..b2bf1c4 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 7c75f47..e56eead 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 7044121..a63505f 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 96df49c..6f2c892 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 f2b5480..3def73d 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 9642463..b2bf1c4 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 7c75f47..e56eead 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 7044121..a63505f 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 96df49c..6f2c892 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 f2b5480..3def73d 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