From a8c315dc781efcf605546c92468adc58020692c5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 11 十一月 2025 11:40:04 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 14 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 aa1dece..04ad8a0 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,14 @@
private readonly IRepository<Dt_Task> _taskRepository;
private IStockService _stockService;
-
+ private readonly IMaterialUnitService _materialUnitService;
private readonly IInboundOrderDetailService _inboundOrderDetailService;
private readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
+ private readonly IRepository<Dt_StockInfoDetail> _stockDetailRepository;
+ private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
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,IRepository<Dt_StockInfoDetail> stockDetailRepository,IRepository<Dt_InboundOrder> inboundOrderRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -42,16 +45,19 @@
_taskRepository = taskRepository;
_stockService = stockService;
_inboundOrderDetailService = inboundOrderDetailService;
+ _materialUnitService = materialUnitService;
+ _stockDetailRepository = stockDetailRepository;
+ _inboundOrderRepository = inboundOrderRepository;
}
- 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 +69,7 @@
}
}
- public WebResponseContent AddInboundOrder(List<Dt_InboundOrder> models)
+ public async Task<WebResponseContent> AddInboundOrder(List<Dt_InboundOrder> models)
{
try
{
@@ -77,6 +83,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 +100,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 +144,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
@@ -179,6 +196,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -211,6 +229,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -302,7 +321,8 @@
var dbinboundOrderDetails = _inboundOrderDetailService.GetByBarcode(materielGroupDTO.Barcodes);
- if (dbinboundOrderDetails != null && !dbinboundOrderDetails.Any()) {
+ if (dbinboundOrderDetails != null && !dbinboundOrderDetails.Any())
+ {
return content = WebResponseContent.Instance.Error($"鍗曟嵁涓病鏈夎{materielGroupDTO.Barcodes}鏉＄爜鏁版嵁銆�");
}
@@ -330,13 +350,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,
});
item.ReceiptQuantity = item.BarcodeQty;
@@ -348,7 +369,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())
@@ -388,7 +409,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())
{
@@ -413,7 +434,7 @@
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
}
- _unitOfWorkManage.BeginTran();
+ _unitOfWorkManage.BeginTran();
_stockService.StockInfoService.AddMaterielGroup(stockInfo);
_unitOfWorkManage.CommitTran();
@@ -426,7 +447,7 @@
}
-
+
}
catch (Exception ex)
{
@@ -531,6 +552,52 @@
}
+ public WebResponseContent UnPalletQuantity(string orderNo)
+ {
+ // 鍒濆鍖栬繑鍥濪TO锛堥粯璁ゅ�奸兘涓�0锛岄伩鍏峮ull锛�
+ var resultDTO = new PalletSumQuantityDTO
+ {
+ StockSumQuantity = 0,
+ StockCount = 0,
+ UniqueUnit=""
+ };
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (string.IsNullOrWhiteSpace(orderNo))
+ {
+ return content.Error("浼犲叆鐨勮鍗曞彿orderNo涓虹┖鎴栫┖鐧�");
+ }
+ var orderDetail = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).Where(s => s.InboundOrderNo == orderNo).First();
+ if (orderDetail == null)
+ {
+ return content.Error("鏈壘鍒板崟鎹�");
+ }
+ var unitGroups = orderDetail.Details.GroupBy(d => d.Unit).ToList();
+ if (unitGroups.Count == 1)
+ {
+ resultDTO.UniqueUnit = unitGroups.First().Key;
+ }
+ else
+ {
+ resultDTO.UniqueUnit = "";
+ }
+ var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();
+ resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);
+ resultDTO.StockCount = orderDetail.Details.Count;
+ if(validDetails.Any())
+ {
+ resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);
+ // 鏄庣粏璁板綍鏁帮細绗﹀悎鏉′欢鐨勬湁鏁堣褰曟潯鏁�
+ resultDTO.StockCount -= validDetails.Count;
+ }
+ return content.OK("",resultDTO);
+ }
+ catch (Exception ex)
+ {
+ return content.Error("SumQuantity 缁熻搴撳瓨鏁伴噺澶辫触锛岃鍗曞彿锛歿OrderNo}");
+ }
+ }
}
}
--
Gitblit v1.9.3