From a44d4ac81a863fb3b93e1c8ad8526ef754c24615 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 18 十二月 2024 09:08:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 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 5c4209b..de66c45 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"
@@ -1,4 +1,5 @@
锘縰sing AutoMapper;
+using MailKit.Search;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
using System;
@@ -70,7 +71,54 @@
}
}
+ public StockOutboundOrderDTO GetStockOutboundOrder(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();
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
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