From fa6e2b6d098a0451054b72c897452a7c5c49fdf9 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Mon, 15 Jul 2024 13:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AB=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs | 4 ++--
 .../Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs  | 4 ++--
 .../Jobs/IssueJobs/InjectionIssueJobsController.cs            | 4 ++--
 .../Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs  | 4 ++--
 .../Jobs/IssueJobs/SparePartIssueJobsController.cs            | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git 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
index 82750ac6a..5712ab4a2 100644
--- 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,9 +175,9 @@ public class AssembleIssueJobsController : AbpController
         //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
         //}
 
-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
         {
-            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
         }
 
         return jobDto;
diff --git 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
index cf7f0d047..582f7ab95 100644
--- 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,9 +175,9 @@ public class CoatingIssueJobsController : AbpController
         //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
         //}
 
-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
         {
-            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
         }
 
         return jobDto;
diff --git 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
index 59ab445ea..e154c8f72 100644
--- 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,9 +175,9 @@ public class InjectionIssueJobsController : AbpController
         //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
         //}
 
-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
         {
-            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
         }
 
         return jobDto;
diff --git 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
index 799e9e24b..52fe17b01 100644
--- 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,9 +175,9 @@ public class KittingIssueJobsController : AbpController
         //    return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
         //}
 
-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
         {
-            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
         }
 
         return jobDto;
diff --git 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
index 23e5fe456..f9642b25b 100644
--- 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
@@ -174,9 +174,9 @@ public class SparePartIssueJobsController : AbpController
             return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
         }
 
-        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString())
         {
-            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+            return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理");
         }
 
         return jobDto;