diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs index d4a0eed7c..ae34a6679 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs +++ b/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() diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs index 451f73df2..1434da8ce 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs +++ b/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, + /// + /// 客户库位调拨(客户储位调拨) + /// + [Display(Name = "拆箱")] + Transfer_SplitPacking = 3109, + /// /// 线边报废 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs index 2e9379c68..64b8744b3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs @@ -38,4 +38,11 @@ public interface ITransferNoteAppService : /// /// Task> CreateManyAsync(List input); + + /// + /// 拆箱 + /// + /// + /// + Task SplitPackingAsync(TransferNoteEditInput transferNoteEditInput); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index ba964b00d..abffc111b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -106,6 +106,18 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase return dictionary; } + /// + /// 拆箱 + /// + /// + /// + [HttpPost("split-packing")] + public async Task 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 + /// + /// 按条件获取拆箱的分页列表 + /// request sample + /// { + /// "maxResultCount": 1000, + /// "skipCount": 0, + /// "sorting": "", + /// "condition": { "filters": []} + /// } + /// + /// + /// + /// + /// + [HttpPost("get-split-packing-list")] + public virtual async Task> GetSplitPackingTransferListAsync( + SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, + CancellationToken cancellationToken = default) + { + return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_SplitPacking, includeDetails, + cancellationToken).ConfigureAwait(false); + } + /// /// 按条件获取线边调拨的分页列表 /// request sample diff --git a/build/src/docker/publish/conf/settings/appsettings.Development.json b/build/src/docker/publish/conf/settings/appsettings.Development.json index 5a4efcb2d..a1b88ac72 100644 --- a/build/src/docker/publish/conf/settings/appsettings.Development.json +++ b/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/"