From f723c6e9087a2110a28572543c7cfd9104e2a4ed Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 20:52:58 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/油墨仓/CommonHoisterJob.cs | 57 ++++++++-------------------------------------------------
1 files changed, 8 insertions(+), 49 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
index 6152060..62c0a55 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
@@ -64,7 +64,7 @@
if (leisure && tray && !requestIn && !inbounding && !requestOut && !outbounding)
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskInStatusEnum.InNew.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && x.SourceAddress == deviceChildCode);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && x.SourceAddress == deviceChildCode && _taskService.TaskInboundTypes.Contains(x.TaskType));
if (task != null)
{
bool isWrite = hoister.SetValue(HoisterDBName.RequestIn, true, deviceChildCode);
@@ -73,7 +73,7 @@
}
else if (!leisure && tray && requestIn && inbounding && !requestOut && !outbounding)
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskInStatusEnum.InNew.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && x.SourceAddress == deviceChildCode);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && x.SourceAddress == deviceChildCode && _taskService.TaskInboundTypes.Contains(x.TaskType));
if (task != null)
{
Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationDeviceCode == deviceChildCode);
@@ -91,8 +91,8 @@
task.TargetAddress = locationCode;
task.NextAddress = locationCode;
- task.Roadway = stationManger.StackerCraneCode;
- task.TaskState = TaskInStatusEnum.SC_InExecute.ObjToInt();
+ task.DeviceCode = stationManger.StackerCraneCode;
+ task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
_taskRepository.UpdateData(task);
bool isWrite = hoister.SetValue(HoisterDBName.RequestIn, false, deviceChildCode);
@@ -104,7 +104,7 @@
}
else if (leisure && !tray && !requestIn && !inbounding && !requestOut && !outbounding)
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress));
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && _taskService.TaskOutboundTypes.Contains(x.TaskType));
if (task != null)
{
bool isWrite = hoister.SetValue(HoisterDBName.RequestOut, true, deviceChildCode);
@@ -113,7 +113,7 @@
}
else if (!leisure && !tray && !requestIn && !inbounding && requestOut && outbounding)
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskInStatusEnum.InNew.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && x.SourceAddress == deviceChildCode);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && _taskService.TaskOutboundTypes.Contains(x.TaskType));
if (task != null)
{
Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationDeviceCode == deviceChildCode);
@@ -125,8 +125,8 @@
task.TargetAddress = deviceChildCode;
task.NextAddress = deviceChildCode;
- task.Roadway = stationManger.StackerCraneCode;
- task.TaskState = TaskInStatusEnum.SC_InExecute.ObjToInt();
+ task.DeviceCode = stationManger.StackerCraneCode;
+ task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
_taskRepository.UpdateData(task);
bool isWrite = hoister.SetValue(HoisterDBName.RequestIn, false, deviceChildCode);
@@ -136,47 +136,6 @@
WriteInfo(hoister.DeviceName, $"鏈壘鍒板搴旂珯鍙颁俊鎭�,{deviceChildCode}");
}
}
-
-
- //if (tray && leisure)
- //{
- //#region 鏌ヨ缁勭洏淇℃伅
- //鍚慦MS鐢宠鏌ヨ褰撳墠鎻愬崌鏈哄彛鐨勭粍鐩樹俊鎭紝瀛樺湪缁勭洏淇℃伅杩斿洖鍏ュ簱浠诲姟骞跺彂鍑哄叆搴撶敵璇�
- //var task = _taskService.QueryExecutingConveyorLineTask(1, deviceChildCode);
- //if (Leisure && task != null)
- // Hoister.SetValue(HoisterDBName.RequestIn, true, deviceChildCode);
-
- //#endregion
- //var Inbounding = Hoister.GetValue<HoisterDBName, bool>(HoisterDBName.Inbounding, deviceChildCode);
- //if (Inbounding && task != null)
- //{
- // task.TaskState = (int)TaskInStatusEnum.SC_InExecute;
- // task.NextAddress = "001-003-001";
- // _taskService.UpdateData(task);
- // //鏇存柊浠诲姟鐘舵�佸苟鍙栨秷鍏ュ簱鐢宠
- // Hoister.SetValue(HoisterDBName.RequestIn, false, deviceChildCode);
- //}
- //}
- //else
- //{
-
-
- //鏌ヨ鍑哄簱浠诲姟,瀛樺湪鍑哄簱浠诲姟鍙戝嚭鍑哄簱鐢宠
- //var task = _taskService.QueryExecutingConveyorLineTask(2, deviceChildCode);
- //if (task != null && Leisure)
- // Hoister.SetValue(HoisterDBName.RequestOut, true, deviceChildCode);
- //var Outbounding = Hoister.GetValue<HoisterDBName, bool>(HoisterDBName.Outbounding, deviceChildCode);
- //if (Outbounding && task != null)
- //{
- // task.NextAddress = deviceChildCode;
- // task.TargetAddress = deviceChildCode;
- // task.TaskState = (int)TaskOutStatusEnum.OutNew;
- // _taskService.UpdateData(task);
- // //鏇存柊浠诲姟鐘舵�佸苟鍙栨秷鍑哄簱鐢宠
- // Hoister.SetValue(HoisterDBName.RequestOut, false, deviceChildCode);
- //}
- //}
-
}
}
}
--
Gitblit v1.9.3