From e83bd2f6a38957c0d47c9e0a6c6b2ca45836e114 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 08 十一月 2025 10:13:43 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 7e3d41c..5ecdbe0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -1,5 +1,6 @@
锘縰sing AutoMapper;
using SqlSugar;
+using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
@@ -29,12 +30,12 @@
private readonly IRepository<Dt_Task> _taskRepository;
private IStockService _stockService;
-
+ private readonly IMaterialUnitService _materialUnitService;
private readonly IInboundOrderDetailService _inboundOrderDetailService;
private readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
public IRepository<Dt_InboundOrder> Repository => BaseDal;
- public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService) : base(BaseDal)
+ public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -42,16 +43,17 @@
_taskRepository = taskRepository;
_stockService = stockService;
_inboundOrderDetailService = inboundOrderDetailService;
+ _materialUnitService = materialUnitService;
}
- public WebResponseContent ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
+ public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
{
try
{
return operateType switch
{
- 1 => AddInboundOrder(models),
- 2 => UpdateInboundOrder(models),
+ 1 =>await AddInboundOrder(models),
+ 2 => await UpdateInboundOrder(models),
3 => DeleteInboundOrder(models),
_ => WebResponseContent.Instance.OK(),
@@ -63,7 +65,7 @@
}
}
- public WebResponseContent AddInboundOrder(List<Dt_InboundOrder> models)
+ public async Task<WebResponseContent> AddInboundOrder(List<Dt_InboundOrder> models)
{
try
{
@@ -77,6 +79,13 @@
foreach (var model in models)
{
+ foreach (var item in model.Details)
+ {
+ var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);
+ item.Unit= purchaseToStockResult.Unit;
+ item.OrderQuantity=purchaseToStockResult.Quantity;
+ }
+
model.InboundOrderNo = CreateCodeByRule(nameof(RuleCodeEnum.InboundOrderRule));
Db.InsertNav(model).Include(x => x.Details).ExecuteCommand();
}
@@ -87,7 +96,7 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent UpdateInboundOrder(List<Dt_InboundOrder> models)
+ public async Task<WebResponseContent> UpdateInboundOrder(List<Dt_InboundOrder> models)
{
try
{
@@ -131,6 +140,10 @@
BarcodeQty = item.BarcodeQty,
OrderQuantity = item.OrderQuantity
};
+ var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);
+ inboundOrderDetail.Unit = purchaseToStockResult.Unit;
+ inboundOrderDetail.OrderQuantity = purchaseToStockResult.Quantity;
+
inboundOrderDetails.Add(inboundOrderDetail);
}
else
@@ -304,7 +317,8 @@
var dbinboundOrderDetails = _inboundOrderDetailService.GetByBarcode(materielGroupDTO.Barcodes);
- if (dbinboundOrderDetails != null && !dbinboundOrderDetails.Any()) {
+ if (dbinboundOrderDetails != null && !dbinboundOrderDetails.Any())
+ {
return content = WebResponseContent.Instance.Error($"鍗曟嵁涓病鏈夎{materielGroupDTO.Barcodes}鏉＄爜鏁版嵁銆�");
}
@@ -332,14 +346,14 @@
Barcode = item.Barcode,
MaterielCode = item.MaterielCode,
BatchNo = item.BatchNo,
- Unit = item.BarcodeUnit,
+ Unit = item.Unit,
InboundOrderRowNo = item.lineNo,
SupplyCode = item.SupplyCode,
WarehouseCode = item.WarehouseCode,
- StockQuantity = item.BarcodeQty,
+ StockQuantity = item.OrderQuantity,
Status = 0,
OrderNo = inboundOrder.InboundOrderNo,
- BusinessType=inboundOrder.BusinessType,
+ BusinessType = inboundOrder.BusinessType,
});
item.ReceiptQuantity = item.BarcodeQty;
@@ -351,7 +365,7 @@
stockInfo.PalletCode = materielGroupDTO.PalletCode;
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
}
-
+ stockInfo.PalletType = (int)PalletTypeEnum.None;
List<int> updateDetailIds = dbinboundOrderDetails.Select(x => x.Id).ToList();
if (inboundOrder.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
@@ -391,7 +405,7 @@
(bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);
if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);
-
+
Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);
if (stockInfo != null && !string.IsNullOrEmpty(stockInfo.LocationCode) && stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
{
@@ -416,7 +430,7 @@
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
}
- _unitOfWorkManage.BeginTran();
+ _unitOfWorkManage.BeginTran();
_stockService.StockInfoService.AddMaterielGroup(stockInfo);
_unitOfWorkManage.CommitTran();
@@ -429,7 +443,7 @@
}
-
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3