diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs new file mode 100644 index 000000000..b95eb57c5 --- /dev/null +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Json; +using Win_in.Sfs.Basedata.Application.Contracts; + +namespace Win_in.Sfs.Wms.Pda.Controllers.BaseDatas; + +/// +/// 字典控制器 +/// +[ApiController] +[Route($"{PdaHostConst.ROOT_ROUTE}split-packing-rec")] +public class SplitPackingRecController : AbpController +{ + private readonly ISplitPackingRecAppService _splitPackingRecApp; + + /// + /// + /// + /// + public SplitPackingRecController(ISplitPackingRecAppService splitPackingRecApp, IOptions options) + { + _splitPackingRecApp = splitPackingRecApp; + var str = options.Value.DefaultDateTimeFormat; + Console.WriteLine(str); + } + + /// + /// 取拆分记录列表 + /// + /// + /// + [HttpPost("get-all")] + public virtual async Task> GetAllListByFilterAsync(SfsBaseDataRequestInputBase input) + { + return await _splitPackingRecApp.GetAllListByFilterAsync(input).ConfigureAwait(false); + } +} diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Labels/InventoryLabelController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Labels/InventoryLabelController.cs index 5f4960978..b7b4718fc 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Labels/InventoryLabelController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Labels/InventoryLabelController.cs @@ -1,4 +1,6 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Inventories; + +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -34,4 +36,31 @@ public class InventoryLabelController : AbpController { return await _labelAppService.GetByCodeAsync(code).ConfigureAwait(false); } + + /// + /// 生成箱码 + /// + /// + /// + /// + [HttpPost("generate-and-create/many/{count}")] + public virtual async Task> GenerateAndCreateManyAsync(InventoryLabelWithoutCodeCreateInput input, int count) + { + return await _labelAppService.GenerateAndCreateManyAsync(input, count).ConfigureAwait(false); + } + + /// + /// EOF系统接口 + /// 插入箱码记录表、插入拆箱记录表 + /// 是客户箱码,不需要LabelDefine + /// + /// + /// + [HttpPost("create-many-no-code-new")] + public virtual async Task> CreateManyByNoCode_NewAsync(List inputs) + { + return await _labelAppService.CreateManyByNoCode_NewAsync(inputs).ConfigureAwait(false); + } + + } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/TransferNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/TransferNoteController.cs index 5aac89ecc..87891bec2 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/TransferNoteController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/TransferNoteController.cs @@ -144,4 +144,16 @@ public class TransferNoteController : AbpController { return await _transferNoteAppService.CreateAsync(input).ConfigureAwait(false); } + + /// + /// 拆箱 + /// + /// + /// + [HttpPost("split-packing")] + public async Task SplitPackingAsync(TransferNoteEditInput transferNoteEditInput) + { + return await _transferNoteAppService.SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false); + } + } diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs index aadf19f0e..4e503bc23 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs @@ -139,7 +139,9 @@ public class InventoryLabelAppService } /// - /// Code需要自己生成 传入 否则无法赋值 完整条码 + /// EOF系统接口 + /// 插入箱码记录表、插入拆箱记录表 + /// 是客户箱码,不需要LabelDefine /// /// ///