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 a185d2dab..d9a2a3487 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 @@ -169,17 +169,13 @@ public class AssembleIssueJobsController : AbpController throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } - //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + + + //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) //{ - // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + // return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); //} - if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) - { - 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 33f9c055b..3ef708283 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 @@ -169,17 +169,13 @@ public class CoatingIssueJobsController : AbpController throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } - //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + + + //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) //{ - // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + // return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); //} - if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) - { - 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 961e7031f..80044277c 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 @@ -169,17 +169,13 @@ public class InjectionIssueJobsController : AbpController throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } - //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + + + //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) //{ - // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + // return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); //} - if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) - { - 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 29f8d0d8b..a9b46de89 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 @@ -168,18 +168,13 @@ public class KittingIssueJobsController : AbpController { throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } + - //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) //{ - // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + // return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); //} - if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) - { - 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 e697c5873..e2ddfe366 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 @@ -168,18 +168,13 @@ public class SparePartIssueJobsController : AbpController { throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } + - //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) //{ - // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + // return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); //} - if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims) - { - return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); - } - return jobDto; }