From ec15cf34499727cbd0e75be96c9793dd824a06c0 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 12 十一月 2025 10:09:23 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 4b4b52b..8a288c1 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"
@@ -19,6 +19,7 @@
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Basic;
namespace WIDESEA_InboundService
{
@@ -35,9 +36,10 @@
private readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
private readonly IRepository<Dt_StockInfoDetail> _stockDetailRepository;
private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
+ private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;
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, IMaterialUnitService materialUnitService,IRepository<Dt_StockInfoDetail> stockDetailRepository,IRepository<Dt_InboundOrder> inboundOrderRepository) : 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, IRepository<Dt_WarehouseArea> warehouseAreaRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -48,6 +50,7 @@
_materialUnitService = materialUnitService;
_stockDetailRepository = stockDetailRepository;
_inboundOrderRepository = inboundOrderRepository;
+ _warehouseAreaRepository = warehouseAreaRepository;
}
public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
@@ -56,7 +59,7 @@
{
return operateType switch
{
- 1 =>await AddInboundOrder(models),
+ 1 => await AddInboundOrder(models),
2 => await UpdateInboundOrder(models),
3 => DeleteInboundOrder(models),
@@ -86,8 +89,8 @@
foreach (var item in model.Details)
{
var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);
- item.Unit= purchaseToStockResult.Unit;
- item.OrderQuantity=purchaseToStockResult.Quantity;
+ item.Unit = purchaseToStockResult.Unit;
+ item.OrderQuantity = purchaseToStockResult.Quantity;
}
model.InboundOrderNo = CreateCodeByRule(nameof(RuleCodeEnum.InboundOrderRule));
@@ -340,8 +343,9 @@
stockInfo = new Dt_StockInfo() { PalletType = (int)PalletTypeEnum.None };
stockInfo.Details = new List<Dt_StockInfoDetail>();
}
-
-
+ var warehouseareas = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().ToList();
+ var warehousearea = warehouseareas.First(x => x.Name == materielGroupDTO.locationTypeDesc.Trim() && x.FactoryArea == inboundOrder.FactoryArea);
+
foreach (var item in dbinboundOrderDetails)
{
stockInfo.Details.Add(new Dt_StockInfoDetail
@@ -353,16 +357,17 @@
Unit = item.Unit,
InboundOrderRowNo = item.lineNo,
SupplyCode = item.SupplyCode,
- WarehouseCode = item.WarehouseCode,
+ WarehouseCode = warehousearea!=null? warehousearea.Code: item.WarehouseCode,
StockQuantity = item.OrderQuantity,
- Status = 0,
+ Status = 0,
OrderNo = inboundOrder.InboundOrderNo,
BusinessType = inboundOrder.BusinessType,
- ProductionDate=DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss")
+ ProductionDate = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss")
});
-
+
item.ReceiptQuantity = item.BarcodeQty;
item.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ item.WarehouseCode = warehousearea != null ? warehousearea.Code : "";
}
if (stockInfo.Id == 0)
@@ -560,21 +565,21 @@
{
StockSumQuantity = 0,
StockCount = 0,
- UniqueUnit=""
+ UniqueUnit = ""
};
WebResponseContent content = new WebResponseContent();
try
{
if (string.IsNullOrWhiteSpace(orderNo))
{
- return content.Error("浼犲叆鐨勮鍗曞彿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("鏈壘鍒板崟鎹�");
+ return content.Error("鏈壘鍒板崟鎹�");
}
- var unitGroups = orderDetail.Details.GroupBy(d => d.Unit).ToList();
+ var unitGroups = orderDetail.Details.GroupBy(d => d.Unit).ToList();
if (unitGroups.Count == 1)
{
resultDTO.UniqueUnit = unitGroups.First().Key;
@@ -586,17 +591,17 @@
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())
+ if (validDetails.Any())
{
- resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);
+ resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);
// 鏄庣粏璁板綍鏁帮細绗﹀悎鏉′欢鐨勬湁鏁堣褰曟潯鏁�
resultDTO.StockCount -= validDetails.Count;
}
- return content.OK("",resultDTO);
+ return content.OK("", resultDTO);
}
catch (Exception ex)
{
- return content.Error("SumQuantity 缁熻搴撳瓨鏁伴噺澶辫触锛岃鍗曞彿锛歿OrderNo}");
+ return content.Error("SumQuantity 缁熻搴撳瓨鏁伴噺澶辫触锛岃鍗曞彿锛歿OrderNo}");
}
}
--
Gitblit v1.9.3