From 6f8b21411a2a56f6a33fe0112c2ed0eeca407e9c Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 31 十二月 2025 17:31:56 +0800
Subject: [PATCH] 优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs | 8 +++++++-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs | 13 ++++++++-----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs | 5 +++++
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
index ce73ad8..bfd3697 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
@@ -21,6 +21,11 @@
[ExporterHeader(DisplayName = "浠撳簱ID")]
public int WarehouseId { get; set; }
/// <summary>
+ /// 搴撳瓨澶囨敞
+ /// </summary>
+ [ExporterHeader(DisplayName = "浠撳簱鍚嶇О")]
+ public string WarehouseName { get; set; }
+ /// <summary>
/// 璐т綅缂栧彿
/// </summary>
[ExporterHeader(DisplayName = "璐т綅缂栧彿")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
index a71f332..2befd70 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
@@ -195,7 +195,7 @@
//float stockMaxQty = stockInfo.Details.Max(x => x.StockQuantity);
//float stockMinQty = stockInfo.Details.Min(x => x.StockQuantity);
Dt_StockInfoDetail addstockInfoDetail = stockInfo.Details.OrderByDescending(x=>x.Id).FirstOrDefault();
- addstockInfoDetail.StockQuantity = takeStockOrderDetail.Qty;
+ addstockInfoDetail.StockQuantity = takeStockOrderDetail.Qty - takeStockOrderDetail.SysQty;
updateStockDetails.Add(addstockInfoDetail);
}
else if (takeStockOrderDetail.Qty==0) //鐩樹簭
@@ -302,11 +302,14 @@
};
eRPTakeStock.Details.Add(takeDetailsItem);
}
- string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
- ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
- if (erpRequestContent.res != 1)
+ if (eRPTakeStock.Details.Count>0)
{
- throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
+ string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
+ ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
+ if (erpRequestContent.res != 1)
+ {
+ throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
+ }
}
}
_unitOfWorkManage.CommitTran();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
index 319cad3..dc62d79 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
@@ -371,7 +371,7 @@
ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>().Where(whereLo);
EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
-
+ List<Dt_Warehouse> warehouses = _dbBase.Queryable<Dt_Warehouse>().ToList();
ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
=> new StockViewDTO
{
@@ -426,6 +426,12 @@
stockViewDTOs.AddRange(pklist.ToList());
stockViewDTOs.ForEach(x =>
{
+
+ Dt_Warehouse? warehouse = warehouses.FirstOrDefault(t => t.WarehouseId == x.WarehouseId);
+ if (warehouse!=null)
+ {
+ x.WarehouseName= warehouse.WarehouseName;
+ }
x.MaterielCode = (string.Join(",", x.Details.Select(x => x.MaterielCode).Distinct())) ?? "绌虹";
x.BatchNo = (string.Join(",", x.Details.Select(x => x.BatchNo).Distinct())) ?? "鏃�";
x.StockCounts = Math.Round(x.Details.Sum(x => x.StockQuantity),3).ToString() + x.Details.FirstOrDefault()?.Unit;
--
Gitblit v1.9.3