Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
郑勃旭 10 months ago
parent
commit
e542b6ae14
  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
  6. 6
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs
  7. 1
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs
  8. 2
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.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} 的任务"); 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; 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} 的任务"); 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; 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} 的任务"); 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; 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} 的任务"); throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
} }
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
//if (!wlgCodes.Contains(jobDto.WorkGroupCode))
//{ //{
// 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; 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} 的任务"); throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
} }
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); //if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString() && jobDto.IsClaims)
//if (!wlgCodes.Contains(jobDto.WorkGroupCode))
//{ //{
// 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; return jobDto;
} }

6
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs

@ -16,18 +16,18 @@ public class ItemGuideBookDTO : SfsBaseDataDTOBase
/// 物品名称 /// 物品名称
/// </summary> /// </summary>
[Display(Name = "物品名称")] [Display(Name = "物品名称")]
public string ItemName { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 物品描述1 /// 物品描述1
/// </summary> /// </summary>
[Display(Name = "物品描述1")] [Display(Name = "物品描述1")]
public string ItemDesc1 { get; set; } public string Desc1 { get; set; }
/// <summary> /// <summary>
/// 物品描述2 /// 物品描述2
/// </summary> /// </summary>
[Display(Name = "物品描述2")] [Display(Name = "物品描述2")]
public string ItemDesc2 { get; set; } public string Desc2 { get; set; }
/// <summary> /// <summary>
/// 步骤 /// 步骤
/// </summary> /// </summary>

1
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs

@ -10,7 +10,6 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
private void ItemGuideBookAutoMapperProfile() private void ItemGuideBookAutoMapperProfile()
{ {
CreateMap<ItemGuideBook, ItemGuideBookDTO>() CreateMap<ItemGuideBook, ItemGuideBookDTO>()
.Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2)
.ReverseMap(); .ReverseMap();
CreateMap<ItemGuideBookImportInput, ItemGuideBook>() CreateMap<ItemGuideBookImportInput, ItemGuideBook>()

2
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs

@ -96,7 +96,7 @@ public class PositionCodeAppService
throw new UserFriendlyException($"{id} 未找到位置码信息"); throw new UserFriendlyException($"{id} 未找到位置码信息");
} }
var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code==input.Code).ConfigureAwait(false); 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}的信息 "); throw new UserFriendlyException($"位置码{input.Code}已存在物品{input.PartCode}的信息 ");
} }

Loading…
Cancel
Save