Browse Source

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

dev_DY_CC
赵新宇 11 months ago
parent
commit
1edd2d6752
  1. 1
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs
  2. 53
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/ThirdLocationRequestController.cs
  3. 17
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs
  4. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/DTOs/ThirdLocationJobDetailDTO.cs
  5. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/Inputs/ThirdLocationJobDetailInput.cs
  6. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs
  7. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs
  8. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAutoMapperProfile.cs
  9. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobDetail.cs
  10. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs
  11. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ThirdLocationJobs/ThirdLocationJobDbContextModelCreatingExtensions.cs
  12. 34515
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240523074246_Update_SingleCode.Designer.cs
  13. 35
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240523074246_Update_SingleCode.cs
  14. 34515
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240524003508_Update_SingleCodeJob.Designer.cs
  15. 25
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240524003508_Update_SingleCodeJob.cs
  16. 24
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs
  17. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs
  18. 5
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/ThirdLocationRequestAutoMapperProfile.cs
  19. 22
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs
  20. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs

1
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs

@ -52,7 +52,6 @@ public class ThirdLocationJobController : AbpController
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("{id}")]
public virtual async Task<ActionResult<ThirdLocationJobDTO>> GetAsync(Guid id)
{
var result = await _thirdLocationJobAppService.GetAsync(id).ConfigureAwait(false);

53
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/ThirdLocationRequestController.cs

@ -1,7 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text.Json;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Application.Contracts;
namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
@ -25,6 +30,18 @@ public class ThirdLocationRequestController : AbpController
_thirdLocationRequestAppService = ThirdLocationRequestAppService;
}
/// <summary>
/// 获取申请详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("{id}")]
public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetAsync(Guid id)
{
var result = await _thirdLocationRequestAppService.GetAsync(id).ConfigureAwait(false);
return Ok(result);
}
/// <summary>
/// 三方库库移申请
/// </summary>
@ -41,14 +58,46 @@ public class ThirdLocationRequestController : AbpController
/// </summary>
/// <param name="number"></param>
/// <returns></returns>
[HttpGet("{number}")]
[HttpGet("get/{number}")]
public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetAsync(string number)
public virtual async Task<ActionResult<ThirdLocationRequestDTO>> GetRequestByNumberAsync(string number)
{
var result = await _thirdLocationRequestAppService.GetByNumberAsync(number).ConfigureAwait(false);
return Ok(result);
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="pageSize"></param>
/// <param name="pageIndex"></param>
/// <returns></returns>
[HttpGet("list")]
public virtual async Task<PagedResultDto<ThirdLocationRequestDTO>> GetListAsync(int pageSize, int pageIndex)
{
var status = new List<int>() { (int)EnumRequestStatus.Handling, (int)EnumRequestStatus.Partial };
var jsonStatus = JsonSerializer.Serialize(status);
var request = new SfsStoreRequestInputBase
{
MaxResultCount = pageSize,
SkipCount = (pageIndex - 1) * pageSize,
Sorting = $"{nameof(ThirdLocationRequestDTO.CreationTime)} ASC",
Condition = new Condition
{
Filters = new List<Filter>
{
new(nameof(ThirdLocationRequestDTO.RequestStatus),jsonStatus,"In")
}
}
};
var list = await _thirdLocationRequestAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
return list;
}
/// <summary>
/// 取消三方库请求
/// </summary>

17
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs

@ -107,10 +107,11 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
public async Task<List<SplitPackingRec>> GetListByToPackingCode(List<string> toPackingCodeList)
{
List<SplitPackingRec> ret = new List<SplitPackingRec>();
List<SplitPackingRec> lst = await _repository.GetListAsync(
itm => toPackingCodeList.Contains(itm.ToPackingCode)
&& itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox
//按to箱码分组,取最后一条记录
foreach (string toCode in toPackingCodeList)
{
var obj = lst.Where(itm => itm.ToPackingCode == toCode)
@ -152,9 +153,10 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
public async Task<List<SplitPackingRec>> GetListByFromPackingCode(List<string> fromPackingCodeList)
{
List<SplitPackingRec> ret = new List<SplitPackingRec>();
List<SplitPackingRec> lst = await _repository.GetListAsync(
itm => fromPackingCodeList.Contains(itm.FromPackingCode)
&& itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox
foreach (string fromCode in fromPackingCodeList)
{
@ -174,11 +176,14 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
/// <returns></returns>
public async Task<SplitPackingRec> GetTopPackingCode(string packingCode)
{
SplitPackingRec entity = new SplitPackingRec();
SplitPackingRec item = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
if (item != null)
SplitPackingRec entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
if (entity == null)
{
entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.Other).ConfigureAwait(false);
if (entity == null)
{
entity = new SplitPackingRec();
}
}
return entity;
}

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/DTOs/ThirdLocationJobDetailDTO.cs

@ -63,10 +63,10 @@ public class ThirdLocationJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasT
public string SingleCodeJob { get; set; }
/// <summary>
/// 工作中心
/// 申请单件码
/// </summary>
[Display(Name = "工作中心")]
public string WorkStation { get; set; }
[Display(Name = "申请单件码")]
public string SingleCodeRequest { get; set; }
/// <summary>
/// 过期时间

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/Inputs/ThirdLocationJobDetailInput.cs

@ -71,14 +71,14 @@ public class ThirdLocationJobDetailInput : SfsJobRecommendFromDetailInputBase, I
/// </summary>
[Display(Name = "收货单件码")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string SingleCodeJob { get; set; }
public string SingleCodeJob { get; set; }
/// <summary>
/// 工作中心
/// 申请单件码
/// </summary>
[Display(Name = "工作中心")]
[Display(Name = "申请单件码")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string WorkStation { get; set; }
public string SingleCodeRequest { get; set; }
/// <summary>
/// 过期时间

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs

@ -58,9 +58,9 @@ public class ThirdLocationJobAppService
{
var jobDetail= job.Details.FirstOrDefault(p => p.ItemCode == dto.Details[0].ItemCode);
if (jobDetail.HandledQty + dto.Details[0].HandledQty > jobDetail.RecommendQty)
if (dto.Details[0].HandledQty > jobDetail.RecommendQty)
{
throw new UserFriendlyException($"任务错误:编号为【{job.Number}】的实际数量【{jobDetail.HandledQty + dto.Details[0].HandledQty}】不能大于申请数量【{dto.Details[0].RecommendQty}】");
throw new UserFriendlyException($"任务错误:编号为【{job.Number}】的实际数量【{dto.Details[0].HandledQty}】不能大于推荐数量【{dto.Details[0].RecommendQty}】");
}
if (jobDetail.ToLocationCode != dto.Details[0].ToLocationCode)
{

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs

@ -163,9 +163,9 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
throw new UserFriendlyException($"{detailInput.ItemCode} 物品的库存为 {realityBalance} ,库存不够");
}
//detailInput.ProdLine = detailInput.ToLocationCode;
detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
detailInput.IssuedQty = detailInput.Qty;
}
@ -188,6 +188,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
detail.ItemName = itemBasicDto.Name;
detail.Uom = itemBasicDto.BasicUom;
detail.StdPackQty = itemBasicDto.StdPackQty;
detail.IssuedQty = detail.Qty;
}
var result = await _thirdLocationRequestManager.CreateAsync(entity).ConfigureAwait(false);

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAutoMapperProfile.cs

@ -19,6 +19,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
CreateMap<ThirdLocationRequestDetailInput, ThirdLocationRequestDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.ToLocationArea)
.Ignore(x => x.IssuedQty)
.Ignore(x => x.ToLocationGroup)
.Ignore(x => x.ToWarehouseCode)
.Ignore(x => x.MasterID)

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobDetail.cs

@ -52,9 +52,9 @@ public class ThirdLocationJobDetail : SfsJobRecommendFromDetailEntityBase, IHasT
public string SingleCodeJob { get; set; }
/// <summary>
/// 工作中心
/// 申请单件码
/// </summary>
public string WorkStation { get; set; }
public string SingleCodeRequest { get; set; }
/// <summary>
/// 过期时间

21
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs

@ -50,14 +50,29 @@ public class ThirdLocationJobManager : SfsJobManagerBase<ThirdLocationJob, Third
bool isDone = false;
var jobDetail = entity.Details.FirstOrDefault(p => p.ItemCode == entity.Details[0].ItemCode);
if (jobDetail.RecommendQty == jobDetail.HandledQty + input.Details[0].HandledQty)
//if (jobDetail.RecommendQty == jobDetail.HandledQty + input.Details[0].HandledQty)
//{
// jobDetail.HandledQty += input.Details[0].HandledQty;
// isDone = true;
//}
//else
//{
// jobDetail.HandledQty = input.Details[0].HandledQty;
// isDone = false;
//}
if (jobDetail.RecommendQty == input.Details[0].HandledQty)
{
jobDetail.HandledQty += input.Details[0].HandledQty;
jobDetail.HandledQty += input.Details[0].HandledQty;
jobDetail.RecommendQty= jobDetail.RecommendQty- input.Details[0].HandledQty;
jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob;
isDone = true;
}
else
{
jobDetail.HandledQty = input.Details[0].HandledQty;
jobDetail.HandledQty += input.Details[0].HandledQty;
jobDetail.RecommendQty = jobDetail.RecommendQty - input.Details[0].HandledQty;
jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob;
isDone = false;
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/ThirdLocationJobs/ThirdLocationJobDbContextModelCreatingExtensions.cs

@ -51,7 +51,7 @@ public static class ThirdLocationJobDbContextModelCreatingExtensions
b.Property(q => q.FromLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.FromLocationArea).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.SingleCodeJob).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.WorkStation).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.SingleCodeRequest).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.Operation).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.DistributionType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
b.Property(q => q.TruncType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();

34515
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240523074246_Update_SingleCode.Designer.cs

File diff suppressed because it is too large

35
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240523074246_Update_SingleCode.cs

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Win_in.Sfs.Wms.Store.Migrations
{
public partial class Update_SingleCode : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "ProdLine",
table: "Store_ThirdLocationRequestDetail",
newName: "SingleCodeRequest");
migrationBuilder.RenameColumn(
name: "ProdLine",
table: "Job_ThirdLocationJobDetail",
newName: "SingleCodeJob");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "SingleCodeRequest",
table: "Store_ThirdLocationRequestDetail",
newName: "ProdLine");
migrationBuilder.RenameColumn(
name: "SingleCodeJob",
table: "Job_ThirdLocationJobDetail",
newName: "ProdLine");
}
}
}

