From c0d5e7c40f87c18fc7c53ffd810069d0b41cb849 Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期五, 20 三月 2026 16:47:48 +0800
Subject: [PATCH] 同步
---
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs | 266 ++++++++++++++++++++++++++++------------------------
1 files changed, 143 insertions(+), 123 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
index a90b5b0..48ff77f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
@@ -1,11 +1,14 @@
锘縰sing Mapster;
+using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using Quartz;
using System.Diagnostics.CodeAnalysis;
using System.Text;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.HttpContextUser;
@@ -66,15 +69,19 @@
List<string> childCodes = commonStackerCrane.DeviceProDTOs.GroupBy(d => d.DeviceChildCode).Select(g => g.Key).ToList();
Parallel.For(0, childCodes.Count, (i, state) =>
{
-
- ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戞椂闂淬�恵DateTime.Now}銆戙�戙�恵Thread.CurrentThread.ManagedThreadId}銆�", ConsoleColor.Magenta);
-
- if (commonStackerCrane.GetValue<StackerCraneDBName, byte>(StackerCraneDBName.TaskState, childCodes[i]) == 2)
+ //ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戞椂闂淬�恵DateTime.Now}銆戙�戙�恵Thread.CurrentThread.ManagedThreadId}銆�", ConsoleColor.Magenta);
+ if (commonStackerCrane.GetValue<StackerCraneDBName, Int16>(StackerCraneDBName.TaskState, childCodes[i]) == 2)
{
- int taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.CurrentTaskNum, childCodes[i]);
- byte workStatus = commonStackerCrane.GetValue<StackerCraneDBName, byte>(StackerCraneDBName.TaskState, childCodes[i]);
+ int taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.TaskNum, childCodes[i]);
+ int workStatus = commonStackerCrane.GetValue<StackerCraneDBName, Int16>(StackerCraneDBName.TaskState, childCodes[i]);
+
+ bool RfidError = commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkTemp1, childCodes[i]);
ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戝爢鍨涙満浣滀笟鐘舵�侊細銆恵workStatus}銆戞椂闂淬�恵DateTime.Now}", ConsoleColor.Magenta);
+ if (RfidError)
+ {
+ ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戝爢鍨涙満浣滀笟寮傚父锛歊FID寮傚父;鏃堕棿銆恵DateTime.Now}", ConsoleColor.Magenta);
+ }
string str = $"銆恵childCodes[i]}銆戜换鍔″畬鎴�,浠诲姟鍙凤細銆恵taskNum}銆戞椂闂淬�恵DateTime.Now}銆�";
WriteInfo(childCodes[i], str);
@@ -84,12 +91,21 @@
if (task == null)
{
commonStackerCrane.SetValue(StackerCraneDBName.CMD, 2, childCodes[i]);
+ if (commonStackerCrane.GetValue<StackerCraneDBName, Int16>(StackerCraneDBName.TaskState, childCodes[i]) == 0)
+ {
+ commonStackerCrane.SetValue(StackerCraneDBName.CMD, 0, childCodes[i]);
+ }
}
else
{
var content = _taskService.StackCraneTaskCompleted(taskNum);
- var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 2, childCodes[i]);
+ var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.CMD, 2, childCodes[i]);
+ if (commonStackerCrane.GetValue<StackerCraneDBName, Int16>(StackerCraneDBName.TaskState, childCodes[i]) == 0)
+ {
+ Thread.Sleep(500);
+ commonStackerCrane.SetValue(StackerCraneDBName.CMD, 0, childCodes[i]);
+ }
str = $"銆恵childCodes[i]}銆慦MS|WCS浠诲姟瀹屾垚锛氥�恵content.Status}銆�,鍫嗗灈鏈哄畬鎴愪俊鍙峰啓鍏ワ細銆恵isWorkType}銆�,浠诲姟鍙凤細銆恵taskNum}銆戞椂闂淬�恵DateTime.Now}銆�";
WriteInfo(childCodes[i], str);
ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
@@ -99,29 +115,35 @@
if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Online, childCodes[i]) //鍦ㄧ嚎
&& commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Free, childCodes[i]) //绌洪棽
&& !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Alarm, childCodes[i]) //鏃犳姤璀�
- && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Goods, childCodes[i]) //杞借揣鍙版棤璐�
- && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Flag, childCodes[i]) //璐у弶鍚敤
+ && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkGoods, childCodes[i]) //杞借揣鍙版棤璐�
+ //&& commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkFlag, childCodes[i]) //璐у弶鍚敤
)
{
+ Console.WriteLine($"褰撳墠鍫嗗灈鏈簕childCodes[i]}");
Dt_Task? task = GetTask(commonStackerCrane, childCodes[i]);
if (task != null)
{
- StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
- if (stackerCraneTaskCommand != null)
+ //StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
+ //if (stackerCraneTaskCommand != null)
+ //{
+ var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.TaskNo, childCodes[i]);
+ //var taskBarCode = commonStackerCrane.GetValue<StackerCraneDBName, string>(StackerCraneDBName.Barcode);
+ ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戝爢鍨涙満浠诲姟鍙凤細銆恵taskNum}銆戜换鍔′换鍔″彿锛氥�恵task.TaskNum}銆�", ConsoleColor.DarkBlue);
+ if (taskNum != task.TaskNum)
{
- var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.CurrentTaskNum, childCodes[i]);
- //var taskBarCode = commonStackerCrane.GetValue<StackerCraneDBName, string>(StackerCraneDBName.Barcode);
- ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戝爢鍨涙満浠诲姟鍙凤細銆恵taskNum}銆戜换鍔′换鍔″彿锛氥�恵task.TaskNum}銆�", ConsoleColor.DarkBlue);
- if (taskNum == 0)
+ ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戜换鍔″彿涓恒�恵0}銆�,浠诲姟鍙蜂笉涓�鑷村彲浠ヤ笅鍙戜换鍔�", ConsoleColor.DarkBlue);
+
+ Thread.Sleep(500);
+ WebResponseContent responseContent = SendStackerTask(commonStackerCrane, task, childCodes[i]);
+ if(responseContent.Status)
{
- ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戜换鍔″彿涓恒�恵0}銆�,浠诲姟鍙蜂笉涓�鑷村彲浠ヤ笅鍙戜换鍔�", ConsoleColor.DarkBlue);
-
- Thread.Sleep(500);
- bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand, childCodes[i]);
-
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
+ //StackerExecutor.SendStackerTask(commonStackerCrane, task, childCodes[i]);
+ //bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand, childCodes[i]);
+ //commonStackerCrane.LastTaskType = task.TaskType;
}
+ //}
}
}
});
@@ -146,15 +168,15 @@
task = _taskService.QueryExcutingTask(childCode);
if (task != null)
{
- ConsoleHelper.WriteErrorLine($"鍫嗗灈鏈哄瓨鍦ㄦ墽琛屼腑鐨勪换鍔�,璇锋鏌�");
+ ConsoleHelper.WriteErrorLine($"{childCode}鍫嗗灈鏈哄瓨鍦ㄦ墽琛屼腑鐨勪换鍔�,璇锋鏌�");
return null;
}
- task = _taskService.QueryRelocationTask(childCode);
- if (task != null)
- {
- return task;
- }
+ //task = _taskService.QueryRelocationTask(childCode);
+ //if (task != null)
+ //{
+ // return task;
+ //}
if (commonStackerCrane.LastTaskType == null)
{
@@ -198,7 +220,7 @@
_noticeService.Logs(userTokenIds, new { commonStackerCrane.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
WriteInfo(commonStackerCrane.DeviceName, log);
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneInTask(childCode);
}
else
{
@@ -207,21 +229,20 @@
}
else if (task == null)
{
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneInTask(childCode);
}
- if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- var relocation = _taskService.InBeforeCheck(task.TaskNum);
+ //if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ //{
+ // var relocation = _taskService.InBeforeCheck(task.TaskNum);
- if (relocation != null)
- {
- return relocation;
- }
- }
+ // if (relocation != null)
+ // {
+ // return relocation;
+ // }
+ //}
return task;
}
-
/// <summary>
/// 鍑哄簱浠诲姟鍒ゆ柇鍑哄簱绔欏彴鏄惁琚崰鐢�
@@ -230,15 +251,34 @@
/// <returns>濡傛灉鏈鍗犵敤锛岃繑鍥炰紶鍏ョ殑浠诲姟淇℃伅锛屽惁鍒欙紝杩斿洖null</returns>
private Dt_Task? OutTaskStationIsOccupied([NotNull] Dt_Task task)
{
- Dt_Router? router = _routerService.QueryNextRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
+ //return task;
- //Dt_Router? router = _routerService.QueryNextRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
+ var stationList = _stationManagerRepository.QueryData(x => x.stationType == 2 && x.Roadway == task.Roadway);
+
+ //foreach (var item in stationList)
+ //{
+ // IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == item.stationPLC);
+ // if (device != null)
+ // {
+ // CommonConveyorLineTZ conveyorLine = (CommonConveyorLineTZ)device;
+ // if (conveyorLine.IsOccupied(item.stationChildCode))//鍑哄簱绔欏彴鏈鍗犵敤
+ // {
+ // return task;
+ // }
+ // }
+ // else
+ // {
+ // _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒板嚭搴撶珯鍙般�恵item.stationChildCode}銆戝搴旂殑閫氳瀵硅薄锛屾棤娉曞垽鏂嚭搴撶珯鍙版槸鍚﹁鍗犵敤");
+ // }
+ //}
+
+ Dt_Router? router = _routerService.QueryNextRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
if (router != null)
{
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
if (device != null)
{
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ CommonConveyorLineTZ conveyorLine = (CommonConveyorLineTZ)device;
if (conveyorLine.IsOccupied(router.ChildPosi))//鍑哄簱绔欏彴鏈鍗犵敤
{
return task;
@@ -256,109 +296,89 @@
return null;
}
- /// <summary>
- /// 浠诲姟瀹炰綋杞崲鎴愬懡浠odel
- /// </summary>
- /// <param name="task">浠诲姟瀹炰綋</param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public StackerCraneTaskCommand? ConvertToStackerCraneTaskCommand([NotNull] Dt_Task task)
+ public WebResponseContent SendStackerTask(STK commonStackerCrane, Dt_Task task, string scName)
{
- StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
-
- stackerCraneTaskCommand.TrayCode = "";
- stackerCraneTaskCommand.TaskNo = task.TaskNum;
- stackerCraneTaskCommand.TaskType = 1;
- stackerCraneTaskCommand.Goods_Type = 0;
- stackerCraneTaskCommand.CMD = 1;
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
+ WebResponseContent responseContent = new WebResponseContent();
+ try
{
- List<Dt_Router> routers = _routerService.QueryNextRoutes(task.CurrentAddress, task.Roadway);
- if (routers.Count > 0)
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
{
- stackerCraneTaskCommand.S_Row = Convert.ToInt16(routers.FirstOrDefault().SrmRow);
- stackerCraneTaskCommand.S_Bay = Convert.ToInt16(routers.FirstOrDefault().SrmColumn);
- stackerCraneTaskCommand.S_level = Convert.ToInt16(routers.FirstOrDefault().SrmLayer);
-
- string[] targetCodes = task.NextAddress.Split("-");
- if (targetCodes.Length == 3)
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(task.CurrentAddress, task.Roadway);
+ if (routers.Count > 0)
{
- stackerCraneTaskCommand.E_Row = Convert.ToInt16(targetCodes[0]) /*% 2 != 0 ? (short)1 : (short)2*/;
- stackerCraneTaskCommand.E_Bay = Convert.ToInt16(targetCodes[1]);
- stackerCraneTaskCommand.E_level = Convert.ToInt16(targetCodes[2]);
+ commonStackerCrane.SetValue(StackerCraneDBName.S_Row, Convert.ToInt16(routers.FirstOrDefault().SrmRow), scName);//鏉ユ簮璐т綅琛�
+ commonStackerCrane.SetValue(StackerCraneDBName.S_Bay, Convert.ToInt16(routers.FirstOrDefault().SrmColumn), scName);//鏉ユ簮璐т綅鍒�
+ commonStackerCrane.SetValue(StackerCraneDBName.S_level, Convert.ToInt16(routers.FirstOrDefault().SrmLayer), scName);//鏉ユ簮璐т綅灞�
+
+
+ string[] targetCodes = task.NextAddress.Split("-");
+ if (targetCodes.Length == 3)
+ {
+ commonStackerCrane.SetValue(StackerCraneDBName.E_Row, Convert.ToInt16(targetCodes[0]), scName);//鐩殑璐т綅琛�
+ commonStackerCrane.SetValue(StackerCraneDBName.E_Bay, Convert.ToInt16(targetCodes[1]), scName);//鐩殑璐т綅鍒�
+ commonStackerCrane.SetValue(StackerCraneDBName.E_level, Convert.ToInt16(targetCodes[2]), scName);//鐩殑璐т綅灞�
+ }
+ else
+ {
+ //鏁版嵁閰嶇疆閿欒
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍏ュ簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
+ return responseContent.Error();
+ }
}
else
{
- //鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍏ュ簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
- return null;
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.NextAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鍙栬揣绔欏彴淇℃伅");
+ return responseContent.Error();
}
}
- else
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.NextAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鍙栬揣绔欏彴淇℃伅");
- return null;
- }
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- List<Dt_Router> routers = _routerService.QueryNextRoutes(task.Roadway, task.TargetAddress);
- if (routers.Count > 0)
- {
- stackerCraneTaskCommand.E_Row = Convert.ToInt16(routers.FirstOrDefault().SrmRow);
- stackerCraneTaskCommand.E_Bay = Convert.ToInt16(routers.FirstOrDefault().SrmColumn);
- stackerCraneTaskCommand.E_level = Convert.ToInt16(routers.FirstOrDefault().SrmLayer);
-
- string[] sourceCodes = task.CurrentAddress.Split("-");
- if (sourceCodes.Length == 3)
+ var OutStation = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
+ //List<Dt_Router> routers = _routerService.QueryNextRoutes(task.Roadway, task.TargetAddress);
+ if (OutStation != null)
{
- stackerCraneTaskCommand.S_Row = Convert.ToInt16(sourceCodes[0]) /*% 2 != 0 ? (short)1 : (short)2*/;
- stackerCraneTaskCommand.S_Bay = Convert.ToInt16(sourceCodes[1]);
- stackerCraneTaskCommand.S_level = Convert.ToInt16(sourceCodes[2]);
+ string[] targetCodes = OutStation.stationLocation.Split("-");
+ commonStackerCrane.SetValue(StackerCraneDBName.E_Row, Convert.ToInt16(targetCodes[0]), scName);//鐩殑璐т綅琛�
+ commonStackerCrane.SetValue(StackerCraneDBName.E_Bay, Convert.ToInt16(targetCodes[1]), scName);//鐩殑璐т綅鍒�
+ commonStackerCrane.SetValue(StackerCraneDBName.E_level, Convert.ToInt16(targetCodes[2]), scName);//鐩殑璐т綅灞�
+
+ string[] sourceCodes = task.CurrentAddress.Split("-");
+ if (sourceCodes.Length == 3)
+ {
+ commonStackerCrane.SetValue(StackerCraneDBName.S_Row, Convert.ToInt16(sourceCodes[0]), scName);//鏉ユ簮璐т綅琛�
+ commonStackerCrane.SetValue(StackerCraneDBName.S_Bay, Convert.ToInt16(sourceCodes[1]), scName);//鏉ユ簮璐т綅鍒�
+ commonStackerCrane.SetValue(StackerCraneDBName.S_level, Convert.ToInt16(sourceCodes[2]), scName);//鏉ユ簮璐т綅灞�
+ }
+ else
+ {
+ //鏁版嵁閰嶇疆閿欒
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
+ return null;
+ }
}
else
{
- //鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.NextAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鏀捐揣绔欏彴淇℃伅");
return null;
}
}
- else
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.NextAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鏀捐揣绔欏彴淇℃伅");
- return null;
- }
+
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 1, scName);//宸ヤ綔鍛戒护浠g爜
+ commonStackerCrane.SetValue(StackerCraneDBName.TaskNum, task.TaskNum, scName);//宸ヤ綔搴忓彿
+ commonStackerCrane.SetValue(StackerCraneDBName.RFID, task.PalletCode.PadLeft(4, '0') + task.PVI, scName);//pvi
+
+
+ //鍐欏叆鍚� 璇诲彇楠岃瘉
+
+ commonStackerCrane.SetValue(StackerCraneDBName.CMD, 1, scName);
+ return responseContent.OK();
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+ catch (Exception ex)
{
- string[] targetCodes = task.NextAddress.Split("-");
- if (targetCodes.Length == 3)
- {
- stackerCraneTaskCommand.E_Row = Convert.ToInt16(targetCodes[0]) /*% 2 != 0 ? (short)1 : (short)2*/;
- stackerCraneTaskCommand.E_Bay = Convert.ToInt16(targetCodes[1]);
- stackerCraneTaskCommand.E_level = Convert.ToInt16(targetCodes[2]);
- }
- else
- {
- //鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
- return null;
- }
- string[] sourceCodes = task.CurrentAddress.Split("-");
- if (sourceCodes.Length == 3)
- {
- stackerCraneTaskCommand.S_Row = Convert.ToInt16(sourceCodes[0])/* % 2 != 0 ? (short)1 : (short)2*/;
- stackerCraneTaskCommand.S_Bay = Convert.ToInt16(sourceCodes[1]);
- stackerCraneTaskCommand.S_level = Convert.ToInt16(sourceCodes[2]);
- }
- else
- {
- //鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
- return null;
- }
+ return responseContent.Error(ex.Message);
}
- return stackerCraneTaskCommand;
+
+
}
}
}
--
Gitblit v1.9.3