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/wms/TaskHelper.cs | 28 ++++++++------
HH.WCS.QingXiNongfu/core/TaskCore.cs | 2
HH.WCS.QingXiNongfu/core/Monitor.cs | 5 +-
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 28 +++++++-------
4 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index a1c3502..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
@@ -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();
//缁欑粓鐐归攣瀹氫綇
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 1d0daeb..3b399fb 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -385,7 +385,7 @@
var totalX = 0;
var totalRows = 0;
var list = new List<KuRong>();
- var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
+ var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
areas.ForEach(area =>
{
totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X"));
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index f3d3628..87cce97 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -387,25 +387,18 @@
}
//缁堢偣璐т綅涓�YWLT1TSJCD 鎴栬� YWLT2TSJCD 鐨�瑕佸彇璐у畬鎴愯В閿佽捣鐐癸紝瑙ｇ粦璧风偣锛岀粦瀹氱粓鐐癸紝鍗歌揣瀹屾垚锛岃В閿佺粓鐐� 2025骞�鏈�0鏃� Plg
- if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
- {
- //瑙ｇ粦璧风偣
- CacheBitUpdate(mst, load: true);
- //缁戝畾缁堢偣
- CacheBitUpdate(mst, load: false);
- }
+ //if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
+ //{
+ // //瑙ｇ粦璧风偣
+ // CacheBitUpdate(mst, load: true);
+ // //缁戝畾缁堢偣
+ // CacheBitUpdate(mst, load: false);
+ //}
LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
}
//new List<string> { "鎴愬搧婊℃-鍏ュ簱", "" }
if (state == 6 || state == 5)
{
- ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
- if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
- {
- LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
- return r;
- }
-
LogHelper.Info($"浠诲姟绫诲瀷锛歿mst.S_TYPE}- 鍔ㄤ綔锛歿state}. 鏄惁5绠�锛焮mst.S_TYPE.Contains("鎴愬搧婊℃") || mst.S_TYPE.Contains("澶囪揣")} ");
if (mst.S_TYPE.Contains("澶囪揣"))
{
@@ -413,6 +406,13 @@
}
else if (state == 5) goto vvv;
+ ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
+ //if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
+ //{
+ // LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
+ // return r;
+ //}
+
if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
{
mst.S_CNTRS = "J" + Settings.GetTimeStamp();
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index fc7d2f0..3a93956 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -239,20 +239,24 @@
{
var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
//鍏堣В閿佺粓鐐�鍦ㄩ攣瀹�- db.Ado.BeginTran();
- try
+ //db.Ado.BeginTran();
+ //try
+ //{
+ // model.S_LOCK_STATE = "鏃�;
+ // var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+ // LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:閿佺粨鏋� + res);
+ // db.Ado.CommitTran();
+ //}
+ //catch (Exception ex)
+ //{
+ // db.Ado.RollbackTran();
+ // LogHelper.Info("CreateTask 澶辫触 " + ex.Message);
+ //}
+ if (model != null)
{
- model.S_LOCK_STATE = "鏃�;
- var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
- LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:閿佺粨鏋� + res);
- db.Ado.CommitTran();
+ LogHelper.Info(task.S_TWO_END_LOC + "浜屾浠诲姟 寮�銆�");
+ var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
}
- catch (Exception ex)
- {
- db.Ado.RollbackTran();
- LogHelper.Info("CreateTask 澶辫触 " + ex.Message);
- }
- var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
}
}
internal static void Fail(WMSTask task)
--
Gitblit v1.9.1