Browse Source

修改bug

集成Redis
郑勃旭 2 years ago
parent
commit
9a0eb96959
  1. 8
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs
  2. 3
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierTimeWindows/SupplierTimeWindowAutoMapperProfile.cs
  3. 10
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/IPurchaseReceiptRequestAppService.cs
  4. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs
  5. 7
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs
  6. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs
  7. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReturnNoteEventHandler.cs

8
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs

@ -79,10 +79,10 @@ public class ItemBasicImportInput : SfsBaseDataImportInputBase
/// 类型
/// </summary>
[Display(Name = "类型")]
[ValueMapping("成品", "成品")]
[ValueMapping("原料", "原料")]
[ValueMapping("物料", "物料")]
[ValueMapping("半成品", "半成品")]
[ValueMapping("10C01", "10C01")]
[ValueMapping("10C02", "10C02")]
[ValueMapping("10C03", "10C03")]
[ValueMapping("10C04", "10C04")]
public string Type { get; set; }
/// <summary>

3
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierTimeWindows/SupplierTimeWindowAutoMapperProfile.cs

@ -17,11 +17,10 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
.Ignore(x => x.TenantId)
.Ignore(x => x.ExtraProperties)
.Ignore(x => x.ConcurrencyStamp)
.Ignore(x => x.SupplierName)
;
CreateMap<SupplierTimeWindow, SupplierTimeWindowImportInput>()
.Ignore(x => x.ReportStatus)
.Ignore(x => x.ReportStatus)
.Ignore(x => x.ReportReason);
}
}

10
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/IPurchaseReceiptRequestAppService.cs

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
@ -29,4 +30,13 @@ public interface IPurchaseReceiptRequestAppService
/// <returns></returns>
Task<PurchaseReceiptRequestDetailDTO> GetDetailByItemAndPackingAsync(string itemCode,
string packingCode);
/// <summary>
/// 修改请求状态
/// </summary>
/// <param name="number"></param>
/// <param name="enumRequestStatus"></param>
/// <returns></returns>
Task<PurchaseReceiptRequestDTO> UpdatePurchaseReceiptRequestAsync(string number,
EnumRequestStatus enumRequestStatus);
}

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs

@ -4,9 +4,11 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp.ObjectMapping;
using Volo.Abp.Uow;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Label.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Domain.Shared;
@ -120,6 +122,22 @@ public class PurchaseReceiptRequestAppService :
return ObjectMapper.Map<List<PurchaseReceiptRequest>, List<PurchaseReceiptRequestDTO>>(entity);
}
/// <summary>
/// 修改请求状态
/// </summary>
/// <param name="number"></param>
/// <param name="enumRequestStatus"></param>
/// <returns></returns>
[HttpGet("update-request-status")]
public virtual async Task<PurchaseReceiptRequestDTO> UpdatePurchaseReceiptRequestAsync(string number,
EnumRequestStatus enumRequestStatus)
{
var entity=await _repository.GetAsync(p => p.Number == number).ConfigureAwait(false);
entity.RequestStatus=enumRequestStatus;
entity= await _repository.UpdateAsync(entity).ConfigureAwait(false);
return ObjectMapper.Map<PurchaseReceiptRequest, PurchaseReceiptRequestDTO>(entity);
}
protected override Func<PurchaseReceiptRequestImportInput, object> GetEntityExpression()
{
throw new NotImplementedException();

7
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs

@ -148,8 +148,11 @@ public class InspectJobManager : SfsJobManagerBase<InspectJob, InspectJobDetail>
});
var goodqty = jobEntity.Details.Where(p =>
p.DetailInspectStatus == EnumDetailInspectStatus.DefaultOK ||
p.DetailInspectStatus == EnumDetailInspectStatus.OK).Sum(p => p.GoodQty);
(p.DetailInspectStatus == EnumDetailInspectStatus.DefaultOK ||
p.DetailInspectStatus == EnumDetailInspectStatus.OK)
&& p.ItemCode == input.ItemCode
&& p.Lot == input.Lot)
.Sum(p => p.GoodQty);
//获取 汇总详情
var summaryDetailEntity = jobEntity.SummaryDetails.Find(p => p.Id == summaryDetailId);

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs

