diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs index 8b13c38dd..3835ef772 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs @@ -35,7 +35,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase return; } - Logger.LogInformation($"Read Plan"); + Logger.LogInformation($"读取 采购订单"); var planReader = workerContext.ServiceProvider.GetRequiredService(); var planConverter = workerContext.ServiceProvider.GetRequiredService(); //读取并保存Plan @@ -43,7 +43,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //转换Plan await planConverter.ConvertAsync(plansFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Read Ship"); + Logger.LogInformation($"读取 发货单"); var shipHandleService = workerContext.ServiceProvider.GetRequiredService(); var shipConverter = workerContext.ServiceProvider.GetRequiredService(); //读取并保持Ship @@ -51,7 +51,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //转换Ship await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Read Product"); + Logger.LogInformation($"读取 产品"); var productHandleService = workerContext.ServiceProvider.GetRequiredService(); var productConverter = workerContext.ServiceProvider.GetRequiredService(); //读取并保持Product diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs index 63d92a5d2..9ec0587a6 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs @@ -35,13 +35,13 @@ public class EosOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase return; } - Logger.LogInformation($"Write Arrive"); + Logger.LogInformation($"传出 采购上架单"); var arriveConvert = workerContext.ServiceProvider.GetRequiredService(); var arriveNoteList = await arriveConvert.ConvertAsync().ConfigureAwait(false); var arriveWriter = workerContext.ServiceProvider.GetRequiredService(); await arriveWriter.WriteAsync(arriveNoteList).ConfigureAwait(false); - Logger.LogInformation($"Write Return"); + Logger.LogInformation($"传出 采购退货单"); var returnConvert = workerContext.ServiceProvider.GetRequiredService(); var returnNoteList = await returnConvert.ConvertAsync().ConfigureAwait(false); var returnWriter = workerContext.ServiceProvider.GetRequiredService(); diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs index 52c3ba58b..f29f298c7 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs @@ -302,6 +302,69 @@ public class BalanceController : AbpController return balanceDTOs; } + /// + /// 查询库存余额 根据 物品 库位 库位类型 库存状态 批次 + /// + /// + /// + [HttpPost("get-fuzzy-by-balances-request-many-parameter")] + public async Task> GetFuzzyListByLocationTypeAndInventoryStatusAsync( + BalanceListByIssueInputByInventoryStatusAndLocationType listInput) + { + var input = new SfsInventoryRequestInputBase + { + MaxResultCount = listInput.pageSize, + SkipCount = (listInput.pageIndex - 1) * listInput.pageSize, + Sorting = listInput.sortBy, + Condition = new Condition { Filters = new List() } + }; + if (!string.IsNullOrWhiteSpace(listInput.itemCode)) + { + input.Condition.Filters.Add(new Filter("ItemCode", listInput.itemCode, EnumFilterAction.Like.ToString())); + } + + if (!string.IsNullOrWhiteSpace(listInput.locationCode)) + { + input.Condition.Filters.Add(new Filter("LocationCode", listInput.locationCode)); + } + + if (!string.IsNullOrWhiteSpace(listInput.lot)) + { + input.Condition.Filters.Add(new Filter("Lot", listInput.lot)); + } + + if (!string.IsNullOrWhiteSpace(listInput.packingCode)) + { + input.Condition.Filters.Add(new Filter("PackingCode", listInput.packingCode)); + } + + if (!string.IsNullOrWhiteSpace(listInput.containerCode)) + { + input.Condition.Filters.Add(new Filter("ContainerCode", listInput.containerCode)); + } + + if (listInput.locationTypes != null && listInput.locationTypes.Any()) + { + var locationCodes = (await _locationAppService.GetListByTypesAsync(listInput.locationTypes).ConfigureAwait(false)) + .Select(t => t.Code).ToList(); + + if (locationCodes.Any()) + { + input.Condition.Filters.Add( + new Filter("LocationCode", JsonSerializer.Serialize(locationCodes), "In")); + } + } + + if (listInput.inventoryStatuses != null && listInput.inventoryStatuses.Any()) + { + input.Condition.Filters.Add( + new Filter("Status", JsonSerializer.Serialize(listInput.inventoryStatuses), "In")); + } + + var balanceDTOs = await _balanceAppService.GetPagedListByFilterAsync(input, false).ConfigureAwait(false); + + return balanceDTOs; + } /// /// 根据零件获取库位信息 ///