From 7c274192786484237d4260aa2590cbbb6a64a95d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 十二月 2025 11:42:29 +0800
Subject: [PATCH] 修改成品拣货逻辑
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 00f9118..0550afc 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -422,30 +422,37 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <param name="boxNo">绠辩爜</param>
/// <returns></returns>
- public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
+ public List<StockDetailWithQtyDto> GetStockQueryList(string locatNo, string palletNo, string boxNo)
{
- string dataSql = "";
+ string dataSql = "", whereStr = "";
if (string.IsNullOrWhiteSpace(boxNo))
{
- dataSql = $@"select SkuName,SkuNo,LotNo,sum(isnull(Qty,0)) as Qty,sum(isnull(LockQty,0)) as LockQty,sum(isnull(LockQty,0)) as FrozenQty
+ whereStr = string.IsNullOrWhiteSpace(locatNo) ? "1=1" : $@"LocatNo='{locatNo}'";
+
+ dataSql = $@"select SkuName,SkuNo,LotNo,LocatNo,PalletNo,sum(isnull(Qty,0)) as Qty,sum(isnull(LockQty,0)) as LockQty,sum(isnull(LockQty,0)) as FrozenQty
from DataStockDetail
- where IsDel='0' and (PalletNo='{palletNo}' or LocatNo='{locatNo}')
- group by SkuName,SkuNo,LotNo
+ where IsDel='0' and PalletNo='{palletNo}' and {whereStr}
+ group by SkuName,SkuNo,LotNo,LocatNo,PalletNo
order by SkuNo,LotNo";
}
else
{
- dataSql = $@"select SkuName,SkuNo,LotNo,sum(isnull(Qty,0)) as Qty,0 as LockQty,0 as FrozenQty
- from DataBoxInfo
- where IsDel='0' and BoxNo='{boxNo}' and PalletNo='{palletNo}'
- group by SkuName,SkuNo,LotNo
- order by SkuNo,LotNo";
+ whereStr = string.IsNullOrWhiteSpace(palletNo) ? "1=1" : $@"a.PalletNo='{palletNo}'";
+
+ dataSql = $@"select a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo,sum(isnull(a.Qty,0)) as Qty,0 as LockQty,0 as FrozenQty
+ from DataBoxInfo a
+ left join DataStockDetail b on b.Id=a.StockDetailId
+ where a.IsDel='0' and a.BoxNo='{boxNo}' and {whereStr}
+ group by a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo
+ order by a.SkuNo,a.LotNo";
}
- DataTable dataDt = await Db.Ado.GetDataTableAsync(dataSql);
+ DataTable dataDt = Db.Ado.GetDataTable(dataSql);
var result = dataDt.Rows.Cast<DataRow>().Select(e => new StockDetailWithQtyDto
{
+ LocatNo = e["LocatNo"] + "",
+ PalletNo = e["PalletNo"] + "",
SkuNo = e["SkuNo"] + "",
SkuName = e["SkuName"] + "",
LotNo = e["LotNo"] + "",
@@ -886,7 +893,7 @@
/// <param name="areaNo"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public List<string> GetLocatByArea(string areaNo)
+ public List<SysStorageLocatDto> GetLocatByArea(string areaNo)
{
try
{
@@ -894,7 +901,11 @@
{
throw new Exception("璇烽�夋嫨鍖哄煙");
}
- var _list = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.AreaNo == areaNo && w.WareHouseNo == "W04").Select(s => s.LocatNo).ToList();
+ var _list = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.AreaNo == areaNo && w.WareHouseNo == "W04").Select(s => new SysStorageLocatDto()
+ {
+ LocatNo = s.LocatNo,
+ Remark = s.Remark
+ }).ToList();
return _list;
}
--
Gitblit v1.8.0