From 65ddd36c0036014ff656417767b4a9438efb76b1 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 15 五月 2025 17:32:31 +0800
Subject: [PATCH] bug处理
---
wms/LocationHelper.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index f806d68..80debd3 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -8,6 +8,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using Top.Api;
using static HH.WCS.ZhongCeJinTan.util.Settings;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;
@@ -68,7 +69,7 @@
internal static List<Location> GetAllLocList1(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a=> a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a=> a.N_ROW).OrderBy(a => a.N_COL).ToList();
}
/// <summary>
@@ -77,7 +78,7 @@
internal static List<Location> GetAllLocList2(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).ToList();
+ return db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).ToList();
}
@@ -87,7 +88,7 @@
internal static List<string> GetConnectionList(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE).OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
List<string> result = new List<string>();
foreach (var item in ConnectionList)
{
@@ -176,10 +177,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE=="鏃�&& a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE=="鏃�&& a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
@@ -253,10 +254,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
@@ -313,10 +314,10 @@
{
other = rowList.Where(b => b.S_LOCK_STATE == "鏃�).OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
}
- if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "绂佺敤"))
+ if (other != null && (!string.IsNullOrEmpty(other.C_ENABLE) && other.C_ENABLE == "N"))
{
//绂佺敤浜嗛�鎷╁悗闈竴涓揣浣�- other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
+ other = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "N") && a.S_AREA_CODE == other.S_AREA_CODE && a.S_LOCK_STATE == "鏃� && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
}
if (other != null)
{
@@ -675,6 +676,8 @@
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鎸夌敓浜ф椂闂存帓搴忕墿鏂欎俊鎭� + JsonConvert.SerializeObject(startItem), "Mes浠诲姟涓嬪彂");
if (startItem!=null)
{
+
+
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_CNTR_CODE == startItem.S_CNTR_CODE).First();
start = LocationHelper.GetLocOne(tp.S_LOC_CODE);
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
--
Gitblit v1.9.1