34515
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240524003508_Update_SingleCodeJob.Designer.cs

File diff suppressed because it is too large

25
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240524003508_Update_SingleCodeJob.cs

@ -0,0 +1,25 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Win_in.Sfs.Wms.Store.Migrations
{
public partial class Update_SingleCodeJob : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "WorkStation",
table: "Job_ThirdLocationJobDetail",
newName: "SingleCodeRequest");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "SingleCodeRequest",
table: "Job_ThirdLocationJobDetail",
newName: "WorkStation");
}
}
}

24
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@ -27238,10 +27238,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<DateTime>("RecommendArriveDate")
.HasColumnType("datetime2");
@ -27312,6 +27308,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<decimal>("RoundedQty")
.HasColumnType("decimal(18,6)");
b.Property<string>("SingleCodeJob")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SingleCodeRequest")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(64)
@ -27352,10 +27356,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<string>("Uom")
.HasColumnType("nvarchar(max)");
b.Property<string>("WorkStation")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.HasKey("Id");
b.HasIndex("MasterID");
@ -27943,10 +27943,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("ProdLine")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<decimal>("Qty")
.HasPrecision(18, 6)
.HasColumnType("decimal(18,6)")
@ -27966,6 +27962,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasColumnType("nvarchar(3072)")
.HasColumnName("Remark");
b.Property<string>("SingleCodeRequest")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<decimal>("StdPackQty")
.HasColumnType("decimal(18,6)");

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs

