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 5712ab4a2..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()) - { - 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 582f7ab95..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()) - { - 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 e154c8f72..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()) - { - 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 52fe17b01..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()) - { - 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 6c04f28ce..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()) - { - return new NotFoundObjectResult($"任务正在被 {jobDto.ClaimsUserName} 处理"); - } - return jobDto; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs index d77f6c514..0c2e27a78 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs @@ -16,18 +16,18 @@ public class ItemGuideBookDTO : SfsBaseDataDTOBase /// 物品名称 /// [Display(Name = "物品名称")] - public string ItemName { get; set; } + public string Name { get; set; } /// /// 物品描述1 /// [Display(Name = "物品描述1")] - public string ItemDesc1 { get; set; } + public string Desc1 { get; set; } /// /// 物品描述2 /// [Display(Name = "物品描述2")] - public string ItemDesc2 { get; set; } + public string Desc2 { get; set; } /// /// 步骤 /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs index b247733c3..476949b26 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs @@ -10,7 +10,6 @@ public partial class BasedataApplicationAutoMapperProfile : Profile private void ItemGuideBookAutoMapperProfile() { CreateMap() - .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2) .ReverseMap(); CreateMap() diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs index f6b6676e6..20054baf3 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs @@ -96,7 +96,7 @@ public class PositionCodeAppService throw new UserFriendlyException($"{id} 未找到位置码信息"); } var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code==input.Code).ConfigureAwait(false); - if (itemEntity != null) + if (itemEntity != null&& itemEntity.Id!= id) { throw new UserFriendlyException($"位置码{input.Code}已存在物品{input.PartCode}的信息 "); }