From 9f48ea7bf644984ba16461c29bc06ee4656aff98 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 19 Jul 2024 15:28:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemGuideBooks/DTOs/ItemGuideBookDTO.cs | 6 +++--- .../PositionCodes/PositionCodeAppService.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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}的信息 "); } From da9ca4f16f37ca8abc68c93f11b6c09ce9068913 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 19 Jul 2024 15:51:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs | 2 +- .../Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs | 2 +- .../Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs | 2 +- .../Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs | 2 +- .../Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs | 2 +- 5 files changed, 5 insertions(+), 5 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 5712ab4a2..a185d2dab 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,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} 处理"); } 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..33f9c055b 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,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} 处理"); } 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..961e7031f 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,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} 处理"); } 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..29f8d0d8b 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,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} 处理"); } 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..e697c5873 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 @@ -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} 处理"); } From 726e6d55a38e3a5febb89f8d53e81e2b49568968 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 19 Jul 2024 15:55:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8C=87?= =?UTF-8?q?=E5=AF=BC=E4=B9=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs | 1 - 1 file changed, 1 deletion(-) 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() From 41a3ad1cbc4232bca27796f1c905fcc64fa49eff Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 19 Jul 2024 16:42:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=BF=E6=8E=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=89=8D=E7=AB=AF=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/IssueJobs/AssembleIssueJobsController.cs | 12 ++++-------- .../Jobs/IssueJobs/CoatingIssueJobsController.cs | 12 ++++-------- .../Jobs/IssueJobs/InjectionIssueJobsController.cs | 12 ++++-------- .../Jobs/IssueJobs/KittingIssueJobsController.cs | 11 +++-------- .../Jobs/IssueJobs/SparePartIssueJobsController.cs | 11 +++-------- 5 files changed, 18 insertions(+), 40 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 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; }