From a74a851db99cbaa0d61aee65496933971109e37f Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Thu, 2 Jan 2025 15:48:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=8B=86=E7=AE=B1?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SplitPackingRecAppService.cs | 3 +- .../Enums/Inventory/EnumTransSubType.cs | 2 +- .../DTOs/IntegrationPackingNoteDTO.cs | 6 + .../DTOs/IntegrationPackingNoteDetailDTO.cs | 6 + .../IntegrationPackingNoteDetailInput.cs | 12 +- .../Inputs/IntegrationPackingNoteEditInput.cs | 6 + .../IntegrationPackingNoteImportInput.cs | 6 + .../Jobs/InspectJobs/InspectJobAppService.cs | 72 ------- .../IntegrationPackingNoteAppService.cs | 197 ++++++++++++++++-- .../TransferNotes/TransferNoteAppService.cs | 9 - .../InspectRequestAppService.cs | 50 ----- .../IntegrationPackingNote.cs | 6 + 12 files changed, 215 insertions(+), 160 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs index a280684f7..48174342f 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs @@ -34,6 +34,7 @@ public class SplitPackingRecAppService : base.DeletePolicyName = StdCostPriceSheetPermissions.Delete; _splitPackingRecManager = splitPackingRecManager; } + [HttpPost("batch-insert")] public async Task BatchInsertAsync(List inputs) { @@ -65,8 +66,6 @@ public class SplitPackingRecAppService : SplitPackingRecDTO dto = ObjectMapper.Map(entity); return dto; } - - /// /// 取每个目标箱码的最后一条拆箱记录 /// 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 816d2795c..fef00ed7b 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 @@ -85,7 +85,7 @@ public enum EnumTransSubType Transfer_Assemble = 3108, /// - /// 客户库位调拨(客户储位调拨) + /// 拆箱 /// [Display(Name = "拆箱")] Transfer_SplitPacking = 3109, diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDTO.cs index 452d45b64..31c9b3196 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDTO.cs @@ -94,6 +94,12 @@ public class IntegrationPackingNoteDTO : SfsStoreDTOBase + /// 仓库代码 + /// + [Display(Name = "仓库代码")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDetailDTO.cs index 37d574d03..47fe43e7a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/DTOs/IntegrationPackingNoteDetailDTO.cs @@ -93,6 +93,12 @@ public class IntegrationPackingNoteDetailDTO : SfsDetailDTOBase [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 仓库代码 + /// + [Display(Name = "仓库代码")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs index e42db5593..6e2dc6559 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs @@ -15,12 +15,6 @@ public class IntegrationPackingNoteDetailInput : SfsDetailInputBase [Display(Name = "单号")] public string Number { get; set; } - /// - /// 单号 - /// - [Display(Name = "单号")] - public string WarehouseCode { get; set; } - #region 物品基础信息 /// @@ -105,6 +99,12 @@ public class IntegrationPackingNoteDetailInput : SfsDetailInputBase [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 仓库代码 + /// + [Display(Name = "仓库代码")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs index d3efb107f..54dc56cbc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs @@ -98,6 +98,12 @@ public class IntegrationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 仓库代码 + /// + [Display(Name = "仓库代码")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteImportInput.cs index 2548927d0..31df822d6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteImportInput.cs @@ -91,6 +91,12 @@ public class IntegrationPackingNoteImportInput : SfsStoreImportInputBase [Display(Name = "数量")] public decimal Qty { get; set; } + /// + /// 仓库代码 + /// + [Display(Name = "仓库代码")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs index d98040ce0..d834639a1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs @@ -250,76 +250,4 @@ public class InspectJobAppService var ret = ObjectMapper.Map(entity); return ret; } - - - //[HttpPost("pick-inspect")] - //public virtual async Task AddPickInspectJobAsync(InspectJobCreateInput input) - //{ - // var entity = ObjectMapper.Map(input); - - // await _inspectJobManager.AddPickInspectJobAsync(entity); - //} - - //[HttpPost("inspect-job-create-test")] - //public virtual async Task CreateTest(InspectRequestInputN inspectJobCreateInput) - //{ - // await _inspectJobManager.AddAsync(inspectJobCreateInput); - //} - - /* - /// - /// - /// - /// - /// - [HttpPost("accept")] - public override async Task AcceptAsync(string jobNumber) - { - var input = new InspectJobCheckInput - { - JobStatuses = new List() { EnumJobStatus.New }, - }; - var dto = await CheckAsync(jobNumber, input); - await _inspectJobManager.AcceptAsync(dto.Id, CurrentUser.Id ?? Guid.Empty); - - } - - /// - /// 执行任务时，修改实际数量 - /// - /// - /// - - [HttpPost("handle")] - public override async Task HandleAsync(InspectJobDTO dto) - { - var input = new InspectJobCheckInput - { - JobStatuses = new List() { EnumJobStatus.Pending }, - }; - - await CheckAsync(dto.Number, input); - - var entity = ObjectMapper.Map(dto); - await _inspectJobManager.HandleAsync(entity, CurrentUser.Id ?? Guid.Empty); - } - - [HttpPost("check")] - public override async Task CheckAsync(string jobNumber, InspectJobCheckInput input) - { - var result = new AbpValidationResult(); - _inspectJobManager.CheckFormat(jobNumber); - var dto = await GetByNumberAsync(jobNumber); - var entity = ObjectMapper.Map(dto); - _inspectJobManager.CheckJobStatus(entity, input.JobStatuses, result); - _inspectJobManager.CheckDetails(entity, result); - //TODO 添加其它校验 - if (result.Errors.Any()) - { - throw new AbpValidationException(result.Errors); - } - - return dto; - } - */ } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs index 974fd5326..128825d74 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs @@ -4,11 +4,18 @@ using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Volo.Abp; using Volo.Abp.ObjectMapping; +using Win_in.Sfs.Basedata; +using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Basedata.Domain.Shared; +using Win_in.Sfs.Label.Application.Contracts; +using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Wms.Inventory.Application.Contracts; using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Domain.Shared; +using LabelStatus = Win_in.Sfs.Label.Domain.Shared.LabelStatus; namespace Win_in.Sfs.Wms.Store.Application; @@ -32,48 +39,198 @@ public class IntegrationPackingNoteAppService : { private readonly IIntegrationPackingNoteManager _integrationPackingNoteManager; private readonly IBalanceAppService _balanceAppService; + private readonly ILocationAppService _locationAppService; + private readonly ISplitPackingRecAppService _splitPackingRecAppService; + private readonly IInventoryLabelAppService _inventoryLabelAppService; + private readonly ITransferLogAppService _transferLogAppService; + private readonly IExpectOutAppService _expectOutAppService; public IntegrationPackingNoteAppService( IIntegrationPackingNoteRepository repository, - IIntegrationPackingNoteManager integrationPackingNoteManager, IBalanceAppService balanceAppService) : base(repository) + IIntegrationPackingNoteManager integrationPackingNoteManager, + IBalanceAppService balanceAppService, + ILocationAppService locationAppService, + ISplitPackingRecAppService splitPackingRecAppService, + IInventoryLabelAppService inventoryLabelAppService, ITransferLogAppService transferLogAppService, + IExpectOutAppService expectOutAppService) : base(repository) { _integrationPackingNoteManager = integrationPackingNoteManager; _balanceAppService = balanceAppService; + _locationAppService = locationAppService; + _splitPackingRecAppService = splitPackingRecAppService; + _inventoryLabelAppService = inventoryLabelAppService; + _transferLogAppService = transferLogAppService; + _expectOutAppService = expectOutAppService; } [HttpPost("")] - public override Task CreateAsync(IntegrationPackingNoteEditInput input) + public override async Task CreateAsync(IntegrationPackingNoteEditInput input) { - //标签记录 + var transferLogEditInputs = new List(); + var outDtos=await _expectOutAppService.GetListByPackingCodeAsync(input.PackingCode).ConfigureAwait(false); + if (outDtos.Any()) + { + throw new UserFriendlyException($"此物料已经被【任务编号：{outDtos.First().JobNumber}】占用"); + } - //库存移动 + foreach (var detailInput in input.Details) + { + //标签记录 + var splitPackingRecDtos = await _splitPackingRecAppService.GetListByToPackingCode(new List { input.PackingCode }).ConfigureAwait(false); + var splitPackingRecDto = splitPackingRecDtos.First(); + var inventoryLabelWithoutCodeCreateInput = new InventoryLabelWithoutCodeCreateInput + { + Qty = detailInput.Qty, ItemCode = detailInput.ItemCode, + SupplierCode = detailInput.SupplierCode, + Lot = detailInput.Lot, + Uom = detailInput.Uom, + LocationErpCode = detailInput.LocationErpCode, + ItemDesc1 = detailInput.ItemDesc1, + ArriveDate = detailInput.ArriveDate, + StdPackQty = detailInput.StdPackQty, + ProdLine = string.Empty, + AsnNumber = detailInput.PurchaseInfo_AsnNumber, + ContainerCode = detailInput.ContainerCode, + ExpireDate = detailInput.ExpireDate, + FullBarcodeString = string.Empty, + ItemDesc2 = detailInput.ItemDesc2, + ItemName = detailInput.ItemName, + SupplierName = detailInput.SupplierName, + Remark = detailInput.Remark, + LabelStatus = LabelStatus.Enable, + LabelType = detailInput.LabelType, + PlanArriveDate = detailInput.PlanArriveDate, + PoNumber = detailInput.PurchaseInfo_PoNumber, + ProduceDate = detailInput.ProduceDate, + QLevel = string.Empty, + QualityFile = string.Empty, + RecommendLocationCode = detailInput.RecommendLocationCode, + RpNumber = detailInput.RpNumber, + Shift = string.Empty, + Specifications = string.Empty, + SupplierBatch = detailInput.SupplierBatch, + SupplierItemCode = detailInput.ItemCode, + SupplierItemName = detailInput.SupplierItemName, + SupplierSimpleName = detailInput.SupplierSimpleName, + Team = string.Empty, + }; + var inventoryLabelDto=await _inventoryLabelAppService.GenerateAndCreateAsync(inventoryLabelWithoutCodeCreateInput).ConfigureAwait(false); + var splitPackingRecEditInputs = new List() + { + new SplitPackingRecEditInput() + { + ItemCode = inventoryLabelDto.ItemCode, + SupplierCode = inventoryLabelDto.SupplierCode, + ToPackingCode = inventoryLabelDto.Code, + FromPackingCode = input.PackingCode, + LocationErpCode = inventoryLabelDto.LocationErpCode, + ItemDesc1 = inventoryLabelDto.ItemDesc1, + FromLot = input.Lot, + ToLot = inventoryLabelDto.Lot, + ArriveDate = inventoryLabelDto.ArriveDate, + ItemName = inventoryLabelDto.ItemName, + ItemDesc2 = inventoryLabelDto.ItemDesc2, + PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber, + LabelType = (EnumLabelType)inventoryLabelDto.LabelType, + RecommendLocationCode = inventoryLabelDto.RecommendLocationCode, + RpNumber = inventoryLabelDto.RpNumber, + SupplierName = inventoryLabelDto.SupplierName, + Remark = inventoryLabelDto.Remark, + FromQty = input.Qty, + ToQty = inventoryLabelDto.Qty, + PurchaseInfo_AsnNumber = inventoryLabelDto.AsnNumber, + ExpireDate = inventoryLabelDto.ExpireDate, + FullBarcodeString = inventoryLabelDto.FullBarcodeString, + SupplierBatch = inventoryLabelDto.SupplierBatch, + ProduceDate = inventoryLabelDto.ProduceDate, + LabelStatus = Basedata.LabelStatus.Enable, + SupplierSimpleName = inventoryLabelDto.SupplierSimpleName, + SupplierItemCode = inventoryLabelDto.SupplierItemCode, + SupplierItemName = inventoryLabelDto.SupplierItemName, + PlanArriveDate = inventoryLabelDto.PlanArriveDate, + FromStdPackQty = input.StdPackQty, + FromUom = input.Uom, + OprType = OprTypeEnum.SplitBox, + ReceiptRecNumber = inventoryLabelDto.RpNumber, + ToStdPackQty = inventoryLabelDto.StdPackQty, + ToUom = inventoryLabelDto.Uom, + TaskOrderNumber = detailInput.TaskOrderNumber, + ArrivalNoticNumber = detailInput.ArrivalNoticNumber, + PutOnShelfNumber = detailInput.PutOnShelfNumber, + } + }; + await _splitPackingRecAppService.BatchInsertAsync(splitPackingRecEditInputs).ConfigureAwait(false); - //创建标签 - return base.CreateAsync(input); + //创建标签 + var dto= await base.CreateAsync(input).ConfigureAwait(false); + + //库存移动 + var transferLogEditInput=await BuildTransferLogsAsync(dto, detailInput, splitPackingRecEditInputs.First()).ConfigureAwait(false); + transferLogEditInputs.Add(transferLogEditInput); + } + + await _transferLogAppService.AddManyAsync(transferLogEditInputs).ConfigureAwait(false); } /// /// 构造 库存转移日志实体 /// /// + /// + /// /// - private List BuildTransferLogs(IntegrationPackingNoteDTO dto) + private async Task BuildTransferLogsAsync( + IntegrationPackingNoteDTO dto, + IntegrationPackingNoteDetailInput detailInput, + SplitPackingRecEditInput splitPackingRecEditInput) { - var transferLogCreateInputs = new List(); - - //foreach (var detail in dto.Details.Where(detail => detail.Qty != 0)) - //{ - // var transferLog = ObjectMapper.Map(detail); + var fromLocationDto = await _locationAppService.GetByCodeAsync(dto.LocationCode).ConfigureAwait(false); + var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.LocationCode).ConfigureAwait(false); - // transferLog.TransType = TransType; - // transferLog.TransSubType = ConvertToTransSubType(deliverNote.DeliverRequestType); - // transferLog.Worker = deliverNote.Worker; - // transferLog.DocNumber = deliverNote.Number; - // transferLog.JobNumber = deliverNote.JobNumber; + var transferLogEditInput = new TransferLogEditInput + { + Worker = dto.Worker, + Qty = detailInput.Qty, + ItemCode = detailInput.ItemCode, + FromLocationCode = fromLocationDto.Code, + FromLocationErpCode = fromLocationDto.ErpLocationCode, + FromLocationArea = fromLocationDto.AreaCode, + FromLocationGroup = fromLocationDto.LocationGroupCode, + FromWarehouseCode = fromLocationDto.WarehouseCode, + ToLocationCode = toLocationDto.Code, + ToLocationErpCode = toLocationDto.ErpLocationCode, + ToLocationArea = toLocationDto.AreaCode, + ToLocationGroup = toLocationDto.LocationGroupCode, + ToWarehouseCode = toLocationDto.WarehouseCode, + ToPackingCode = splitPackingRecEditInput.ToPackingCode, + Remark = splitPackingRecEditInput.Remark, + ArriveDate = splitPackingRecEditInput.ArriveDate, + DocNumber = string.Empty, + ExpireDate = splitPackingRecEditInput.ExpireDate, + FromContainerCode = detailInput.ContainerCode, + FromLot = splitPackingRecEditInput.FromLot, + FromPackingCode = dto.PackingCode, + Uom = splitPackingRecEditInput.FromUom, + FromStatus = EnumInventoryStatus.OK, + JobNumber = string.Empty, + ItemDesc1 = splitPackingRecEditInput.ItemDesc1, + StdPackQty = splitPackingRecEditInput.FromStdPackQty, + TransType = EnumTransType.Transfer, + ToLot = splitPackingRecEditInput.ToLot, + ItemDesc2 = splitPackingRecEditInput.ItemDesc2, + ItemName = splitPackingRecEditInput.ItemName, + ProduceDate = splitPackingRecEditInput.ProduceDate, + SupplierBatch = splitPackingRecEditInput.SupplierBatch, + ToContainerCode = detailInput.ContainerCode, + ToStatus = EnumInventoryStatus.OK, + TransSubType = EnumTransSubType.Transfer_SplitPacking + }; - // transferLogCreateInputs.Add(transferLog); - //} + return transferLogEditInput; + } - return transferLogCreateInputs; + private async Task CreateLabelAsync() + { + var batchInsert=await _splitPackingRecAppService.BatchInsertAsync().ConfigureAwait(false); } } 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 1630e3f81..2c60ee45f 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 @@ -618,15 +618,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase public async Task SplitPacking_InspectAsync(TransferNoteEditInput transferNoteEditInput, [FromQuery] SplitPacking_UpdateJobDetailInput updateJobDetailInput) { - //SplitPacking_UpdateDetailInput newInput = new SplitPacking_UpdateDetailInput(); - //newInput.Number = updateJobDetailInput.Number; - //newInput.FromPackingCode = updateJobDetailInput.FromPackingCode; - //newInput.FromQty = updateJobDetailInput.FromQty; - //newInput.ToPackingCode = updateJobDetailInput.ToPackingCode; - //newInput.ToQty = updateJobDetailInput.ToQty; - //newInput.FromLocationCode = transferNoteEditInput.Details[0].FromLocationCode; - //newInput.ToLocationCode = transferNoteEditInput.Details[0].ToLocationCode; - //var expectOutRet = await _expectOutAppService.SaveDetail_SplitPackingAsync(newInput).ConfigureAwait(false); var jobRet = await _inspectJobAppService.SaveDetail_SplitPackingAsync(updateJobDetailInput) .ConfigureAwait(false); var ret = await SplitPackingAsync(transferNoteEditInput).ConfigureAwait(false); //库存操作 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InspectRequests/InspectRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InspectRequests/InspectRequestAppService.cs index 991cbbef7..5577adb1c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InspectRequests/InspectRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InspectRequests/InspectRequestAppService.cs @@ -41,54 +41,4 @@ public class InspectRequestAppService : var dto = ObjectMapper.Map(entity); return dto; } - - /* - /// - /// 修改明细 - /// - /// - /// - /// - /// - //[HttpPut("details/{id}")] - //public virtual async Task UpdateDetailAsync(Guid id, Guid detailId, InspectRequestDetailDTO updateDetailDTO) - //{ - // var entity = await _repository.FindAsync(id); - // Check.NotNull(entity, EntityClassName); - // var detail = ObjectMapper.Map(updateDetailDTO); - // entity.ReplaceDetail(detailId, detail); - // await _repository.UpdateAsync(entity); - //} - - //[HttpPost("create-by-receipt-note")] - //public virtual async Task> CreateByPurchaseReceiptNoteAsync(PurchaseReceiptNoteDTO purchaseReceiptNoteDto) - //{ - // var purchaseReceiptNote = ObjectMapper.Map(purchaseReceiptNoteDto); - - // var inspectRequestList =await _inspectRequestManager.CreateByPurchaseReceiptNoteAsync(purchaseReceiptNote); - - // var dtos = ObjectMapper.Map, List>(inspectRequestList); - - // return dtos; - //} - - /// - /// 根据ERP料号+批次,获得报检单信息 - /// - /// - /// - /// - /// - //[HttpGet("by-itemcode-lot")] - //public virtual async Task GetAsync(string inspectNumber, string itemCode, string lot) - //{ - - // var inspectRequestDTO = await GetByNumberAsync(inspectNumber); - // var inspectRequest = await _repository.FindAsync(inspectRequestDTO.Id); - // var details = (List)inspectRequest.GetDetailList(c => c.ItemCode == itemCode && c.Lot == lot); - // var detailDTOs = ObjectMapper.Map, List>(details); - // inspectRequestDTO.Details = detailDTOs; - // return inspectRequestDTO; - //} - */ } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNote.cs index 07b6f9f36..dd44310ed 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNote.cs @@ -95,6 +95,12 @@ public class IntegrationPackingNote : SfsStoreAggregateRootBase + /// 单号 + /// + [Display(Name = "单号")] + public string WarehouseCode { get; set; } + #endregion #region 标签信息