diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs index 53c947bb9..45f94ece8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs @@ -27,7 +27,7 @@ public class WipWarehouseAdjustRequestImportInput : SfsStoreImportInputBase /// /// 调整数量 /// - [Display(Name = "调拨数量")] + [Display(Name = "调整数量")] [Required(ErrorMessage = "{0}是必填项")] public decimal Qty { get; set; } @@ -39,14 +39,14 @@ public class WipWarehouseAdjustRequestImportInput : SfsStoreImportInputBase public string FromLocationCode { get; set; } /// - /// 原因 + /// 调整原因 /// [Display(Name = "调整原因")] [StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Reason { get; set; } /// - /// 调整代码 + /// 原因代码 /// [Display(Name = "原因代码")] [StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")] diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/WipWarehouseAdjustNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/WipWarehouseAdjustNoteEventHandler.cs index b80add431..ff386eec9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/WipWarehouseAdjustNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/WipWarehouseAdjustNoteEventHandler.cs @@ -23,12 +23,14 @@ public class WipWarehouseAdjustNoteEventHandler private readonly IWipWarehouseAdjustRequestAppService _wipWarehouseAdjustRequestApp; private readonly IItemBasicAppService _itemBasicAppService; + private readonly IBalanceAppService _balanceAppService; public WipWarehouseAdjustNoteEventHandler( - IWipWarehouseAdjustRequestAppService wipWarehouseAdjustRequestApp, IItemBasicAppService itemBasicAppService) + IWipWarehouseAdjustRequestAppService wipWarehouseAdjustRequestApp, IItemBasicAppService itemBasicAppService, IBalanceAppService balanceAppService) { _wipWarehouseAdjustRequestApp = wipWarehouseAdjustRequestApp; _itemBasicAppService = itemBasicAppService; + _balanceAppService = balanceAppService; } /// @@ -87,12 +89,20 @@ public class WipWarehouseAdjustNoteEventHandler { var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); + var balanceNums = await _balanceAppService.GetListByLocationCodeAndItemCodeAsync(detail.FromLocationCode, detail.ItemCode).ConfigureAwait(false); + decimal balanceSum = 0; + foreach (var item in balanceNums) + { + balanceSum += item.Qty; + } + var transaction = new TransactionEditInput(); transaction.TransType = TransType; transaction.TransSubType = TransSubType; + transaction.Qty = detail.Qty- balanceSum; - transaction.TransInOut = detail.Qty > 0 ? EnumTransInOut.In : EnumTransInOut.Out; + transaction.TransInOut = transaction.Qty > 0 ? EnumTransInOut.In : EnumTransInOut.Out; transaction.Worker = countAdjustNote.Worker; transaction.DocNumber = countAdjustNote.Number; @@ -107,7 +117,7 @@ public class WipWarehouseAdjustNoteEventHandler transaction.Uom=detail.Uom; transaction.PackingCode = detail.ToPackingCode; transaction.Lot = detail.ToLot; - transaction.Qty=detail.Qty; + transaction.Status = detail.ToStatus; transaction.LocationCode = detail.ToLocationCode; transaction.LocationGroup = detail.ToLocationGroup;