From 08d4252c79d088d7bf97a08d314ec8577d96e2d2 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 14 六月 2025 19:57:47 +0800
Subject: [PATCH] 火警
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
index 637b479..2c38342 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
@@ -1,4 +1,5 @@
锘�#region MyRegion
+
#region << 鐗� 鏈� 娉� 閲� >>
/*----------------------------------------------------------------
@@ -20,37 +21,24 @@
using AutoMapper;
using HslCommunication;
-using Microsoft.AspNetCore.Server.HttpSys;
using Newtonsoft.Json;
using Quartz;
-using SqlSugar;
-using System.Diagnostics.CodeAnalysis;
-using System.Net;
using System.Reflection;
-using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
-using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core;
-using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
-using WIDESEAWCS_Core.HttpContextUser;
using WIDESEAWCS_DTO.MOM;
-using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IProcessRepository;
-using WIDESEAWCS_ISystemRepository;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
-using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
namespace WIDESEAWCS_Tasks
@@ -95,6 +83,7 @@
if (conveyorLine != null)
{
#region 绔欏彴鏂瑰紡
+
List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
foreach (var station in stationManagers)
@@ -112,6 +101,7 @@
}
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
+
//var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
//if (tokenInfos == null || !tokenInfos.Any())
//{
@@ -130,9 +120,11 @@
#endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
}
- #endregion
+
+ #endregion 绔欏彴鏂瑰紡
#region 璺敱鏂瑰紡
+
//List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
//foreach (string childDeviceCode in childDeviceCodes)
//{
@@ -168,7 +160,8 @@
// }
// }
//}
- #endregion
+
+ #endregion 璺敱鏂瑰紡
}
}
catch (Exception ex)
@@ -198,7 +191,7 @@
needBarcode.inLineNum = _taskRepository.QueryData(x => x.TargetAddress == station.stationChildCode).Count();
//鑻ュ湪閫旀暟閲忓皬浜庣洰鏍囦綅缃殑缂撳瓨鏁伴噺 鍒欏鎵惧搴斿父娓╁簱瀛樹腑甯告俯3宸ュ簭鐨勫彲鍑哄簱鏁版嵁 骞跺缓绔嬪嚭搴撲换鍔�
- if (needBarcode.inLineNum <= needBarcode.cacheNum)
+ if (needBarcode.inLineNum < needBarcode.cacheNum)
{
if (_taskService.RequestOutTaskToBZAsync(station).Result.Status)
{
@@ -226,7 +219,7 @@
conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, task.NextAddress, station.stationChildCode);
_taskRepository.DeleteData(task);
- if (needBarcode.inLineNum-- <= 0) needBarcode.inLineNum = 0;
+ if (--needBarcode.inLineNum <= 0) needBarcode.inLineNum = 0;
_needBarcodeRepository.UpdateData(needBarcode);
}
else //濡傛棤浠诲姟 鍒欏垽瀹氫负浠嶯G鍙ｄ笂鏂� 璋冨彇MOM鎺ュ彛 鍒ゆ柇杩斿洖鍙傛暟 鏃犲紓甯稿垯閫佸叆鍖呰锛屾湁寮傚父鍒欓��鍥濶G鍙�
@@ -274,4 +267,5 @@
}
}
}
+
#endregion
\ No newline at end of file
--
Gitblit v1.9.3