From 62070cb4be2e74246645faf4f7921d055fcae0b3 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Fri, 19 Jul 2024 14:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Dy_Exchange.Application/AppBase/ZbxBase.cs |  6 ++++--
 .../Dy_Exchange.Application.csproj                 |  1 +
 .../EntityFrameworkCore/Dy_ExchangeDbContext.cs    | 14 +++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/AppBase/ZbxBase.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/AppBase/ZbxBase.cs
index f388bca6e..0907e9723 100644
--- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/AppBase/ZbxBase.cs
+++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/AppBase/ZbxBase.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Localization;
+using Microsoft.IdentityModel.Tokens;
 using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
 using Volo.Abp;
@@ -191,8 +192,9 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
 		var entity = await GetEntityByIdAsync(id).ConfigureAwait(true);
 
 		//当一条库存的一部分被人修改了 数据无法提交 例如库存10个 修改了其中4个 这时乐观锁就被修改了 会抛出异常
-		if (entity.GetType().GetProperty("ConcurrencyStamp").GetValue(entity).ToString() !=
-			input.GetType().GetProperty("ConcurrencyStamp").GetValue(input).ToString())
+		var tempEntity = (string)entity.GetType().GetProperty("ConcurrencyStamp").GetValue(entity);
+		var tempInput= (string)input.GetType().GetProperty("ConcurrencyStamp").GetValue(input);
+		if (!string.IsNullOrWhiteSpace(tempEntity)&&!string.IsNullOrWhiteSpace(tempInput) &&tempEntity != tempInput)
 		{
 			throw new UserFriendlyException($"您操作的数据已经被修改：\r\n" +
 											$"已经由【{Newtonsoft.Json.JsonConvert.SerializeObject(entity)}】\r\n" +
diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_Exchange.Application.csproj b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_Exchange.Application.csproj
index 1c6d24f6f..f77364ff0 100644
--- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_Exchange.Application.csproj
+++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_Exchange.Application.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NPOI" Version="2.7.1" />
     <PackageReference Include="ValueInjecter" Version="3.2.0" />
     <PackageReference Include="Volo.Abp.Account.Application" Version="7.3.2" />
diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs
index 9f0696d15..31a65a7b0 100644
--- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs
+++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs
@@ -148,7 +148,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<ArchivedOutgoingToExternal>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "ArchivedOutgoingToExternals", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "ArchivedOutgoingToExternal", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -158,7 +158,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<DataExchangeArchivedIncomingFromExternal>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchangeArchivedIncomingFromExternals", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchange_ArchivedIncomingFromExternal", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -168,7 +168,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<DataExchangeArchivedOutgoingFromWm>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchangeArchivedOutgoingFromWms", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchange_ArchivedOutgoingFromWms", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -178,7 +178,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<DataExchangeIncomingFromExternal>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchangeIncomingFromExternals", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchange_IncomingFromExternal", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -188,7 +188,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<DataExchangeMessageReceive>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchangeMessageReceives", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchange_MessageReceive", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -198,7 +198,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<DataExchangeOutgoingFromWm>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchangeOutgoingFromWms", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "DataExchange_OutgoingFromWms", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention(); 
             
 
@@ -218,7 +218,7 @@ public class Dy_ExchangeDbContext :
 
         builder.Entity<OutgoingToExternal>(b =>
         {
-            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "OutgoingToExternals", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
+            b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "OutgoingToExternal", Dy_ExchangeConsts.DbSchema, table => table.HasComment(""));
             b.ConfigureByConvention();