From 5721831b2d7e8aae0e45f951e35f65533a344f94 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 17 六月 2025 16:19:27 +0800
Subject: [PATCH] qx
---
HH.WCS.QingXiNongfu/Program.cs | 4 ++--
HH.WCS.QingXiNongfu/core/Monitor.cs | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index dc5b122..5e51377 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -175,10 +175,10 @@
{
//Console.WriteLine(item);
}
- //var v = new string[] { "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" };
+ //var v = new string[] { "HS-12BHQ", "HS-C_XC", "1HS-C_XC", "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" };
//foreach (var item in v)
//{
- // var m = System.Text.RegularExpressions.Regex.IsMatch(item, @"QX-\d+_X$");
+ // var m = System.Text.RegularExpressions.Regex.IsMatch(item,@"^HS-[A-Z]+_");// @"QX-\d+_X$");
// if (m)
// {
// Console.WriteLine(m);
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 3690997..a1c3502 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -3628,7 +3628,7 @@
Location StartBit = null;
List<LocCntrRel> _clrel = new List<LocCntrRel>();
- foreach (var area in v.Concat(od.S_ROW.Split('$')).Distinct())
+ foreach (var area in v) //.Concat(od.S_ROW.Split('$')).Distinct())
{
var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
@@ -3704,16 +3704,16 @@
LogHelper.Info(Endbit.S_LOC_CODE + "LockLoc:閿佺粨鏋� + res);
}
//鎺掗攣
- var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
- if (row != null)
- {
- if (row.S_LOCK_SRC != r.S_LOCK_SRC)
- {
- db.Deleteable(row).ExecuteCommand();
- db.Insertable(r).ExecuteCommand();
- }
- }
- else db.Insertable(r).ExecuteCommand();
+ //var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
+ //if (row != null)
+ //{
+ // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ // {
+ // db.Deleteable(row).ExecuteCommand();
+ // db.Insertable(r).ExecuteCommand();
+ // }
+ //}
+ //else db.Insertable(r).ExecuteCommand();
od.TagOverTime = DateTime.Now;
db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
break;
--
Gitblit v1.9.1