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_OutboundService/OutStockLockInfoService.cs | 67 ---------------------------------
1 files changed, 0 insertions(+), 67 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index cba7d6c..cde09cd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -124,73 +124,6 @@
return outStockLockInfo;
}
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="mesPPCutOutboundOrderDetail"></param>
- /// <param name="outStock"></param>
- /// <param name="assignQuantity"></param>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder, Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null)
- {
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
-
- foreach (var item in outStock)
- {
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
- {
- PalletCode = item.PalletCode,
- AssignQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
- MaterielCode = mesPPCutOutboundOrderDetail.MaterielCode,
- BatchNo = item.Details.FirstOrDefault().BatchNo,
- LocationCode = item.LocationCode,
- MaterielName = mesPPCutOutboundOrderDetail.MaterielName,
- OrderDetailId = mesPPCutOutboundOrderDetail.Id,
- OrderNo = mesPPCutOutboundOrder.OrderNo,
- OrderType = mesPPCutOutboundOrder.OrderType,
- OriginalQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = item.Id,
- TaskNum = taskNum,
- OrderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity,
- Unit = mesPPCutOutboundOrderDetail.Unit,
- ProductionDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
- };
- outStockLockInfos.Add(outStockLockInfo);
- }
-
- return outStockLockInfos;
- }
-
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
- {
-
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
- {
- PalletCode = outStock.PalletCode,
- AssignQuantity = assignQuantity,
- MaterielCode = mesPPOutboundOrder.MaterialCode,
- BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
- LocationCode = outStock.LocationCode,
- MaterielName = mesPPOutboundOrder.MaterialName,
- OrderDetailId = mesPPOutboundOrder.Id,
- OrderNo = mesPPOutboundOrder.OrderNo,
- OrderType = mesPPOutboundOrder.OrderType,
- OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = outStock.Id,
- TaskNum = taskNum,
- OrderQuantity = mesPPOutboundOrder.OrderQuantity,
- Unit = mesPPOutboundOrder.Unit,
- ProductionDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.EffectiveDate
- };
-
- return outStockLockInfo;
- }
-
public List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo)
{
return BaseDal.QueryData(x => x.OrderNo == OrderNo);
--
Gitblit v1.9.3