@ -30,6 +30,7 @@ public class PurchaseReceiptNoteEventHandler
private readonly IPurchaseOrderAppService _purchaseOrderAppService;
private readonly IItemQualityAppService _itemQualityAppService;
private readonly ISupplierAsnAppService _supplierAsnAppService;
private readonly IPurchaseReceiptRequestAppService _purchaseReceiptRequestAppService;
/// <summary>
/// 收货记录
@ -41,12 +42,14 @@ public class PurchaseReceiptNoteEventHandler
IInspectRequestAppService inspectRequestAppService,
IPurchaseOrderAppService purchaseOrderAppService,
IItemQualityAppService itemQualityAppService,
ISupplierAsnAppService supplierAsnAppService)
ISupplierAsnAppService supplierAsnAppService,
IPurchaseReceiptRequestAppService purchaseReceiptRequestAppService)
{
_inspectRequestAppService = inspectRequestAppService;
_purchaseOrderAppService = purchaseOrderAppService;
_itemQualityAppService = itemQualityAppService;
_supplierAsnAppService = supplierAsnAppService;
_purchaseReceiptRequestAppService = purchaseReceiptRequestAppService;
}
/// <summary>
@ -70,6 +73,9 @@ public class PurchaseReceiptNoteEventHandler
//更新订单已收货数量
await UpdatePurchaseOrderAsync(entity).ConfigureAwait(false);
//更新收货请求状态
await UpdatePurchaseReceiptRequest(entity.PurchaseReceiptRequestNumber).ConfigureAwait(false);
//更新发货单状态
await UpdateSupplierAsnAsync(entity.AsnNumber).ConfigureAwait(false);
}
@ -108,6 +114,16 @@ public class PurchaseReceiptNoteEventHandler
await _supplierAsnAppService.UpdateStatusAsync(asnNumber,EnumSupplierAsnStatus.Received).ConfigureAwait(false);
}
/// <summary>
/// 更新发货请求状态
/// </summary>
/// <param name="purchaseReceiptRequestNumber"></param>
/// <returns></returns>
private async Task UpdatePurchaseReceiptRequest(string purchaseReceiptRequestNumber)
{
await _purchaseReceiptRequestAppService.UpdatePurchaseReceiptRequestAsync(purchaseReceiptRequestNumber,EnumRequestStatus.Completed).ConfigureAwait(false);
}
#region 私有
/// <summary>

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReturnNoteEventHandler.cs

@ -3,6 +3,7 @@ using System.Linq;
using System.Threading.Tasks;
using Volo.Abp.EventBus;
using Volo.Abp.Uow;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Label.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Shared.Event;
@ -27,15 +28,18 @@ public class PurchaseReturnNoteEventHandler
private readonly IPurchaseReturnRequestAppService _purchaseReturnRequestApp;
private readonly IPurchaseOrderAppService _purchaseOrderAppService;
private readonly IInventoryLabelAppService _inventoryLabelAppService;
private readonly IItemBasicAppService _itemBasicAppService;
public PurchaseReturnNoteEventHandler(
IPurchaseReturnRequestAppService purchaseReturnRequestApp
, IPurchaseOrderAppService purchaseOrderAppService,
IInventoryLabelAppService inventoryLabelAppService)
IInventoryLabelAppService inventoryLabelAppService,
IItemBasicAppService itemBasicAppService)
{
_purchaseReturnRequestApp = purchaseReturnRequestApp;
_purchaseOrderAppService = purchaseOrderAppService;
_inventoryLabelAppService = inventoryLabelAppService;
_itemBasicAppService = itemBasicAppService;
}
[UnitOfWork]
@ -81,7 +85,7 @@ public class PurchaseReturnNoteEventHandler
{
var inboundTransactions = new List<TransactionEditInput>();
inboundTransactions.AddRange(BuildTransactions(purchaseReturnNote));
inboundTransactions.AddRange(await BuildTransactions(purchaseReturnNote).ConfigureAwait(false));
await TransactionAppService.AddManyAsync(inboundTransactions).ConfigureAwait(false);
@ -118,12 +122,13 @@ public class PurchaseReturnNoteEventHandler
}
*/
private List<TransactionEditInput> BuildTransactions(PurchaseReturnNote purchaseReturnNote)
private async Task<List<TransactionEditInput>> BuildTransactions(PurchaseReturnNote purchaseReturnNote)
{
var transactions = new List<TransactionEditInput>();
//构造库存转移记录创建Input
foreach (var detail in purchaseReturnNote.Details.Where(detail => detail.Qty != 0))
{
var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
var transaction = ObjectMapper.Map<PurchaseReturnNoteDetail, TransactionEditInput>(detail);
transaction.TransType =
@ -134,6 +139,7 @@ public class PurchaseReturnNoteEventHandler
transaction.Worker = purchaseReturnNote.Worker;
transaction.DocNumber = purchaseReturnNote.Number;
transaction.JobNumber = purchaseReturnNote.JobNumber;
transaction.ManageType = itemBasicDto.ManageType;
//transaction.Status =
// detail.Status == EnumInventoryStatus.None
// ? InventoryStatus

Loading…
Cancel
Save