From 9cbdf67973c15ddbebb8c3e754f616c7024c692f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 17 三月 2024 17:00:29 +0800
Subject: [PATCH] 修改bug问题
---
Wms/WMS.BLL/Logic/AllotSku.cs | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/Wms/WMS.BLL/Logic/AllotSku.cs b/Wms/WMS.BLL/Logic/AllotSku.cs
index 37dc98c..e54bfcb 100644
--- a/Wms/WMS.BLL/Logic/AllotSku.cs
+++ b/Wms/WMS.BLL/Logic/AllotSku.cs
@@ -275,31 +275,68 @@
var Db = DataContext.Db;
var data = new List<StockDetailDto>();
- //搴撳鎵樼洏
- var detail1 = palletList.Where(m => string.IsNullOrWhiteSpace(m.LocatNo)).ToList();
- //骞冲簱鍐呮墭鐩�
- var detail2 = palletList.Where(m => m.WareHouseNo == "W02").ToList();
- //绔嬪簱鍐呮墭鐩�
- var detail3 = palletList.Where(m => m.WareHouseNo == "W01").ToList();
+ var list = palletList.Select(m => new StockDetailDto()
+ {
+ Id = m.Id,
+ LotNo = m.LotNo,
+ LotText = m.LotText,
+ SupplierLot = m.SupplierLot,
+ OwnerNo = m.OwnerNo,
+ OwnerName = m.OwnerName,
+ SupplierNo = m.SupplierNo,
+ SupplierName = m.SupplierName,
+ SkuNo = m.SkuNo,
+ SkuName = m.SkuName,
+ Standard = m.Standard,
+ Qty = m.Qty,
+ LockQty = m.LockQty,
+ FrozenQty = m.FrozenQty,
+ InspectQty = m.InspectQty,
+ ASNNo = m.ASNNo,
+ ASNDetailNo = m.ASNDetailNo,
+ WareHouseNo = m.WareHouseNo,
+ RoadwayNo = m.RoadwayNo,
+ AreaNo = m.AreaNo,
+ LocatNo = m.LocatNo,
+ PalletNo = m.PalletNo,
+ PalletNo2 = m.PalletNo2,
+ PalletNo3 = m.PalletNo3,
+ CompleteTime = m.CompleteTime,
+ ProductionTime = m.ProductionTime,
+ ExpirationTime = m.ExpirationTime,
+ Status = m.Status,
+ InspectMark = m.InspectMark,
+ BitPalletMark = m.BitPalletMark,
+ InspectStatus = m.InspectStatus,
+ InspectTime = m.InspectTime,
+ PackagNo = m.PackagNo,
+ IsBale = m.IsBale,
+ IsBelt = m.IsBelt,
+ Demo = m.Demo,
- var data1 = detail1.Select(m => new StockDetailDto()).ToList();
- var data2 = detail2.Select(m => new StockDetailDto()).ToList();
- var data3 = detail3.Select(m => new StockDetailDto()).ToList();
- foreach (var item in data2)
+ }).ToList();
+ //搴撳鎵樼洏
+ var detail1 = list.Where(m => string.IsNullOrWhiteSpace(m.LocatNo)).ToList();
+ //骞冲簱鍐呮墭鐩�
+ var detail2 = list.Where(m => m.WareHouseNo == "W02").ToList();
+ //绔嬪簱鍐呮墭鐩�
+ var detail3 = list.Where(m => m.WareHouseNo == "W01").ToList();
+
+ foreach (var item in detail2)
{
var dept = item.LocatNo.Substring(5,2);
item.Dept = int.Parse(dept);
}
- foreach (var item in data3)
+ foreach (var item in detail3)
{
var dept = item.LocatNo.Substring(6, 2);
item.Dept = int.Parse(dept);
}
- data.AddRange(data1);
- data.AddRange(data2.OrderBy(m => m.Dept).ToList());
- data.AddRange(data3.OrderBy(m => m.Dept).ToList());
+ data.AddRange(detail1);
+ data.AddRange(detail2.OrderBy(m => m.Dept).ToList());
+ data.AddRange(detail3.OrderBy(m => m.Dept).ToList());
return data;
}
--
Gitblit v1.8.0