From f40ba2a9fb9d3c2ece08e9a7cd987d4744dccab2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 15:22:05 +0800
Subject: [PATCH] 优化库内移库，堆垛机和穿梭车交互逻辑
---
项目资料/WCS系统说明.doc | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs | 6 +++
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/bb49972a-b044-4a21-ac51-b32604fe6d49.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 6 ++
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a404cf44-bf45-4800-bacc-70b82a705411.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 5 ++
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/25585229-6bad-4cdd-9b1f-5629949b9da7.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs | 8 ++--
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt | 0
/dev/null | 0
项目资料/WMS系统说明.docx | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/445ff65e-2052-4f6c-8f42-c1beeaccfb2d.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 15 +++++--
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 44 ++++++++++++++++------
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d5eeaae2-4865-409f-b83a-bf42477f0c8a.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs | 16 ++++----
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
23 files changed, 74 insertions(+), 34 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/25585229-6bad-4cdd-9b1f-5629949b9da7.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/25585229-6bad-4cdd-9b1f-5629949b9da7.vsidx"
new file mode 100644
index 0000000..9db2cdb
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/25585229-6bad-4cdd-9b1f-5629949b9da7.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d6e6ae17-a2a9-4859-92dc-b4483160fa76.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/445ff65e-2052-4f6c-8f42-c1beeaccfb2d.vsidx"
similarity index 72%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d6e6ae17-a2a9-4859-92dc-b4483160fa76.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/445ff65e-2052-4f6c-8f42-c1beeaccfb2d.vsidx"
index 3fa0cd6..975e34a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d6e6ae17-a2a9-4859-92dc-b4483160fa76.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/445ff65e-2052-4f6c-8f42-c1beeaccfb2d.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/6d478573-69d5-4e15-a862-2f3ae6d039ff.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/6d478573-69d5-4e15-a862-2f3ae6d039ff.vsidx"
deleted file mode 100644
index 8082f26..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/6d478573-69d5-4e15-a862-2f3ae6d039ff.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a2f1f49a-fc73-487d-98bb-d2eebec01318.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a2f1f49a-fc73-487d-98bb-d2eebec01318.vsidx"
deleted file mode 100644
index 9383e12..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a2f1f49a-fc73-487d-98bb-d2eebec01318.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/bb49972a-b044-4a21-ac51-b32604fe6d49.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/bb49972a-b044-4a21-ac51-b32604fe6d49.vsidx"
new file mode 100644
index 0000000..4d430b0
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/bb49972a-b044-4a21-ac51-b32604fe6d49.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/28efea41-07e3-4d22-b9fa-c24f03e882f0.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d5eeaae2-4865-409f-b83a-bf42477f0c8a.vsidx"
similarity index 85%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/28efea41-07e3-4d22-b9fa-c24f03e882f0.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d5eeaae2-4865-409f-b83a-bf42477f0c8a.vsidx"
index 2497d1d..3cbc72c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/28efea41-07e3-4d22-b9fa-c24f03e882f0.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d5eeaae2-4865-409f-b83a-bf42477f0c8a.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
index 7c88d88..b567f65 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
@@ -67,7 +67,7 @@
else if (type == typeof(CarChargingTaskEnum))
{
List<int> taskInboundTypes = type.GetEnumIndexList();
- return taskInboundTypes.Where(x => x > currentStatus && x < (int)CarChargingTaskEnum.RelocationCarFinish).OrderBy(x => x).FirstOrDefault();
+ return taskInboundTypes.Where(x => x > currentStatus && x < (int)CarChargingTaskEnum.CarChargingFinish).OrderBy(x => x).FirstOrDefault();
}
else
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
index 384e3c6..4498821 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
@@ -235,49 +235,49 @@
/// 鏂板缓鍏呯數浠诲姟
/// </summary>
[Description("鏂板缓鍏呯數浠诲姟")]
- CarNew = 500,
+ CarChargingNew = 500,
/// <summary>
/// 绌挎杞﹀洖闆朵腑
/// </summary>
[Description("绌挎杞﹀洖闆朵腑")]
- ShuttleCar_Executing = 510,
+ CarCharging_Executing = 510,
/// <summary>
/// 绌挎杞﹀洖闆跺畬鎴�
/// </summary>
[Description("绌挎杞﹀洖闆跺畬鎴�")]
- ShuttleCar_Finish = 520,
+ CarCharging_Finish = 520,
/// <summary>
/// 鍫嗗灈鏈虹Щ杞︽墽琛屼腑
/// </summary>
[Description("鍫嗗灈鏈虹Щ杞︽墽琛屼腑")]
- SC_CarExecuting = 530,
+ CarChargingSC_CarExecuting = 530,
/// <summary>
/// 鍫嗗灈鏈虹Щ杞﹀畬鎴�
/// </summary>
[Description("鍫嗗灈鏈虹Щ杞﹀畬鎴�")]
- SC_CarFinish = 540,
+ CarChargingSC_CarFinish = 540,
/// <summary>
/// 绌挎杞﹀厖鐢典腑
/// </summary>
[Description("绌挎杞﹀厖鐢典腑")]
- ShuttleCar_Charging = 550,
+ CarCharging_Charging = 550,
/// <summary>
/// 绌挎杞﹀厖鐢靛畬鎴�
/// </summary>
[Description("绌挎杞﹀厖鐢靛畬鎴�")]
- ShuttleCar_ChargingFinish = 560,
+ CarCharging_ChargingFinish = 560,
/// <summary>
/// 鍏呯數瀹屾垚
/// </summary>
[Description("鍏呯數瀹屾垚")]
- RelocationCarFinish = 590,
+ CarChargingFinish = 590,
}
/// <summary>
/// 绉诲簱浠诲姟鐘舵��
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index affebea..751f62a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -153,6 +153,11 @@
/// <param name="currentAddress">褰撳墠鍦板潃</param>
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
Dt_Task QueryStackerCraneOutTask(string deviceNo, string currentAddress = "");
+ /// <summary>
+ /// 鏌ヨ绌挎杞﹀嚭搴撳畬鎴愪换鍔�
+ /// </summary>
+ /// <returns></returns>
+ Dt_Task QueryCarOutFinish();
/// <summary>
/// 鏌ヨ绌挎杞﹀嚭鍏ュ簱浠诲姟
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user"
index 91898bf..2357434 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user"
@@ -6,7 +6,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\IISText\鑺滄箹涓変竴\WCS</_PublishTargetUrl>
- <History>True|2025-05-20T03:49:19.9344988Z;True|2025-05-19T16:43:32.2157734+08:00;True|2025-05-19T16:12:01.9378787+08:00;True|2025-05-15T16:58:47.2930537+08:00;True|2025-05-15T13:17:15.3596644+08:00;True|2025-05-15T13:11:17.2616075+08:00;True|2025-05-15T12:57:49.7942020+08:00;True|2025-05-15T12:38:37.7925022+08:00;True|2025-05-15T12:28:15.6975809+08:00;True|2025-05-15T11:44:00.9991686+08:00;True|2025-05-15T10:37:45.5900920+08:00;True|2025-05-14T11:31:54.9438366+08:00;True|2025-05-14T09:59:15.2570833+08:00;True|2025-05-14T09:57:55.8054307+08:00;True|2025-05-14T09:39:18.3194886+08:00;True|2025-05-13T17:13:53.4476748+08:00;True|2025-05-13T15:21:11.2441407+08:00;True|2025-05-13T10:39:40.0223843+08:00;True|2025-05-09T11:16:41.1746344+08:00;True|2025-04-27T19:58:33.9706872+08:00;True|2025-04-27T14:52:52.9853720+08:00;True|2025-04-21T17:54:03.6534614+08:00;True|2025-04-19T10:28:25.0898569+08:00;True|2025-04-17T14:04:50.3243452+08:00;True|2025-03-27T16:23:43.2657011+08:00;True|2025-03-25T12:01:47.0052741+08:00;True|2025-02-14T17:36:18.5767695+08:00;True|2025-02-14T14:39:49.5856199+08:00;</History>
+ <History>True|2025-06-17T07:08:30.3988621Z;True|2025-06-17T11:49:45.7757057+08:00;False|2025-06-17T11:46:12.2872897+08:00;True|2025-06-17T11:14:34.8780060+08:00;True|2025-06-17T10:58:01.4890300+08:00;True|2025-05-20T11:49:19.9344988+08:00;True|2025-05-19T16:43:32.2157734+08:00;True|2025-05-19T16:12:01.9378787+08:00;True|2025-05-15T16:58:47.2930537+08:00;True|2025-05-15T13:17:15.3596644+08:00;True|2025-05-15T13:11:17.2616075+08:00;True|2025-05-15T12:57:49.7942020+08:00;True|2025-05-15T12:38:37.7925022+08:00;True|2025-05-15T12:28:15.6975809+08:00;True|2025-05-15T11:44:00.9991686+08:00;True|2025-05-15T10:37:45.5900920+08:00;True|2025-05-14T11:31:54.9438366+08:00;True|2025-05-14T09:59:15.2570833+08:00;True|2025-05-14T09:57:55.8054307+08:00;True|2025-05-14T09:39:18.3194886+08:00;True|2025-05-13T17:13:53.4476748+08:00;True|2025-05-13T15:21:11.2441407+08:00;True|2025-05-13T10:39:40.0223843+08:00;True|2025-05-09T11:16:41.1746344+08:00;True|2025-04-27T19:58:33.9706872+08:00;True|2025-04-27T14:52:52.9853720+08:00;True|2025-04-21T17:54:03.6534614+08:00;True|2025-04-19T10:28:25.0898569+08:00;True|2025-04-17T14:04:50.3243452+08:00;True|2025-03-27T16:23:43.2657011+08:00;True|2025-03-25T12:01:47.0052741+08:00;True|2025-02-14T17:36:18.5767695+08:00;True|2025-02-14T14:39:49.5856199+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
index 8220bbc..59b47ef 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_ShuttleCar.cs"
@@ -61,9 +61,9 @@
break;
case 10://鍏呯數瀹屾垚
{
- if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == (int)CarChargingTaskEnum.ShuttleCar_Charging)//绉昏溅鍏呯數
+ if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == (int)CarChargingTaskEnum.CarCharging_Charging)//绉昏溅鍏呯數
{
- task.TaskState = CarChargingTaskEnum.RelocationCarFinish.ObjToInt();
+ task.TaskState = CarChargingTaskEnum.CarChargingFinish.ObjToInt();
AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绌挎杞﹀厖鐢靛畬鎴�");
}
@@ -77,9 +77,9 @@
task.TaskState = TaskCarStatusEnum.ShuttleCar_Finish.ObjToInt();
UpdateData(task);
}
- else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == CarChargingTaskEnum.ShuttleCar_Executing.ObjToInt())//绉昏溅鍏呯數
+ else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt() && task.TaskState == CarChargingTaskEnum.CarCharging_Executing.ObjToInt())//绉昏溅鍏呯數
{
- task.TaskState = CarChargingTaskEnum.ShuttleCar_Finish.ObjToInt();
+ task.TaskState = CarChargingTaskEnum.CarCharging_Finish.ObjToInt();
UpdateData(task);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
index c3db50e..1349970 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
@@ -108,7 +108,7 @@
BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ杞﹀畬鎴�");
}
- else if (task.TaskState == (int)CarChargingTaskEnum.SC_CarExecuting)
+ else if (task.TaskState == (int)CarChargingTaskEnum.CarChargingSC_CarExecuting)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<CarChargingTaskEnum>();
task.TaskState = nextStatus;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 1ab6133..f667a95 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -273,6 +273,11 @@
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && !string.IsNullOrEmpty(x.NextAddress) && x.CurrentAddress == currentAddress, TaskOrderBy);
}
+ public Dt_Task QueryCarOutFinish()
+ {
+ Dt_Task? _Task = BaseDal.QueryFirst(x => TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.Car_OutFinish, TaskOrderBy);
+ return _Task;
+ }
/// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟
/// </summary>
@@ -436,7 +441,7 @@
}
else if (task.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt())
{
- if (task.TaskState >= (int)CarChargingTaskEnum.RelocationCarFinish)
+ if (task.TaskState >= (int)CarChargingTaskEnum.CarChargingFinish)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
@@ -641,12 +646,12 @@
{
if (!string.IsNullOrEmpty(SourceAddress) && SourceAddress != "")
{
- Dt_Task? task = BaseDal.QueryFirst(x => x.SourceAddress == SourceAddress && x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt());
+ Dt_Task? task = BaseDal.QueryFirst(x => x.SourceAddress == SourceAddress && (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() || x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
if (task != null) return;
}
if (!string.IsNullOrEmpty(TargetAddress) && TargetAddress != "")
{
- Dt_Task? task = BaseDal.QueryFirst(x => x.TargetAddress == TargetAddress && x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt());
+ Dt_Task? task = BaseDal.QueryFirst(x => x.TargetAddress == TargetAddress && (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() || x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
if (task != null) return;
}
#region 鍒涘缓鍫嗗灈鏈虹Щ杞︿换鍔�
@@ -662,12 +667,12 @@
NextAddress = TargetAddress,
CreateDate = DateTime.Now,
Creater = "WCS",
- TaskState = string.IsNullOrEmpty(remark) ? (int)TaskCarStatusEnum.CarNew : (int)CarChargingTaskEnum.CarNew,
+ TaskState = string.IsNullOrEmpty(remark) ? (int)TaskCarStatusEnum.CarNew : (int)CarChargingTaskEnum.CarChargingNew,
ShuttleCarCode = ShuttleCarCode,
WMSId = 0,
Remark = remark
};
- if (SourceAddress == TargetAddress) dt_Task.TaskState = (int)CarChargingTaskEnum.SC_CarFinish;
+ if (SourceAddress == TargetAddress) dt_Task.TaskState = (int)CarChargingTaskEnum.CarChargingSC_CarFinish;
AddData(dt_Task);
#endregion
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
index 45ec7ba..aff3ceb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
@@ -31,7 +31,7 @@
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
_taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
}
- dt_Task = GetTask(CarChargingTaskEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
+ dt_Task = GetTask(CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
@@ -74,7 +74,7 @@
{
#region 鑾峰彇鏂板缓绉昏溅鍏呯數浠诲姟
- Dt_Task dt_Task = GetTask((int)CarChargingTaskEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
+ Dt_Task dt_Task = GetTask((int)CarChargingTaskEnum.CarChargingNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
if (dt_Task != null && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
{
if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
@@ -210,11 +210,31 @@
if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
{
#region 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀瓨鍦ㄤ换鍔�
- Dt_Task? _Task = _taskRepository.QueryFirst(x =>
- x.SourceAddress == _ShuttleCar.ShuttleCarPosition ||
- x.TargetAddress == _ShuttleCar.ShuttleCarPosition &&
- (!_taskService.TaskOutboundTypes.Contains(x.TaskType)));
- if (_Task != null) return (ok, _ShuttleCar);
+ Dt_Task? _Task = _taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition);
+ if (_Task != null)
+ {
+ if (_Task.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() ||
+ _Task.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() ||
+ _Task.TaskState == TaskCarStatusEnum.CarNew.ObjToInt() ||
+ _Task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt())
+ {
+ _Task.ShuttleCarCode = shuttleCar.DeviceCode;
+ SendTask(_Task);
+ return (ok, _ShuttleCar);
+ }
+ }
+ _Task = _taskRepository.QueryFirst(x => x.TargetAddress == _ShuttleCar.ShuttleCarPosition);
+ if (_Task != null)
+ {
+ if (_Task.TaskState == TaskInStatusEnum.SC_InFinish.ObjToInt() ||
+ _Task.TaskState == TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt() ||
+ _Task.TaskState == CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt())
+ {
+ _Task.ShuttleCarCode = shuttleCar.DeviceCode;
+ SendTask(_Task);
+ return (ok, _ShuttleCar);
+ }
+ }
_Task = _taskRepository.QueryData(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode && _taskService.TaskOutboundTypes.Contains(x.TaskType)).OrderByDescending(x => x.CreateDate).FirstOrDefault();
if (_Task != null)
{
@@ -282,7 +302,7 @@
}
else if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCarCharging)
{
- shuttleCarTaskCommand.TaskType = task.TaskState == CarChargingTaskEnum.CarNew.ObjToInt() ?
+ shuttleCarTaskCommand.TaskType = task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt() ?
(short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) :
(short)GetCarTaskType(ShuttleCarTaskType.Charging.ToString());
}
@@ -299,7 +319,7 @@
{
if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
{
- if (!string.IsNullOrEmpty(task.Remark) && task.TaskState == CarChargingTaskEnum.CarNew.ObjToInt())
+ if (!string.IsNullOrEmpty(task.Remark) && task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt())
task.Remark = task.Remark + "宸蹭笅鍙�";
task.TaskState = GetTaskState(task.TaskType, task.TaskState);
_taskService.UpdateData(task);
@@ -385,9 +405,9 @@
state = (int)TaskCarStatusEnum.ShuttleCar_Executing;
break;
case (int)TaskOtherTypeEnum.RelocationCarCharging:
- state = state < (int)CarChargingTaskEnum.SC_CarFinish ?
- (int)CarChargingTaskEnum.ShuttleCar_Executing :
- (int)CarChargingTaskEnum.ShuttleCar_Charging;
+ state = state < (int)CarChargingTaskEnum.CarChargingSC_CarFinish ?
+ (int)CarChargingTaskEnum.CarCharging_Executing :
+ (int)CarChargingTaskEnum.CarCharging_Charging;
break;
default:
break;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 481cdc7..b6be071 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -91,7 +91,7 @@
if (common.RunStatus == (short)RunStatus.Standby)
{
var Task = _taskService.GetTaskState((int)TaskCarStatusEnum.ShuttleCar_Finish, (int)TaskOtherTypeEnum.RelocationCar);//鑾峰彇绉昏溅浠诲姟
- var Task1 = _taskService.GetTaskState((int)CarChargingTaskEnum.ShuttleCar_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging);//鑾峰彇绉昏溅鍏呯數浠诲姟
+ var Task1 = _taskService.GetTaskState((int)CarChargingTaskEnum.CarCharging_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging);//鑾峰彇绉昏溅鍏呯數浠诲姟
if (Task != null)
{
SendTask(commonStackerCrane, Task);
@@ -137,6 +137,10 @@
else if (!task.TargetIsPickPlace && ShuttleCar == null)
{
_taskService.AddRelocationCarTask("", task.TargetAddress);
+ #region 鏌ヨ
+ task = _taskService.QueryCarOutFinish();
+ if (task != null) SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
+ #endregion
}
else
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs"
index 6754049..9d81eb2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneExtend/SignalInteraction.cs"
@@ -67,6 +67,12 @@
else
{
Dt_ShuttleCar? shuttleCar1 = _shuttleCarService.QueryCode(task.ShuttleCarCode);
+ if (task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt() && task.Remark == "")
+ {
+ shuttleCar1 = _shuttleCarService.QueryNoCode(task.ShuttleCarCode);
+ task.Remark = shuttleCar1.ShuttleCarCode;
+ _taskService.UpdateData(task);
+ }
if (shuttleCar1 != null)
{
ShuttleCar shuttleCar = Storage.Devices.FirstOrDefault(x => x.DeviceName == shuttleCar1.ShuttleCarName) as ShuttleCar;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c399bf07-f7a9-4d73-b733-5e15ae7a5bcd.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a404cf44-bf45-4800-bacc-70b82a705411.vsidx"
similarity index 88%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c399bf07-f7a9-4d73-b733-5e15ae7a5bcd.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a404cf44-bf45-4800-bacc-70b82a705411.vsidx"
index d3b5054..ff873cc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c399bf07-f7a9-4d73-b733-5e15ae7a5bcd.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a404cf44-bf45-4800-bacc-70b82a705411.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 35b26e1..0140e08 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 4957c23..f347b82 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
index 187d462..fdb1ea6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
index 3eba8d3..80ee4e4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 672f5d7..38ac7a9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -120,9 +120,9 @@
VueDictionaryDTO vueDictionaryDTO = GetVueDictionary(item.Trim());
if (vueDictionaryDTO != null)
{
+ vueDictionaryDTOs.Add(vueDictionaryDTO);
if (!_cacheService.Exists(item))
{
- vueDictionaryDTOs.Add(vueDictionaryDTO);
_cacheService.Add(item, vueDictionaryDTO.Serialize());
}
}
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/WCS\347\263\273\347\273\237\350\257\264\346\230\216.doc" "b/\351\241\271\347\233\256\350\265\204\346\226\231/WCS\347\263\273\347\273\237\350\257\264\346\230\216.doc"
new file mode 100644
index 0000000..6733777
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/WCS\347\263\273\347\273\237\350\257\264\346\230\216.doc"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/WMS\347\263\273\347\273\237\350\257\264\346\230\216.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/WMS\347\263\273\347\273\237\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..e9d5a07
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/WMS\347\263\273\347\273\237\350\257\264\346\230\216.docx"
Binary files differ
--
Gitblit v1.9.3