From 627bfedc5739855b6d2e829a115c3b64134ef868 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期二, 25 十一月 2025 19:06:06 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RgvOperationService.cs | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RgvOperationService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RgvOperationService.cs"
index 324e07c..fcf4a9d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RgvOperationService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RgvOperationService.cs"
@@ -314,16 +314,24 @@
public WebResponseContent WriteInNormal(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
- Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish);
- if (dt_Task == null)
+ try
{
- return WebResponseContent.Instance.Error("娌℃湁寮傚父鍏ュ簱浠诲姟");
+ Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish);
+ if (dt_Task == null)
+ {
+ return content.Error("娌℃湁寮傚父鍏ュ簱浠诲姟");
+ }
+ dt_Task.TaskState = (int)TaskInStatusEnum.RGV_InPickupFinish;
+ dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
+ dt_Task.NextAddress = "1021";
+ _taskRepository.UpdateData(dt_Task);
+ return content.OK();
}
- dt_Task.TaskState = (int)TaskInStatusEnum.RGV_InPickupFinish;
- dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
- dt_Task.NextAddress = "1021";
- _taskRepository.UpdateData(dt_Task);
- return content;
+ catch (Exception ex)
+ {
+ return content.Error("姝ｅ父鍏ュ簱璋冨彇寮傚父锛屽師鍥狅細"+ex.Message);
+ throw;
+ }
}
/// <summary>
/// 鍏ュ簱寮傚父鎺掑嚭
@@ -331,21 +339,29 @@
public WebResponseContent WriteInAbnormal(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
- Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish);
- if (dt_Task == null)
+ try
{
- return WebResponseContent.Instance.Error("娌℃湁寮傚父鍏ュ簱浠诲姟");
+ Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish);
+ if (dt_Task == null)
+ {
+ return WebResponseContent.Instance.Error("娌℃湁寮傚父鍏ュ簱浠诲姟");
+ }
+ dt_Task.TaskState = (int)TaskInStatusEnum.InexceptionalSelection;
+ dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
+ _taskRepository.UpdateData(dt_Task);
+ return content.OK();
}
- dt_Task.TaskState = (int)TaskInStatusEnum.InexceptionalSelection;
- dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
- _taskRepository.UpdateData(dt_Task);
- return content;
+ catch (Exception ex)
+ {
+ return content.Error("寮傚父鎺掗櫎璋冨彇寮傚父锛屽師鍥狅細" + ex.Message);
+ throw;
+ }
}
public static List<string> OutStationareaList = new List<string>() { "RGV111", "RGV116", "RGV110", "RGV112", "RGV114", "RGV115", "RGV118" };
- public static List<string> InStationareaList = new List<string>() { "RGV111", "RGV116", "RGV110", "RGV112", "RGV114", "RGV115", "RGV118" };
+ public static List<string> InStationareaList = new List<string>() { "RGV101", "RGV103", "RGV105", "RGV108", "RGV109", "RGV104", "RGV107" };
/// <summary>
/// 鏌ョ湅鎶ヨ
/// </summary>
@@ -368,7 +384,7 @@
}
}
- return true;
+ return false;
}
--
Gitblit v1.9.3