@ -45,6 +45,7 @@ public partial class StoreEventAutoMapperProfile : Profile
.ForMember(x => x.ToLocationCode, y => y.MapFrom(d => d.ToLocationCode))
.Ignore(x => x.ToLocationArea)
.Ignore(x => x.ProdLine)
.Ignore(x => x.WorkStation)
.Ignore(x => x.ToLocationGroup)
.Ignore(x => x.ToLocationErpCode)
;
@ -89,6 +90,7 @@ public partial class StoreEventAutoMapperProfile : Profile
.ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
.ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
.Ignore(x => x.ProdLine)
.Ignore(x => x.WorkStation)
;
}
}

5
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/ThirdLocationRequestAutoMapperProfile.cs

@ -61,6 +61,7 @@ public partial class StoreEventAutoMapperProfile : Profile
CreateMap<ThirdLocationRequestDetail, ThirdLocationJobDetailInput>()
.ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.FromLocationCode))
.ForMember(x => x.SingleCodeRequest, y => y.MapFrom(d => d.SingleCodeRequest))
.Ignore(x => x.SingleCodeJob)
.Ignore(x => x.RecommendFromLocationArea)
.Ignore(x => x.RecommendFromLocationGroup)
@ -128,7 +129,7 @@ public partial class StoreEventAutoMapperProfile : Profile
.Ignore(x => x.FromLocationCode)
.Ignore(x => x.ToLocationCode)
.Ignore(x => x.SingleCodeJob)
.Ignore(x => x.WorkStation)
.Ignore(x => x.SingleCodeRequest)
.Ignore(x => x.HandledContainerCode)
.Ignore(x => x.HandledExpireDate)
.Ignore(x => x.HandledFromLocationCode)
@ -152,7 +153,7 @@ public partial class StoreEventAutoMapperProfile : Profile
.Ignore(x => x.FromLocationCode)
.Ignore(x => x.ToLocationCode)
.Ignore(x => x.SingleCodeJob)
.Ignore(x => x.WorkStation)
.Ignore(x => x.SingleCodeRequest)
.Ignore(x => x.PositionCode)
.Ignore(x => x.RecommendType)
.Ignore(x => x.FromLocationArea)

