From aeb971fe12b73d83d31a83b00f0a6e2876b24a00 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 21:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs | 83 +++--------------------------------------
1 files changed, 6 insertions(+), 77 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
index 9b4d943..54859c8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
@@ -12,6 +12,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core.Helper;
@@ -27,7 +28,7 @@
namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
- public class TestJob : JobBase, IJob
+ public partial class TestJob : JobBase, IJob
{
private readonly ITaskService _taskService;
private readonly IStationMangerService _stationMangerService;
@@ -50,84 +51,14 @@
// _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�-
try
{
- List<Dt_Task> Uptasks = new List<Dt_Task>();
- var taskList = _taskService.Repository.QueryData(x => x.TaskType == TaskTypeEnum.CPInbound.ObjToInt() && x.TaskState == TaskStatusEnum.CheckShapeing.ObjToInt());
- var AGVtaskList = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt()&& (x.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || x.TaskType == TaskTypeEnum.Q3CK.ObjToInt()));//1-6鍜�6-1妤间换鍔�
- //浠诲姟鐨勭洰鏍囧湴鍧�瀵逛簬绔欏彴鍙凤紱
- foreach (var task in taskList)
- {
- if (device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_QualityInspection, task.SourceAddress))
- {
- device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, false, task.SourceAddress);
- //鍐嶈鍙栬川妫�缁撴灉
- var qualityResult = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_QualityInspectionInProgress, task.SourceAddress);
- //宸﹁秴瀹借鍛�
- var R_LeftOverWidthWarning = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_LeftOverWidthWarning, task.SourceAddress);
- //鍙宠秴瀹借鍛�
- var R_RightWideWarning = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_RightWideWarning, task.SourceAddress);
- //瓒呴珮璀﹀憡
- var R_ExtremeWarning = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_ExtremeWarning, task.SourceAddress);
- //鍐欏叆鍋滄璐ㄦ淇″彿
- device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, true, task.SourceAddress);
- Thread.Sleep(500);
- device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
- if (qualityResult)
- {
- //濡傛灉璐ㄦ閫氳繃浜嗭紝灏辨妸浠诲姟鐘舵�佹敼涓鸿川妫�瀹屾垚
- task.TaskState = TaskStatusEnum.CheckShapeingOk.ObjToInt();
- task.ExceptionMessage = "";
- Uptasks.Add(task);
- }
- else
- {
- task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
- task.ExceptionMessage = "澶栨澶辫触";
- if (R_LeftOverWidthWarning) task.ExceptionMessage += ",宸﹁秴瀹�";
- if (R_RightWideWarning) task.ExceptionMessage += ",鍙宠秴瀹�";
- if (R_ExtremeWarning) task.ExceptionMessage += ",瓒呴珮";
- Uptasks.Add(task);
- //鍐欏叆澶嶄綅淇″彿
- //device.SetValue(QualityInspectionCommandEnum.FaultReset, true, task.SourceAddress);
- }
- }
- //else
- //{
- // //鍐欏叆鍋滄璐ㄦ淇″彿
- // device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
- // device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
- //}
- }
- foreach (var item in AGVtaskList)
- {
+ SXCTasks(device);
- //into杩涘叆涓�妤间綅缃殑鏃跺�欙紝鍐欏叆杩涘叆淇″彿
- device.SetValue(QualityInspectionCommandEnum.RequestToEnter, true, item.TargetAddress);
- if (!device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.Blocking)==true)
- {
- item.ExceptionMessage = $"{item.TargetAddress}绔欏彴鍏夋爡涓嶄负true锛�1锛�!";
- }
- var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum);
- if (result.Status == false)
- {
- if (item.ExceptionMessage != result.Message)
- {
- item.ExceptionMessage = result.Message;
- Uptasks.Add(item);
- }
- continue;
- }
- item.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
- item.ExceptionMessage = "";
- Uptasks.Add(item);
+ KHTasks(device);
- }
+ //WriteInfo(device.DeviceName, "infoLog");
-
- _taskService.UpdateData(Uptasks);
- WriteInfo(device.DeviceName, "infoLog");
-
- WriteDebug(device.DeviceName, "debugLog");
+ //WriteDebug(device.DeviceName, "debugLog");
}
catch (Exception ex)
{
@@ -138,8 +69,6 @@
{
WriteError(nameof(TestJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
}
-
-
return Task.CompletedTask;
}
}
--
Gitblit v1.9.3