From fa0426311c6984388d3c15928e1a687836c19b24 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 17 六月 2025 18:05:33 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 3690997..75c3937 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1018,7 +1018,7 @@
//InworkLock = false;
var usingSpace = new List<string> { "鍏ュ簱鎺ラ┏鍖�, "搴撳唴鎺ラ┏鍖�, "鍑哄簱鎺ラ┏鍖�, "鎻愬崌鏈洪�鏂欏彛" };
//usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
- usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLT1TSJ", "YWLT2TSJ" };
+ usingSpace = new List<string> { "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
foreach (var area in usingSpace)
{
try
@@ -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))
@@ -3669,7 +3669,7 @@
}
else
{
- Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.N_CURRENT_NUM == 0);
+ Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x =>x.S_LOCK_STATE=="鏃� && x.N_CURRENT_NUM == 0);
}
if (StartBit != null && Endbit != null)
@@ -3691,7 +3691,6 @@
var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, EndBit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
if (b)
{
-
var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
var db = new SqlHelper<object>().GetInstance();
//缁欑粓鐐归攣瀹氫綇
@@ -3704,16 +3703,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