From 0c2124ab83fcc330e9620f02fbf02dedf8980526 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:56:43 +0800
Subject: [PATCH] 优化海康AGV三楼四楼任务
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index a563dd1..12352e6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -94,11 +94,11 @@
{
List<object> objects = new List<object>();
foreach (var item in taskDTOs)
- {
+ {
foreach (var task in item.tasks)
{
#region 鍒ゆ柇
- var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
if (!contentStatus.Status)
{
objects.Add(new
@@ -107,7 +107,6 @@
Message = $"浠诲姟鍙枫�恵task.taskCode}銆憑content.Message}"
});
continue;
- //throw new Exception(content.Message);
}
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode && x.TaskType == item.taskType) != null)
{
@@ -142,6 +141,7 @@
#endregion
switch (item.taskType)
{
+ #region 鍑箰澹獳GV闈㈡枡搴�
case (int)TaskTypeEnum.MLInbound:
content = CreateKLSNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -150,6 +150,8 @@
content = CreateKLSNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
+ #region 鏃疯鍥涘悜杞︽垚鍝佸簱
case (int)TaskTypeEnum.CPInbound:
content = CreateRGVNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -158,22 +160,30 @@
content = CreateRGVNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJInbound:
+ #endregion
+ #region 娴峰悍AGV
+ case (int)TaskTypeEnum.Q1TSJ4:
content = CreateHKNewInTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJOutbound:
+ case (int)TaskTypeEnum.STU0003:
+ case (int)TaskTypeEnum.CHUKU1:
content = CreateHKNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.Carry:
+ case (int)TaskTypeEnum.F01:
+ case (int)TaskTypeEnum.Q3RK:
+ case (int)TaskTypeEnum.Q3CK:
content = CarryTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJCarry:
+ case (int)TaskTypeEnum.F02:
+ case (int)TaskTypeEnum.RK3F:
+ case (int)TaskTypeEnum.CK3F:
content = CJCarryTaske(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
default:
objects.Add(new
{
@@ -212,7 +222,7 @@
var deviceName = "";
try
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode&&x.TaskType!=TaskTypeEnum.CPMoveInventory.ObjToInt());
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode && x.TaskType != TaskTypeEnum.CPMoveInventory.ObjToInt());
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
@@ -221,13 +231,13 @@
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK;
//杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
#region 鍑箰澹�
if (isGALAXISTask)
{
- deviceName= "鍑箰澹獳GV";
+ deviceName = "鍑箰澹獳GV";
KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
@@ -256,7 +266,7 @@
if (isAGV)
{
deviceName = "鍥涘悜杞�";
- if (dt_Task.RGVTaskId==0)
+ if (dt_Task.RGVTaskId == 0)
{
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
@@ -1127,18 +1137,18 @@
{
//璇诲彇鍏夌數淇″彿
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
- if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�") ;
+ if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
foreach (var item in sta)
{
- bool value = device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
- list.Add(new
- {
- LoctionCode = item.StationCode,
- LocationStatus = value?100:0,
- EnableStatus = 0,
- });
+ bool value = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = value ? 100 : 0,
+ EnableStatus = 0,
+ });
}
content.OK(data: list);
}
@@ -1332,6 +1342,6 @@
}
-
+
}
}
--
Gitblit v1.9.3