Browse Source

取消承接校验,前端隐藏提交按钮

dev_DY_CC
周红军 10 months ago
parent
commit
41a3ad1cbc
  1. 12
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs
  2. 12
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs
  3. 12
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs
  4. 11
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs
  5. 11
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs

12
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;
}

12
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;
}

12
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;
}

11
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;
}

11
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;
}

Loading…
Cancel
Save