From b72cc2c63309f58b94d8b5d7bbac4103145244de Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 12 三月 2024 16:02:48 +0800
Subject: [PATCH] 问题修改
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 8c8c157..0afc859 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -902,7 +902,7 @@
{
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
- EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
+ EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
}
else
{
@@ -1041,7 +1041,7 @@
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
string EndLocat = string.Empty;//鐩爣浣嶇疆
- EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo);
+ EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
//寮�鍚簨鍔�
Db.BeginTran();
@@ -1102,7 +1102,7 @@
/// <param name="skuNo"></param>
/// <param name="lotNo"></param>
/// <returns></returns>
- private string GetLocat(string areaNo,string skuNo,string lotNo)
+ private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo)
{
try
{
@@ -1110,7 +1110,7 @@
//褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
//鍚屽尯鍩熷悓鎵规鐗╂枡鐨勫偍浣嶄俊鎭�
- List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo)
+ List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
.OrderByDescending(o=>o.LocatNo).Select(s=>s.LocatNo).Distinct().ToList();
foreach (var item in locatList)
{
--
Gitblit v1.8.0