From e749bf256738008aa9283c3f8ac4241b374191a0 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期三, 07 八月 2024 10:56:19 +0800
Subject: [PATCH] 夏蒙
---
MES.Service/Dto/webApi/ErpDepartment.cs | 3
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Modes/MesRohInData.cs | 12
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/web.config | 3
MES.Service/Dto/webApi/ErpDepots.cs | 5
MES.Service/Modes/MesRohIn.cs | 6
MES.Service/Dto/webApi/ErpItemType.cs | 2
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
MES.Service/Dto/webApi/ErpRohinData.cs | 22
MES.Service/Modes/MesStaff.cs | 11
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/service/BasicData/MesDepotsManager.cs | 9
MES.Service/Dto/webApi/ErpCustomer.cs | 7
MES.Service/Modes/MesItemType.cs | 11
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Modes/SysDepartment.cs | 16
MES.Service/service/BasicData/MesPositionManager.cs | 5
MES.Service/service/BasicData/SysDepartmentManager.cs | 6
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/Controllers/BasicData/OrganizeController.cs | 266 ++++++++++++++++
MES.Service/service/BasicData/MesItemsManager.cs | 10
MES.Service/Modes/Organize.cs | 40 ++
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MES.Service/service/BasicData/MesStaffManager.cs | 7
MES.Service/service/BasicData/MesRohInManager.cs | 47 +-
MES.Service/Dto/webApi/ErpRohIn.cs | 12
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpSupplier.cs | 5
MES.Service/Modes/MesPosition.cs | 26 -
MES.Service/Dto/webApi/ErpOrganize.cs | 12
MES.Service/service/BasicData/MesCustomerManager.cs | 6
MES.Service/service/BasicData/OrganizeManager.cs | 257 ++++++++++++++++
MES.Service/service/BasicData/MesSupplierManager.cs | 7
MES.Service/Modes/MesSupplier.cs | 20
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/Modes/MesCustomer.cs | 20
MES.Service/Dto/webApi/ErpPosition.cs | 3
MES.Service/Modes/MesDepots.cs | 36 -
MES.Service/DB/Repository.cs | 2
MES.Service/Dto/webApi/ErpItems.cs | 12
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 25 +
MESApplication/MESApplication.csproj.user | 2
/dev/null | 4
MES.Service/Dto/webApi/ErpStaff.cs | 4
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
global.json | 2
MES.Service/service/BasicData/MesItemTypeManager.cs | 5
58 files changed, 815 insertions(+), 137 deletions(-)
diff --git a/MES.Service/DB/Repository.cs b/MES.Service/DB/Repository.cs
index 366f787..aa80782 100644
--- a/MES.Service/DB/Repository.cs
+++ b/MES.Service/DB/Repository.cs
@@ -8,7 +8,7 @@
{
DbType = DbType.Oracle,
ConnectionString =
- @"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd",
+ @"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev",
IsAutoCloseConnection = true
},
db =>
diff --git a/MES.Service/Dto/webApi/ErpCustomer.cs b/MES.Service/Dto/webApi/ErpCustomer.cs
index 46440a7..d5ec8e7 100644
--- a/MES.Service/Dto/webApi/ErpCustomer.cs
+++ b/MES.Service/Dto/webApi/ErpCustomer.cs
@@ -2,6 +2,9 @@
public class ErpCustomer
{
+ //ERP鍌宠几閬庝締鐨勬暩鎿氬瓨鍎插湪閫欒！//json鏍煎紡灏忓
+
+
public string? Type { get; set; }
public string Id { get; set; }
public string? FNumber { get; set; }
@@ -11,4 +14,8 @@
public string? Fmobilephone { get; set; }
public string? Fseller { get; set; }
public string? FForbidStatus { get; set; }
+
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
+ public string? Fremarks { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepartment.cs b/MES.Service/Dto/webApi/ErpDepartment.cs
index e5fa314..65101d2 100644
--- a/MES.Service/Dto/webApi/ErpDepartment.cs
+++ b/MES.Service/Dto/webApi/ErpDepartment.cs
@@ -17,4 +17,7 @@
public string? FForbidStatus { get; set; }
public string? Type { get; set; }
+ public string? FParentID { get; set; }
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index 8a88ef3..f760253 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -19,4 +19,9 @@
public string? FGroup { get; set; }
public string? Type { get; set; }
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
+ public string? FSUPPLIERID { get; set; }
+ public string? Fdeptid { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItemType.cs b/MES.Service/Dto/webApi/ErpItemType.cs
index ea4146c..b14ea74 100644
--- a/MES.Service/Dto/webApi/ErpItemType.cs
+++ b/MES.Service/Dto/webApi/ErpItemType.cs
@@ -8,4 +8,6 @@
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? FDescription { get; set; }
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItems.cs b/MES.Service/Dto/webApi/ErpItems.cs
index e2b3a76..547ac41 100644
--- a/MES.Service/Dto/webApi/ErpItems.cs
+++ b/MES.Service/Dto/webApi/ErpItems.cs
@@ -12,7 +12,9 @@
public double? FMaxStock { get; set; }
public double? FMinPackCount { get; set; }
public string? FStockId { get; set; }
- public string? PPBOM00019124 { get; set; }
+ /// <summary>
+ //public string? PPBOM00019124 { get; set; }
+ /// </summary>
public string? FMaterialGroup { get; set; }
public string? FDescription { get; set; }
public decimal? FFinishReceiptOverRate { get; set; }
@@ -28,4 +30,12 @@
public string? FPRODUCEUNITID { get; set; }
public string? FSUBCONUNITID { get; set; }
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
+ public string? FLOSSPERCENT { get; set; }
+ public string? FMnemonicCode { get; set; }
+ public string? FExpPeriod { get; set; }
+
+
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOrganize.cs b/MES.Service/Dto/webApi/ErpOrganize.cs
new file mode 100644
index 0000000..27e47f5
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -0,0 +1,12 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpOrganize
+{
+ public string? Type { get; set; }
+ public string Id { get; set; }
+
+ public string? FNumber { get; set; }
+ public string? FName { get; set; }
+ public string? FForbidStatus { get; set; }
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpPosition.cs b/MES.Service/Dto/webApi/ErpPosition.cs
index f3e812b..79deb8a 100644
--- a/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/MES.Service/Dto/webApi/ErpPosition.cs
@@ -22,7 +22,8 @@
public string? FForbidderId { get; set; }
public string? FForbidDate { get; set; }
-
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
/// <summary>
/// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
/// </summary>
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index bbd2c6b..224befa 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -17,7 +17,7 @@
public string? Facctype { get; set; }
public string? FPurchaserId { get; set; }
- public string? F_UNW_Remarks_zlyq { get; set; }
+ // public string? F_UNW_Remarks_zlyq { get; set; }
// public string? F_UNW_GYSLXR { get; set; }
// public string? F_UNW_LXRDH { get; set; }
@@ -26,10 +26,10 @@
// public string? FProviderAddress { get; set; }
public string? FSettleId { get; set; }
public string? FChargeId { get; set; }
- public string? FProviderEMail { get; set; }
- public string? F_UNW_Text_ysfs { get; set; }
- public string? F_UNW_BZ { get; set; }
- public string? F_UNW_Combo_zjmj { get; set; }
+ // public string? FProviderEMail { get; set; }
+ // public string? F_UNW_Text_ysfs { get; set; }
+ public string? FHEADNOTE { get; set; }
+ // public string? F_UNW_Combo_zjmj { get; set; }
public string? FCancelStatus { get; set; }
public string? FCancellerId { get; set; }
public string? FCancelDate { get; set; }
@@ -43,5 +43,5 @@
public string? FCHANGEREASON { get; set; }
//閲囪喘璁㈠崟A 閲囪喘璁㈠崟鍙樻洿鍗旴
- public string? FBILLTYPE { get; set; }
+ //public string? FBILLTYPE { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 70cd6a6..8d3684a 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,20 +5,22 @@
public string id { get; set; }
public string Eid { get; set; }
public string? FBillNo { get; set; }
- public string? F_UNW_Text_xsddh { get; set; }
+ public string? FDEMANDBILLNO { get; set; }
+ public string? FSEQ { 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? FStockUnitID { get; set; }
- public string? FPriceUnitId { get; set; }
- public string? FPriceUnitQty { get; set; }
public string? FDeliveryDate { get; set; }
public string? FDeliveryEarlyDate { get; set; }
public string? FDeliveryLastDate { get; set; }
+ public string? FRequireOrgId { get; set; }
+ public string? FRequireDeptId { get; set; }
+ public string? FReceiveOrgId { get; set; }
+ public string? FReceiveDeptId { get; set; }
+ public string? FSETTLEORGID { get; set; }
public string? FGiveAway { get; set; }
- public string? FEntryNote { get; set; }
+ public string? Fnote { get; set; }
public string? FSupMatId { get; set; }
public string? FSupMatName { get; set; }
public string? FSUBREQBILLNO { get; set; }
@@ -43,10 +45,8 @@
public string? FMtoNo { get; set; }
public string? FChangeFlag { get; set; }
public string? FDEMANDTYPE { get; set; }
- public string? FDEMANDBILLNO { get; set; }
+ //public string? FDEMANDBILLNO { get; set; }
public string? FDEMANDBILLENTRYSEQ { get; set; }
- public string? PurchaseOrderLineNumber { get; set; }
- public string? Demand { get; set; }
- public string? Receiving { get; set; }
- public string? Settlement { get; set; }
+ public string? fentryid { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpStaff.cs b/MES.Service/Dto/webApi/ErpStaff.cs
index 263ad9a..b7a58e4 100644
--- a/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/MES.Service/Dto/webApi/ErpStaff.cs
@@ -12,4 +12,8 @@
public string? FStaffStartDate { get; set; }
public string? FDescription { get; set; }
public string? FForbidStatus { get; set; }
+
+ public string? Fumbrella { get; set; }
+ public string? FSubsidiary { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSupplier.cs b/MES.Service/Dto/webApi/ErpSupplier.cs
index 7187428..a135141 100644
--- a/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -11,4 +11,9 @@
public string? F_UNW_LXRDH { get; set; }
public string? FStaffId { get; set; }
public string? FForbidStatus { get; set; }
+
+ public string? Fumbrella { get; set; }
+ public string? Fsubsidiary { get; set; }
+ public string? Fremarks { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesCustomer.cs b/MES.Service/Modes/MesCustomer.cs
index 40948f7..8752b6b 100644
--- a/MES.Service/Modes/MesCustomer.cs
+++ b/MES.Service/Modes/MesCustomer.cs
@@ -141,18 +141,22 @@
public string? Fseller { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 鍌欒ɑ
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "fremarks")]
+ public string? fremarks { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 浣跨敤绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
-
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
/// <summary>
+ /// 鍓靛缓绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+ /* /// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
@@ -169,6 +173,6 @@
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
-
+*/
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 27537b2..69e2e55 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -147,34 +147,22 @@
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�1
+ /// 浣跨敤绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
-
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�2
+ /// 鍓靛缓绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
+ public string? FStockStatusType { get; set; }
+ [SugarColumn(ColumnName = "FSUPPLIERID")]
+ public string? FSUPPLIERID { get; set; }
+ [SugarColumn(ColumnName = "Fdeptid")]
+ public string? Fdeptid { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItemType.cs b/MES.Service/Modes/MesItemType.cs
index 23f72ed..10c3cd4 100644
--- a/MES.Service/Modes/MesItemType.cs
+++ b/MES.Service/Modes/MesItemType.cs
@@ -83,7 +83,16 @@
/// </summary>
[SugarColumn(ColumnName = "PGROUP")]
public string? Pgroup { get; set; }
-
+ /// <summary>
+ /// 浣跨敤绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
+ /// <summary>
+ /// 鍓靛缓绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
/// <summary>
/// 鎻忚堪
/// </summary>
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 809dcb8..46fc83d 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -167,8 +167,8 @@
/// <summary>
/// 鐗╂枡鍒嗙被缂栧彿
/// </summary>
- [SugarColumn(ColumnName = "PPBOM00019124")]
- public string? Ppbom00019124 { get; set; }
+ /* [SugarColumn(ColumnName = "PPBOM00019124")]
+ public string? Ppbom00019124 { get; set; }*/
/// <summary>
/// 鐗╂枡鍒嗙粍
@@ -266,5 +266,26 @@
[SugarColumn(ColumnName = "SUBCON_UNIT")]
public string? SubconUnit { get; set; }
+ /// <summary>
+ /// 浣跨敤绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
+ /// <summary>
+ /// 鍓靛缓绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
+ [SugarColumn(ColumnName = "FLOSSPERCENT")]
+ public string? FLOSSPERCENT { get; set; }
+
+ [SugarColumn(ColumnName = "FMnemonicCode")]
+
+ public string? FMnemonicCode { get; set; }
+
+ [SugarColumn(ColumnName = "FExpPeriod")]
+ public string? FExpPeriod { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesPosition.cs b/MES.Service/Modes/MesPosition.cs
index a2f13ce..4b9c902 100644
--- a/MES.Service/Modes/MesPosition.cs
+++ b/MES.Service/Modes/MesPosition.cs
@@ -62,29 +62,15 @@
public string? Fforbidstatus { get; set; }
/// <summary>
+ /// 浣跨敤绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
-
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
/// <summary>
+ /// 鍓靛缓绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index abdfd74..a195a98 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -228,12 +228,6 @@
public string? CheckBy { get; set; }
/// <summary>
- /// 瀹℃牳鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_FALG")]
- public short? CheckFalg { get; set; }
-
- /// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
[SugarColumn(ColumnName = "changereason")]
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 0fd7920..bd6b528 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -347,4 +347,16 @@
/// </summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
+
+ /// <summary>
+ /// 闇�姹傞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
+ public string? DemandDepartment { get; set; }
+
+ /// <summary>
+ /// 鏀舵枡閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
+ public string? ReceivingDepartment { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 0b7e36c..7ac042c 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -147,4 +147,15 @@
public string FforbidStatus { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ /// <summary>
+ /// 浣跨敤绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
+ /// <summary>
+ /// 鍓靛缓绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSupplier.cs b/MES.Service/Modes/MesSupplier.cs
index 8736c2b..9a5440f 100644
--- a/MES.Service/Modes/MesSupplier.cs
+++ b/MES.Service/Modes/MesSupplier.cs
@@ -143,32 +143,32 @@
/// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "TYPE")]
+ public string? type { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�2
/// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ [SugarColumn(ColumnName = "fremarks")]
+ public string? fremarks { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
/// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�5
/// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ /* [SugarColumn(ColumnName = "REMARK5")]
+ public string? Remark5 { get; set; }*/
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Organize.cs b/MES.Service/Modes/Organize.cs
new file mode 100644
index 0000000..b7888d4
--- /dev/null
+++ b/MES.Service/Modes/Organize.cs
@@ -0,0 +1,40 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 缁勭粐
+ ///</summary>
+ [SugarTable("ORGANIZE")]
+ public class Organize
+ {
+ /// <summary>
+ /// 缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="FNUMBER" )]
+ public string Fnumber { get; set; }
+ /// <summary>
+ /// 鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName="FNAME" )]
+ public string Fname { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ // [SugarColumn(ColumnName="ID" )]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string Id { get; set; }
+ /// <summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="FFORBIDSTATUS" )]
+ public string Fforbidstatus { get; set; }
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="TYPE" )]
+ public string Type { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index f2b6669..f3bc3ba 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -136,8 +136,20 @@
/// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ [SugarColumn(ColumnName = "FParentID")]
+ public string? FParentID { get; set; }
+
+ /// <summary>
+ /// 浣跨敤绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
+ /// <summary>
+ /// 鍓靛缓绲勭箶
+ /// </summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
/// <summary>
/// 鑷畾涔夊瓧娈�2
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 51bc172..d5dc573 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 40c5073..254baba 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 6aed25f..fb272f7 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 437449f..d83af0b 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/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 774f869..6a5369c 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -120,6 +120,9 @@
private MesCustomer GetSysDepartment(ErpCustomer customer)
{
+
+ //ERP鍌宠几鐨勬帴鍙ｆ暩鎿氳綁鎻涚偤MES鏁告摎搴瓧娈�
+
return new MesCustomer
{
Id = Convert.ToDecimal(customer.Id),
@@ -130,6 +133,9 @@
Telf1 = customer.Fmobilephone,
Fseller = customer.Fseller,
Fforbidstatus = customer.FForbidStatus,
+ fremarks =customer.Fremarks,
+ FSubsidiary =customer.FSubsidiary,
+ Fumbrella = customer.Fumbrella,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index d10b6f7..96fe20b 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -113,7 +114,11 @@
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
- Company = "1000",
+ FSubsidiary = depots.FSubsidiary,
+ Fumbrella = depots.Fumbrella,
+ FSUPPLIERID = depots.FSUPPLIERID,
+ Fdeptid = depots.Fdeptid,
+ Company = "1000",
Factory = "1000"
};
}
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index 6aea112..6de2080 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
@@ -57,6 +58,8 @@
Tcode = department.FNumber,
Tname = department.FName,
Description = department.FDescription,
+ FSubsidiary = department.FSubsidiary,
+ Fumbrella = department.Fumbrella,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index a90c981..4e916be 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -128,7 +129,7 @@
Highlimit = item.FMaxStock,
PrdPack = item.FMinPackCount,
DepotCode = item.FStockId,
- Ppbom00019124 = item.PPBOM00019124,
+ //Ppbom00019124 = item.PPBOM00019124,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -143,6 +144,11 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
+ FSubsidiary = item.FSubsidiary,
+ Fumbrella = item.Fumbrella,
+ FLOSSPERCENT = item.FLOSSPERCENT ,
+ FMnemonicCode = item.FMnemonicCode,
+ FExpPeriod = item.FExpPeriod ,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index a670906..c7d02e7 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -102,6 +103,8 @@
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
+ FSubsidiary = position.FSubsidiary,
+ Fumbrella = position.Fumbrella,
CreationDate = position.FCreateDate != null
? DateTime.ParseExact(position.FCreateDate,
"yyyy-MM-dd HH:mm:ss", null)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 35acb3c..cd79236 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -14,25 +14,18 @@
{
var rohInErpRohIn = rohIn.ErpRohIn;
var mesRohIn = GetMesRohIn(rohInErpRohIn);
- var mesRohInDatas =
- GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
+ var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
return UseTransaction(db =>
{
switch (rohInErpRohIn.Type)
{
- // case "2":
- // return InsertData(db, mesRohIn, mesRohInDatas,
- // rohInErpRohIn.FBILLTYPE)
- // ? 1
- // : 0;
- case "3":
- return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
- ? 1
- : 0;
+ case "5":
+ return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
+ case "3":
+ return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷");
@@ -147,13 +140,13 @@
mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
mesRohIn.QtyAcceptance = rohIn.Facctype;
mesRohIn.Purchaser = rohIn.FPurchaserId;
- mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
+ //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
- mesRohIn.Email = rohIn.FProviderEMail;
- mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
- mesRohIn.Remarks = rohIn.F_UNW_BZ;
- mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
+ // mesRohIn.Email = rohIn.FProviderEMail;
+ // mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
+ mesRohIn.Remarks = rohIn.FHEADNOTE;
+ // mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -192,13 +185,12 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- SalesOrderId = s.F_UNW_Text_xsddh,
+ SalesOrderId=s.FDEMANDBILLNO,
+ OrderLineId=s.FSEQ,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
InventoryUnit = s.FStockUnitID,
- PricingUnit = s.FPriceUnitId,
- PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
DeliveryDate = s.FDeliveryDate != null
? DateTime.ParseExact(s.FDeliveryDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -212,7 +204,7 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
IsGift = s.FGiveAway,
- Remarks = s.FEntryNote,
+ Remarks = s.Fnote,
SupplierItemCode = s.FSupMatId,
SupplierItemName = s.FSupMatName,
OutsourcingOrderId = s.FSUBREQBILLNO,
@@ -246,10 +238,15 @@
DemandSource = s.FDEMANDTYPE,
DemandDocumentId = s.FDEMANDBILLNO,
DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
- PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
- Demand = s.Demand,
- Receiving = s.Receiving,
- Settlement = s.Settlement
+ DemandOrg = s.FRequireOrgId,
+ ReceivingOrg = s.FReceiveOrgId,
+ SettlementOrg = s.FSETTLEORGID,
+ PurchaseOrderLineNumber = s.FSEQ,
+ Demand =s.FRequireOrgId,
+ Receiving = s.FReceiveOrgId,
+ Settlement =s.FSETTLEORGID,
+ DemandDepartment = s.FRequireDeptId,
+ ReceivingDepartment = s.FReceiveDeptId
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 366f989..1dd36fc 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -118,7 +119,9 @@
PositionName = staff.FPost,
PhoneNumber = staff.FMobile,
Remark = staff.FDescription,
- FforbidStatus = staff.FForbidStatus
+ FforbidStatus = staff.FForbidStatus,
+ FSubsidiary = staff.FSubsidiary,
+ Fumbrella = staff.Fumbrella,
};
if (staff.FStaffStartDate != null)
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index f64e2e9..6fa3093 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -127,6 +128,10 @@
Telf1 = supplier.F_UNW_LXRDH,
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
+ type= supplier.Type,
+ fremarks = supplier.Fremarks,
+ FSubsidiary = supplier.Fsubsidiary,
+ Fumbrella = supplier.Fumbrella,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
new file mode 100644
index 0000000..7b16af6
--- /dev/null
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -0,0 +1,257 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+using MES.Service.Dto.webApi;
+using System.Xml.Linq;
+
+namespace MES.Service.service
+{
+public class OrganizeManager : Repository<Organize>
+{
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
+ public bool Save(ErpOrganize item)
+ {
+ var entity = GetOrganize(item);
+
+ return UseTransaction(db =>
+ {
+ switch (item.Type)
+ {
+ case "0":
+ if (UpdateOrganizetatus(db, entity.Id, "A"))
+ return 1;
+ break;
+ case "1":
+ if (UpdateOrganizetatus(db, entity.Id, "B"))
+ return 1;
+ break;
+ case "2":
+ if (InsertItem(db, entity))
+ return 1;
+ break;
+ case "3":
+ if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
+ return 1;
+ break;
+ case "4":
+ if (InsertOrUpdate(db, entity))
+ return 1;
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ throw new NotImplementedException("鎿嶄綔澶辫触");
+ }) > 0;
+ }
+
+ public bool SaveList(List<ErpOrganize> Organize)
+ {
+ var list = Organize.Select(GetOrganize).ToList();
+ var groupBy = list.GroupBy(s => s.Type)
+ .ToDictionary(g => g.Key, g => g.ToList());
+
+ return UseTransaction(db =>
+ {
+ foreach (var itemGroup in groupBy)
+ switch (itemGroup.Key)
+ {
+ case "0":
+ if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
+ throw new NotImplementedException("鍚敤澶辫触");
+ break;
+ case "1":
+ if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
+ throw new NotImplementedException("绂佺敤澶辫触");
+ break;
+ case "2":
+ if (!InsertItemBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ break;
+ case "3":
+ if (!DeleteItemBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ break;
+ case "4":
+ if (!InsertOrUpdateBatch(db, itemGroup.Value))
+ throw new NotImplementedException("鍚屾澶辫触");
+ break;
+ default:
+ throw new ArgumentNullException(
+ $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ }
+
+ return 1;
+ }) > 0;
+ }
+
+ private bool UpdateOrganizetatus(SqlSugarScope db, string itemId,
+ string status)
+ {
+ var result = db.Updateable<Organize>()
+ .SetColumns(s => s.Fforbidstatus == status)
+ .Where(s => s.Id == itemId).ExecuteCommand();
+
+ if (result > 0)
+ return true;
+
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ }
+
+ private bool InsertItem(SqlSugarScope db, Organize entity)
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ return true;
+
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ private bool DeleteItem(SqlSugarScope db, decimal itemId)
+ {
+ var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
+ if (deleteById > 0)
+ return true;
+
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ private Organize GetOrganize(ErpOrganize Organize)
+ {
+ return new Organize
+ {
+
+ Id = Organize.Id,
+ Fnumber = Organize.FNumber,
+ Fname = Organize.FName,
+ Fforbidstatus = Organize.FForbidStatus,
+ Type = Organize.Type
+ };
+ }
+
+ private bool UpdateOrganizetatusBatch(SqlSugarScope db,
+ List<Organize> itemList, string status)
+ {
+ var ids = itemList.Select(it => it.Id).ToArray();
+ var result = db.Updateable<Organize>()
+ .SetColumns(s => s.Fforbidstatus == status)
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+
+ if (result > 0)
+ return true;
+
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ }
+
+ private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
+ {
+ var insertRange = db.Insertable(itemList).ExecuteCommand();
+ if (insertRange > 0)
+ return true;
+
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+
+ private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
+ {
+ var ids = itemList.Select(it => it.Id).ToArray();
+ var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
+ if (deleteByIds > 0)
+ return true;
+
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+
+ private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
+ {
+ var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
+ if (exists)
+ {
+ var update = db.Updateable(entity).ExecuteCommand();
+ if (update > 0)
+ return true;
+ }
+ else
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ return true;
+ }
+
+ return false;
+ }
+
+ private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
+ {
+ foreach (var entity in itemList)
+ if (!InsertOrUpdate(db, entity))
+ return false;
+
+ return true;
+ }
+ #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(Organize).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 Organize() { };//娴嬭瘯鍙傛暟
+ var insertArray = new Organize[] { insertData };
+ base.Insert(insertData);//鎻掑叆
+ base.InsertRange(insertArray);//鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
+ base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+
+ /*********鏇存柊*********/
+ var updateData = new Organize() { };//娴嬭瘯鍙傛暟
+ var updateArray = new Organize[] { updateData };//娴嬭瘯鍙傛暟
+ base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ //base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new Organize() { };//娴嬭瘯鍙傛暟
+ 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/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 21efa39..90c1f35 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Castle.Core.Resource;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -117,6 +118,9 @@
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
Depextr4 = department.FForbidStatus,
+ FParentID= department.FParentID,
+ FSubsidiary = department.FSubsidiary,
+ Fumbrella = department.Fumbrella,
Company = "1000",
Factory = "1000"
};
diff --git a/MESApplication.sln.DotSettings.user b/MESApplication.sln.DotSettings.user
deleted file mode 100644
index cbad727..0000000
--- a/MESApplication.sln.DotSettings.user
+++ /dev/null
@@ -1,4 +0,0 @@
-锘�<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
- <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=36d79e87_002Dedbd_002D47c8_002Dab93_002Dc85b87032313/@EntryIndexedValue"><SessionState ContinuousTestingMode="0" Name="瑙ｅ喅鏂规涓殑鎵�鏈夋祴璇�" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
- <Solution />
-</SessionState></s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
new file mode 100644
index 0000000..9496ffa
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -0,0 +1,266 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Dynamic;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using MES.Service.Dto.webApi;
+using MES.Service.service.BasicData;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers
+{
+ [ApiController]
+ [Route("api/[controller]")]
+ public class OrganizeController : ControllerBase
+ {
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly OrganizeManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "Organize";
+
+ private readonly string URL = "http://localhost:10054/api/Organize/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpOrganize unit)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(unit);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(unit);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpOrganize> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ // private OrganizeManager m = new OrganizeManager();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ }
+}
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index df7e028..272876a 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>D:\Workspace\gs\RK_MESApplication\MESApplication\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\Tools\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 c03da3f..83216da 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>D:\Workspace\gs\RK_MESApplication\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-04-10T04:55:31.3963752Z;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>D:\Tools\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2024-08-07T02:32:10.3689256Z||;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 51bc172..d5dc573 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 40c5073..254baba 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 0383e0a..23beb52 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 d0eabea..30d5081 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 e58fd66..c74d56f 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 6aed25f..fb272f7 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 437449f..d83af0b 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 0f10fd0..2ede2b8 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 d0eabea..30d5081 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 4c9c54a..0db718e 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 6aed25f..fb272f7 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 437449f..d83af0b 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 0f10fd0..2ede2b8 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 d0eabea..30d5081 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 4c9c54a..0db718e 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/web.config b/MESApplication/bin/Release/net8.0/publish/web.config
index 4cc5990..00d405f 100644
--- a/MESApplication/bin/Release/net8.0/publish/web.config
+++ b/MESApplication/bin/Release/net8.0/publish/web.config
@@ -8,4 +8,5 @@
<aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
-</configuration>
\ No newline at end of file
+</configuration>
+<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->
\ No newline at end of file
diff --git a/global.json b/global.json
index b5b37b6..6772307 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.0",
+ "version": "8.0.101",
"rollForward": "latestMajor",
"allowPrerelease": false
}
--
Gitblit v1.9.3