22
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ThirdLocationRequestEventHandler.cs

@ -98,16 +98,16 @@ public class ThirdLocationRequestEventHandler
if (thirdLocationJobs.Any())
{
await _thirdLocationJobAppService.CreateManyAsync(thirdLocationJobs).ConfigureAwait(false);
}
//来源库位更新为在途库位
var transferLogs = new List<TransferLogEditInput>();
var route = entity.UseOnTheWayLocation
? EnumTransferRoute.SourceToOnTheWay
: EnumTransferRoute.SourceToDestination;
transferLogs.AddRange(await BuildTransferLogsAsync(entity, route).ConfigureAwait(false));
//来源库位更新为在途库位
var transferLogs = new List<TransferLogEditInput>();
var route = entity.UseOnTheWayLocation
? EnumTransferRoute.SourceToOnTheWay
: EnumTransferRoute.SourceToDestination;
transferLogs.AddRange(await BuildTransferLogsAsync(entity, route).ConfigureAwait(false));
await _transferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
await _transferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
}
}
@ -292,8 +292,8 @@ public class ThirdLocationRequestEventHandler
var toLocationCodes = thirdLocationRequest.Details.Select(p => p.ToLocationCode).Distinct().ToList();//所有发送库位的集合
var toLocations = await _locationAppService.GetByCodesAsync(toLocationCodes).ConfigureAwait(false);//所有库位的集合
var thirdLocationRequestDetails = thirdLocationRequest.Details.Where(p => p.ToBeIssuedQty > 0);//所有还没发送物品的集合
foreach (var thirdLocationRequestDetail in thirdLocationRequestDetails)//如果有还有剩余未叫料的数量 则创建新的任务
var thirdLocationRequestDetails = thirdLocationRequest.Details;
foreach (var thirdLocationRequestDetail in thirdLocationRequestDetails)
{
var toLocation = toLocations.FirstOrDefault(p => p.Code == thirdLocationRequestDetail.ToLocationCode);//判断目标库位是否存在
Check.NotNull(toLocation, "库位代码", $"库位 {thirdLocationRequestDetail.ToLocationCode} 不存在");
@ -384,7 +384,7 @@ public class ThirdLocationRequestEventHandler
var detail = ObjectMapper.Map<BalanceDTO, ThirdLocationJobDetailInput>(balance);
detail.WorkStation = thirdLocationRequestDetail.WorkStation;
detail.SingleCodeRequest = thirdLocationRequestDetail.SingleCodeRequest;
detail.ExpiredTime = thirdLocationRequestDetail.ExpiredTime;
detail.PositionCode = thirdLocationRequestDetail.PositionCode;
detail.RecommendType = thirdLocationRequestDetail.RecommendType;

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs

@ -82,6 +82,7 @@ public class ThirdLocationNoteEventHandler
}
else
{
requestEntities[0].RequestStatus = EnumRequestStatus.Partial;
await _thirdLocationRequestManager.UpdateAsync(requestEntities[0]).ConfigureAwait(false);
}

Loading…
Cancel
Save