Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

10 months ago · b35698ee49
8 changed files with 17 additions and 14 deletions
--- 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" +
--- 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" />
--- 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(); 
            

--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
@ -175,7 +175,7 @@ public class AssembleIssueJobsController : AbpController
        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
        //}

-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
        {
            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
        }
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
@ -175,7 +175,7 @@ public class CoatingIssueJobsController : AbpController
        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
        //}

-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
        {
            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
        }
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
@ -175,7 +175,7 @@ public class InjectionIssueJobsController : AbpController
        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
        //}

-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
        {
            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
        }
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
@ -175,7 +175,7 @@ public class KittingIssueJobsController : AbpController
        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
        //}

-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
        {
            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
        }
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs
@ -175,7 +175,7 @@ public class SparePartIssueJobsController : AbpController
        //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
        //}

-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
        {
            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
        }