From 260d6082a7e53e0f040365a763da9bcf952118bd Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 04 九月 2024 16:51:46 +0800
Subject: [PATCH] 修改平库出库页面单据加载托盘位置功能
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 4c54ba8..2c65e4c 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1198,6 +1198,17 @@
var info = Db.Queryable<BllExportAllot>()
.LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
.Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
+ .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo}).Select((a,b) => new BoxInfo()
+ {
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo
+ }).ToListAsync();
+ var data = await info;
+
+ /*v var info = Db.Queryable<BllExportAllot>()
+ .LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
+ .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
.GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo, a.PalletNo,b.LocatNo }).Select((a,b) => new BoxInfo()
{
PalletNo = a.PalletNo,
@@ -1206,22 +1217,41 @@
LotNo = a.LotNo,
LocatNo = b.LocatNo
}).ToListAsync();
+ var data = await info;*/
+
+ return data;
+ }
+
+ //鑾峰彇骞冲簱鍗曟嵁涓墭鐩樹綅缃俊鎭�
+ public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string skuno,string lotno)
+ {
+
+ var info = Db.Queryable<BllExportAllot>()
+ .LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
+ .LeftJoin<SysWareHouse>((a,b,c)=>b.WareHouseNo == c.WareHouseNo)
+ .LeftJoin<SysStorageArea>((a,b,c,d)=>b.AreaNo == d.AreaNo)
+ .Where(a => a.IsDel == "0" && (a.Status == "0" || a.Status == "1") && a.SONo == soNo && a.SkuNo == skuno && a.LotNo == lotno)
+ .GroupBy((a, b,c,d) => new { a.PalletNo, b.LocatNo,c.WareHouseName,d.AreaName }).Select((a, b,c,d) => new BoxInfo()
+ {
+ PalletNo = a.PalletNo,
+ LocatNo = b.LocatNo,
+ WareHouseName = c.WareHouseName,
+ AreaName = d.AreaName
+ }).ToListAsync();
var data = await info;
- /*var a = info.First().LocatNo;
-
- if (await info.CountAsync() == 0)
- {
- throw Oops.Bah("鏈煡璇㈠埌鎵樼洏鍒嗛厤涓嬪彂鐨勪俊鎭�");
- }
-
- var data = await info.GroupBy(a => new { a.SkuNo, a.SkuName, a.LotNo,a.PalletNo }).Select(a => new BoxInfo()
- {
- PalletNo = a.PalletNo,
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- LotNo = a.LotNo
- }).ToListAsync();*/
+ /*v var info = Db.Queryable<BllExportAllot>()
+ .LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
+ .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
+ .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo, a.PalletNo,b.LocatNo }).Select((a,b) => new BoxInfo()
+ {
+ PalletNo = a.PalletNo,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo,
+ LocatNo = b.LocatNo
+ }).ToListAsync();
+ var data = await info;*/
return data;
}
--
Gitblit v1.8.0