From 35530048d4e2c46f2c43f335f94d2176b21c9852 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 24 七月 2025 14:43:04 +0800
Subject: [PATCH] 最新代码上传，环线，WMS逻辑等
---
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 84 ------------------------------------------
1 files changed, 0 insertions(+), 84 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index e6e6e09..a00e2d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -115,90 +115,6 @@
return null;
}
}
- /// <summary>
- /// 鏌ヨ璁㈠崟PP绔嬪簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (mesPPCutOutboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(mesPPCutOutboundOrder.WarehouseId);
-
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
-
- return null;
- }
- }
-
- /// <summary>
- /// 鏌ヨ璁㈠崟PP骞冲簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder outboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => a.LocationCode.Contains("AGV_PP"), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
- }
- }
--
Gitblit v1.9.3