From 9ddec4808631025d36d3c5a816d55ef77a29d4c7 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期三, 16 七月 2025 17:30:30 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
index 68614f6..2e43d3e 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
@@ -253,7 +253,7 @@
}
else
{
- locs = queryable.Where((a, b, c) => c.S_FLTYPE == powderType && c.S_BS_TYPE == "浣欐枡").ToList();
+ locs = queryable.Where((a, b, c) => (c.S_FLTYPE == powderType||string.IsNullOrEmpty(c.S_FLTYPE)) && c.S_BS_TYPE == "浣欐枡").ToList();
}
//娌℃湁浣欐枡鍒欏鎵惧叏閮ㄧ墿鏂�@@ -262,7 +262,7 @@
queryable = db.Queryable<Location>()
.LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
.LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode && c.S_FLTYPE == powderType);
+ .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode );
//鍏綅鐮佸尮閰嶅墠鍏綅锛屽叾浠栫殑鍏ㄩ儴閰嶇疆
if (ItemCode.Trim().Length == 6)
{
@@ -290,7 +290,7 @@
}
else
{
- locs = queryable.Where((a, b, c) => c.S_FLTYPE == powderType ).ToList();
+ locs = queryable.Where((a, b, c) => c.S_FLTYPE == powderType || string.IsNullOrEmpty(c.S_FLTYPE)).ToList();
}
LogHelper.Info($"GetLocByItemCode=>鏃犱綑鏂�鏌ユ壘鍏ㄩ儴{JsonConvert.SerializeObject(locs)}");
}
--
Gitblit v1.9.1