diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs index 2af06fcc7..e4cc14b92 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs @@ -28,7 +28,6 @@ public class CustomerProductionReturnNoteAppService : { private readonly ICustomerProductionReturnNoteManager _CustomerProductionReturnNoteManager; - private readonly ICustomerItemAppService _customerItemAppService; private readonly ICustomerAppService _customerAppService; @@ -43,12 +42,8 @@ public class CustomerProductionReturnNoteAppService : ICustomerAppService customerAppService ) : base(repository) { - - _customerItemAppService = customerItemAppService; - _salePriceSheetAppService = salePriceSheetAppService; - _CustomerProductionReturnNoteManager = CustomerProductionReturnNoteManager; _customerAppService = customerAppService; } @@ -56,8 +51,6 @@ public class CustomerProductionReturnNoteAppService : [HttpGet("{id}")] public override async Task GetAsync(Guid id) { - - var entity=await base.GetAsync(id).ConfigureAwait(false); foreach (var itm in entity.Details) @@ -65,12 +58,7 @@ public class CustomerProductionReturnNoteAppService : itm.CustomerCode=entity.CustomerCode; itm.CustomerName=entity.CustomerName; } - - - - return entity; - } @@ -96,14 +84,6 @@ public class CustomerProductionReturnNoteAppService : throw new UserFriendlyException($"未{entity.CustomerCode}查到客户信息!"); } - - /// - /// 客户名称 - /// - - - - var parts= input.Details.Select(itm => itm.ItemCode).Distinct(); //var ls=await IsExistCustomerItemPrice(parts.ToList(),input.CustomerCode).ConfigureAwait(false); @@ -122,7 +102,13 @@ public class CustomerProductionReturnNoteAppService : var custitmDetail = await _customerItemAppService.GetListByPartsAsync(parts.ToList()).ConfigureAwait(false); - var checkPart= from itm in entity.Details.ToList() + //var query= from itm in custitmDetail join itm1 in cust + + + + + var checkPart= + from itm in entity.Details.ToList() join itm1 in custitmDetail on itm.ItemCode equals itm1.ItemCode into temp 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 27bbe979c..48a075d63 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 @@ -82,7 +82,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase Dictionary dictionary) { var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key); - foreach (var addTransferNote in addList) { foreach (var detail in addTransferNote.Details) @@ -96,13 +95,8 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase + $"在实际库存中查询到【ERP料号】{balanceDto.ItemCode}【库位】{balanceDto.LocationCode}【箱码】{balanceDto.PackingCode}【状态】{balanceDto.Status}【数量】{balanceDto.Qty}" + $"【库存不足】"); } - - - - } } - foreach (var transferNote in addList) { if (transferNote.Type == EnumTransSubType.Transfer_Inside.GetDisplayName()) //储位内调拨 @@ -123,7 +117,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase { throw new UserFriendlyException($"来源库位与目标库位类型不一致"); } - detail.OnTheWayLocationCode = bool.FalseString; detail.ItemCode=balanceDto.ItemCode; detail.ArriveDate=balanceDto.ArriveDate; @@ -156,9 +149,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase detail.ToLocationArea = balanceDto.LocationArea; detail.ToStatus = balanceDto.Status; detail.ToLot = balanceDto.Lot; - - - } } }