From a7bc7b8dc6e31ce888a254c17b5587f59877d592 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期三, 11 六月 2025 16:23:24 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 17 ++++++++++++-----
HH.WCS.QingXiNongfu/core/Monitor.cs | 18 +++++++++++++++++-
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 808024a..7fac184 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -3605,11 +3605,27 @@
if (StartBit != null && Endbit != null)
{
var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
- var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
+ var EndBit = Endbit.S_LOC_CODE;
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ {
+ EndBit = "YWLWJJB";
+ }
+ 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();
+ //缁欑粓鐐归攣瀹氫綇
+ if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+ {
+ var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == Endbit.S_LOC_CODE).First();
+
+ model.S_LOCK_STATE = "鍏ュ簱閿�;
+ var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+ 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)
{
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index 39e81ec..cfb02d7 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -1,4 +1,5 @@
-锘縰sing HH.WCS.QingXigongchang.util;
+锘縰sing HH.WCS.QingXigongchang.process;
+using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -217,6 +218,10 @@
task.T_END_TIME = DateTime.Now;
db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
}
+ if (task.S_END_LOC == "YWLWJJB")
+ {
+ var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_NOTE, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
+ }
}
internal static void Fail(WMSTask task)
{
@@ -264,10 +269,12 @@
LogHelper.Info(wmsTask.S_START_LOC + "LockLoc:閿佺粨鏋� + res);
model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == wmsTask.S_END_LOC).First();
-
- model.S_LOCK_STATE = "鍏ュ簱閿�;
- res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
- LogHelper.Info(wmsTask.S_END_LOC + "LockLoc:閿佺粨鏋� + res);
+ if (wmsTask.S_START_LOC != "YWLWJJB")
+ {
+ model.S_LOCK_STATE = "鍏ュ簱閿�;
+ res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+ LogHelper.Info(wmsTask.S_END_LOC + "LockLoc:閿佺粨鏋� + res);
+ }
}
db.Insertable(wmsTask).ExecuteCommand();
db.Ado.CommitTran();
--
Gitblit v1.9.1