From 96e6dc957aee5d20218ac8127a28db6a7e6ba6de Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 10:00:52 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 55 +++++++++++++++----------------------------------------
1 files changed, 15 insertions(+), 40 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
index de66c45..47bcaf4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
@@ -71,54 +71,29 @@
}
}
- public StockOutboundOrderDTO GetStockOutboundOrder(SaveModel saveModel)
+ public WebResponseContent StockQueryData(SaveModel saveModel)
{
try
{
- var palletCode = saveModel.MainData["barcode"].ToString();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
- if (stockInfo == null)
- {
- throw new Exception($"鏈壘鍒板簱瀛樹俊鎭�");
- }
- Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
- if (stockInfoDetail == null)
- {
- throw new Exception($"鏈壘鍒板簱瀛樿鎯�");
- }
- BaseDal.QueryTabs<Dt_OutboundOrder, Dt_OutboundOrderDetail, StockOutboundOrderDTO>((a, b) => a.Id == b.OrderId, (a, b) => new StockOutboundOrderDTO
- {
- OrderNo = a.OrderNo,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = stockInfo.PalletCode,
- BatchNo = b.BatchNo,
- OrderQuantity = b.OrderQuantity,
- OverOutQuantity = b.OverOutQuantity,
- OutboundQuantity = stockInfoDetail.OutboundQuantity,
- SerialNumber = stockInfoDetail.SerialNumber,
- StockQuantity = stockInfoDetail.StockQuantity,
-
- }, a => true, b => b.BatchNo == stockInfoDetail.BatchNo && b.MaterielCode == stockInfoDetail.MaterielCode, x => true).Select(x => new StockOutboundOrderDTO
- {
- OrderNo = x.OrderNo,
- MaterielCode = x.MaterielCode,
- MaterielName = x.MaterielName,
- PalletCode = x.PalletCode,
- BatchNo = x.BatchNo,
- OrderQuantity = x.OrderQuantity,
- OverOutQuantity = x.OverOutQuantity,
- OutboundQuantity = x.OutboundQuantity,
- SerialNumber = x.SerialNumber,
- StockQuantity = x.StockQuantity,
- }).ToList();
- return new StockOutboundOrderDTO();
+ var barcode = saveModel.MainData["barcode"].ToString();
+ var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).Includes(x => x.Details).First();
+ if (stockInfo == null) throw new Exception("鏈壘鍒版墭鐩樹俊鎭�");
+ return WebResponseContent.Instance.OK(data: stockInfo);
}
catch (Exception ex)
{
- return null;
+ return WebResponseContent.Instance.Error(ex.Message);
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="stockInfos"></param>
+ /// <param name="materielCode"></param>
+ /// <param name="needQuantity"></param>
+ /// <param name="residueQuantity"></param>
+ /// <returns></returns>
public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, float needQuantity, out float residueQuantity)
{
List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
--
Gitblit v1.9.3