From f2392d984123a1402d6c9bab9e5452c7becc8d22 Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPH.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
index 409cbbb..3669f76 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
@@ -97,7 +97,7 @@
{
shouldRestart = false;
Dt_StationManger? RequestIn = stationMangers.FirstOrDefault(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt());
- WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}","寮�濮嬫墽琛�");
+ WriteInfo($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}鍒嗗灈鍙�","寮�濮嬫墽琛�");
while (true)
{
if (RequestIn != null)
@@ -111,7 +111,7 @@
if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.R_BoxCode) && conveyorLineInfoRead.R_Request == 1)
{
//鍒ゆ柇鏄惁浠诲姟宸茬粡瀛樺湪
- Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.BarCode == conveyorLineInfoRead.R_BoxCode.Trim() && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt());
+ Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.Db.Queryable<Dt_PackaxisTask>().Where(x => x.BarCode == conveyorLineInfoRead.R_BoxCode.Trim() && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()).First();
if (packaxisTask != null)
{
//鍐欏叆鎵ц鏁版嵁
@@ -165,7 +165,7 @@
}
catch (Exception ex)
{
- WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", $"寮傚父:{ex.Message}");
+ WriteInfo($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}鍒嗗灈鍙�", $"寮傚父:{ex.Message}");
Thread.Sleep(1500);
shouldRestart = true;
}
@@ -182,7 +182,7 @@
shouldRestart = false;
//鑾峰彇鎵�鏈夌爜鍨涘彛
List<Dt_StationManger> stationMangersMD = stationMangers.Where(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt()).ToList();
- WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", "寮�濮嬫墽琛�");
+ WriteInfo($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}鐮佸灈鍙�", "寮�濮嬫墽琛�");
while (true)
{
if (stationMangersMD.Count > 0)
@@ -230,7 +230,7 @@
}
catch (Exception ex)
{
- WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", $"寮傚父:{ex.Message}");
+ WriteInfo($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}鐮佸灈鍙�", $"寮傚父:{ex.Message}");
Thread.Sleep(1500);
shouldRestart = true;
}
--
Gitblit v1.9.3