Browse Source

添加拆箱

集成Redis
郑勃旭 2 years ago
parent
commit
ca6062e87f
  1. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
  2. 6
      be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
  3. 7
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs
  4. 35
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs
  5. 2
      build/src/docker/publish/conf/settings/appsettings.Development.json

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs

@ -51,7 +51,7 @@ public class TransferNoteConverter : IOutgoingConverter
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
var departmentCode = department == null ? "" : department.Code;
var details = wmsReceipt.Details.Where(r => r.FromLocationErpCode != r.ToLocationErpCode).ToList();
if (details.Count > 0 && wmsReceipt.Type != EnumTransSubType.Transfer_Inside.ToString())
if (details.Count > 0 && (wmsReceipt.Type != EnumTransSubType.Transfer_Inside.ToString()||wmsReceipt.Type!=EnumTransSubType.Transfer_SplitPacking.ToString()))
{
#region 主表
var outgoingToExternal = new OutgoingToExternal()

6
be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs

@ -67,6 +67,12 @@ public enum EnumTransSubType
[Display(Name = "客户库位调拨(客户储位调拨)")]
Transfer_Customer = 3105,
/// <summary>
/// 客户库位调拨(客户储位调拨)
/// </summary>
[Display(Name = "拆箱")]
Transfer_SplitPacking = 3109,
/// <summary>
/// 线边报废
/// </summary>

7
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs

@ -38,4 +38,11 @@ public interface ITransferNoteAppService :
/// <param name="input"></param>
/// <returns></returns>
Task<List<TransferNoteDTO>> CreateManyAsync(List<TransferNoteEditInput> input);
/// <summary>
/// 拆箱
/// </summary>
/// <param name="transferNoteEditInput"></param>
/// <returns></returns>
Task<TransferNoteDTO> SplitPackingAsync(TransferNoteEditInput transferNoteEditInput);
}

35
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs

@ -106,6 +106,18 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
return dictionary;
}
/// <summary>
/// 拆箱
/// </summary>
/// <param name="transferNoteEditInput"></param>
/// <returns></returns>
[HttpPost("split-packing")]
public async Task<TransferNoteDTO> SplitPackingAsync(TransferNoteEditInput transferNoteEditInput)
{
transferNoteEditInput.Type = EnumTransSubType.Transfer_SplitPacking.ToString();
return await CreateAsync(transferNoteEditInput).ConfigureAwait(false);
}
#region 校验
private void CheckLocation(LocationDTO locationDto, TransferNoteDetail detail)
{
@ -116,6 +128,29 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
}
#endregion
/// <summary>
/// 按条件获取拆箱的分页列表
/// request sample
/// {
/// "maxResultCount": 1000,
/// "skipCount": 0,
/// "sorting": "",
/// "condition": { "filters": []}
/// }
/// </summary>
/// <param name="sfsRequestDTO"></param>
/// <param name="includeDetails"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost("get-split-packing-list")]
public virtual async Task<PagedResultDto<TransferNoteDTO>> GetSplitPackingTransferListAsync(
SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
CancellationToken cancellationToken = default)
{
return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_SplitPacking, includeDetails,
cancellationToken).ConfigureAwait(false);
}
/// <summary>
/// 按条件获取线边调拨的分页列表
/// request sample

2
build/src/docker/publish/conf/settings/appsettings.Development.json

@ -114,7 +114,7 @@
"BaseUrl": "http://dev.ccwin-in.com:60083/"
},
"BaseData": {
"BaseUrl": "http://dev.ccwin-in.com:60084/"
"BaseUrl": "http://localhost:59094/"
},
"Default": {
"BaseUrl": "http://dev.ccwin-in.com:60083/"

Loading…
Cancel
Save