From 0f1717cbe5c788c294a53cd4df6f819ca0236500 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 09 三月 2026 10:42:27 +0800
Subject: [PATCH] 优化成品仓逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/GetBlockPodContentDto.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 21 ++++--
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationMangerService.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/RGV/RGVController.cs | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/UpdateAgvSXCTake.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTStorageStatusNotify.cs | 8 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs | 28 ++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/MoveBlockPodContentDto.cs | 6 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTNewMovePodTask.cs | 5 -
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTInfo.cs | 15 +++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 24 ++++---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/CancelSXCTake.cs | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/LocationEnum/EnableStatusEnum.cs | 20 +++---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 17 +++--
15 files changed, 113 insertions(+), 50 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
index 09899b8..58bc5ae 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
@@ -25,16 +25,40 @@
//{ nameof(Dt_RGVLocationInfo.Column), OrderByType.Asc },
{ nameof(Dt_RGVLocationInfo.Row), OrderByType.Asc },
};
+ private Dictionary<string, OrderByType> _DepthAscOrderBy = new Dictionary<string, OrderByType>()
+ {
+ { nameof(Dt_RGVLocationInfo.Depth), OrderByType.Asc },
+ };
public IRepository<Dt_RGVLocationInfo> Repository => BaseDal;
public List<Dt_RGVLocationInfo> GetFreeLocationInfos()
{
return BaseDal.QueryData(x => x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
}
-
- public Dt_RGVLocationInfo GetFreeLocationInfo(string AreaCode)
+ /// <summary>
+ /// 鏌ユ壘鍏ュ簱鍙敤璐т綅
+ /// </summary>
+ /// <param name="AreaCode"></param>
+ /// <returns></returns>
+ public Dt_RGVLocationInfo GetInFreeLocationInfo(string AreaCode)
{
Dt_RGVLocationInfo? rGVLocationInfo = BaseDal.QueryFirst(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
+ #region 鍒ゆ柇宸烽亾鏄惁鏈夎揣
+ if (rGVLocationInfo != null)
+ {
+ List<string> NoRoadwayNos = new List<string>();
+ while (true)
+ {
+ Dt_RGVLocationInfo dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth < rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
+ if (dt_RGVLocationInfo == null) return rGVLocationInfo;
+
+ rGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == dt_RGVLocationInfo.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth > dt_RGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _DepthAscOrderBy);
+ dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
+ if (dt_RGVLocationInfo == null) return rGVLocationInfo;
+
+ }
+ }
+ #endregion
return rGVLocationInfo;
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationMangerService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationMangerService.cs"
index 59a785e..428449c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationMangerService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationMangerService.cs"
@@ -37,7 +37,7 @@
/// <returns></returns>
public Dt_StationManger GetOutStationInfo(string stationCode)
{
- return BaseDal.QueryFirst(x => x.StationCode == stationCode && x.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt());
+ return BaseDal.QueryFirst(x => x.StationCode == stationCode && (x.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt() || x.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt()));
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/LocationEnum/EnableStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/LocationEnum/EnableStatusEnum.cs"
index 74653e3..3f2470b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/LocationEnum/EnableStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/LocationEnum/EnableStatusEnum.cs"
@@ -18,17 +18,17 @@
[Description("姝ｅ父")]
Normal = 0,
- /// <summary>
- /// 鍙叆
- /// </summary>
- [Description("鍙叆")]
- OnlyIn = 1,
+ ///// <summary>
+ ///// 鍙叆
+ ///// </summary>
+ //[Description("鍙叆")]
+ //OnlyIn = 1,
- /// <summary>
- /// 鍙嚭
- /// </summary>
- [Description("鍙嚭")]
- OnlyOut = 2,
+ ///// <summary>
+ ///// 鍙嚭
+ ///// </summary>
+ //[Description("鍙嚭")]
+ //OnlyOut = 2,
/// <summary>
/// 绂佺敤
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/CancelSXCTake.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/CancelSXCTake.cs"
index a5fee6c..d70c516 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/CancelSXCTake.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/CancelSXCTake.cs"
@@ -6,7 +6,7 @@
namespace WIDESEAWCS_DTO.RGV.FOURBOT
{
- public class CancelSXCTake
+ public class CancelSXCTake: FOURBOTInfo
{
/// <summary>
/// 浠诲姟鍙�
@@ -16,7 +16,7 @@
/// <summary>
/// 鍙栨秷鍘熷洜
/// </summary>
- public string reason { get; set; }= "";
+ public string reason { get; set; }= "NoNeed";
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTInfo.cs"
new file mode 100644
index 0000000..afb6bdc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTInfo.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_DTO.RGV.FOURBOT
+{
+ public class FOURBOTInfo
+ {
+ public string warehouseID { get; set; } = "HETU";
+ public string clientCode { get; set; } = "WCS";
+ public string requestID { get; set; } = DateTime.Now.ToString("yyyyMMddHHmmss");
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTNewMovePodTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTNewMovePodTask.cs"
index 7497613..4e169c5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTNewMovePodTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTNewMovePodTask.cs"
@@ -10,11 +10,8 @@
/// <summary>
/// 鍥涘悜杞﹀垱寤哄鍣ㄦ惉杩愪换鍔�
/// </summary>
- public class FOURBOTnewMovePodTask
+ public class FOURBOTnewMovePodTask: FOURBOTInfo
{
- public string warehouseID { get; set; } = "HETU";
- public string clientCode { get; set; } = "WCS";
- public string requestID { get; set; } = DateTime.Now.ToString("yyyyMMddHHmmss");
/// <summary>
/// 浼樺厛绾�
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTStorageStatusNotify.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTStorageStatusNotify.cs"
index d7de264..5d3f774 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTStorageStatusNotify.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/FOURBOTStorageStatusNotify.cs"
@@ -6,6 +6,14 @@
namespace WIDESEAWCS_DTO.RGV.FOURBOT
{
+ public class FOURBOTStorageStatusNotifyInfo
+ {
+ public long messageID { get; set; }
+ public int messageType { get; set; }
+ public string warehouseID { get; set; }
+ public string createTime { get; set; }
+ public FOURBOTStorageStatusNotify content { get; set; }
+ }
/// <summary>
/// 鍥涘悜杞﹀偍浣嶇姸鎬佹洿鏂版秷鎭�氱煡
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/GetBlockPodContentDto.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/GetBlockPodContentDto.cs"
index 1f0a270..c211c34 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/GetBlockPodContentDto.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/GetBlockPodContentDto.cs"
@@ -9,8 +9,9 @@
/// <summary>
/// 闃荤鎵樼洏鏌ヨ璇锋眰鍐呭DTO
/// </summary>
- public class GetBlockPodContentListDto
+ public class GetBlockPodContentListDto : FOURBOTInfo
{
+
public List<GetBlockPodContentDto> content { get; set; } = new List<GetBlockPodContentDto>();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/MoveBlockPodContentDto.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/MoveBlockPodContentDto.cs"
index 1b71b63..cec6840 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/MoveBlockPodContentDto.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/MoveBlockPodContentDto.cs"
@@ -6,10 +6,14 @@
namespace WIDESEAWCS_DTO.RGV.FOURBOT
{
+ public class MoveBlockPodContentDto : FOURBOTInfo
+ {
+ public List<MoveBlockPodContentDtoInfo> content { get; set; }=new List<MoveBlockPodContentDtoInfo>() { };
+ }
/// <summary>
/// 鎵归噺绉诲姩闃荤鎵樼洏璇锋眰鍐呭DTO
/// </summary>
- public class MoveBlockPodContentDto
+ public class MoveBlockPodContentDtoInfo
{
/// <summary>
/// 鎵樼洏鍙�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/UpdateAgvSXCTake.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/UpdateAgvSXCTake.cs"
index f75cf3a..6c6e627 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/UpdateAgvSXCTake.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/RGV/FOURBOT/UpdateAgvSXCTake.cs"
@@ -9,7 +9,7 @@
/// <summary>
/// 鏇存柊鍥涘悜杞︿换鍔′紭鍏堢骇
/// </summary>
- public class UpdateAgvSXCTake
+ public class UpdateAgvSXCTake: FOURBOTInfo
{
/// <summary>
/// 浠诲姟ID
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
index 214d2f6..28b70bc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IRGVLocationInfoService.cs"
@@ -13,12 +13,12 @@
{
public IRepository<Dt_RGVLocationInfo> Repository { get; }
/// <summary>
- /// 鑾峰彇鍙敤绌鸿揣浣�
+ /// 鑾峰彇鍏ュ簱鍙敤绌鸿揣浣�
/// </summary>
/// <param name="AreaCode"></param>
/// <param name="containerType"></param>
/// <returns></returns>
- Dt_RGVLocationInfo GetFreeLocationInfo(string AreaCode);
+ Dt_RGVLocationInfo GetInFreeLocationInfo(string AreaCode);
/// <summary>
/// 鑾峰彇鎵�鏈夌┖璐т綅
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/RGV/RGVController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/RGV/RGVController.cs"
index 9d5dfda..bee4d30 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/RGV/RGVController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/RGV/RGVController.cs"
@@ -51,10 +51,10 @@
/// <param name="fOURBOTStorageStatusNotify"></param>
/// <returns></returns>
[HttpPost, Route("multiSetNodeStatus"), AllowAnonymous]
- public FOURBOTReturn multiSetNodeStatus([FromBody] FOURBOTStorageStatusNotify fOURBOTStorageStatusNotify)
+ public FOURBOTReturn multiSetNodeStatus([FromBody] FOURBOTStorageStatusNotifyInfo fOURBOTStorageStatusNotify)
{
FOURBOTReturn returnRGV = new FOURBOTReturn();
- var take = _taskService.multiSetNodeStatus(fOURBOTStorageStatusNotify);
+ var take = _taskService.multiSetNodeStatus(fOURBOTStorageStatusNotify.content);
if (take.Status)
{
returnRGV.returnCode = 0;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 184c486..8994873 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -106,14 +106,21 @@
}
else if (Rgv.messageType == 10)
{
- if (task.TaskState == (int)TaskStatusEnum.TakeFinish && Rgv.content.status == 4)
+ if(Rgv.content.status == 4)
{
- task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
- }
- else if (task.TaskState == (int)TaskStatusEnum.Puting && Rgv.content.status == 4)
- {
- TaskCompleted(task, deviceTypeEnum);
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckShapeing;
+ BaseDal.UpdateData(task);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ else if(task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
}
}
}
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 688a447..4ab35cd 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"
@@ -96,7 +96,8 @@
if (!content.Status) throw new Exception(content.Message);
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
{
- continue;
+ throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆�/鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ //continue;
}
switch (item.taskType)
{
@@ -191,7 +192,8 @@
{
CancelSXCTake cancelSXCTake = new CancelSXCTake
{
- taskID = dt_Task.RGVTaskId
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -201,11 +203,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ return content.OK($"鍙栨秷浠诲姟銆恵dt_Task.WMSTaskNum}銆戞垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ return content.Error($"浠诲姟鍙栨秷澶辫触銆恵dt_Task.WMSTaskNum}銆憑fOURBOTReturn.returnUserMsg}");
}
}
#endregion
@@ -304,7 +306,7 @@
priority = updateTaskPriority.taskPriority
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
- if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ if (apiInfo == null) throw new Exception("鏈壘鍒版洿鏂板洓鍚戣溅浠诲姟浼樺厛绾ф帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
@@ -1057,7 +1059,8 @@
};
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})")
+ throw new Exception(fOURBOTReturn.returnUserMsg);
#endregion
#region 鍒涘缓鍥涘悜杞︿换鍔�
@@ -1105,7 +1108,7 @@
var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x => fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
foreach (var item in Agvlocation)
{
- item.LocationStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
+ item.EnableStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
}
_rGVLocationInfoService.UpdateData(Agvlocation);
return WebResponseContent.Instance.OK();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
index e2377e1..5323c10 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
@@ -91,7 +91,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GetBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GetBlockPodContentDto)) ?? throw new Exception("鏈壘鍒版壒閲忚幏鍙栭樆纰嶆墭鐩樺叧绯绘帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
List<Dt_Task> dt_Tasks = new List<Dt_Task>();
var PalletCodes = tasks.Select(x => x.PalletCode).ToList();
//GetBlockPodContentDto content = new GetBlockPodContentDto();
@@ -125,7 +125,7 @@
foreach (var item in Result.outPods)
{
var task = tasks.First(x => x.PalletCode == item.outPod);
- if (item.blockPods.Count > 0)
+ if (item.blockPods != null && item.blockPods.Count > 0)
{
task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
dt_Tasks.Add(task);
@@ -175,7 +175,7 @@
try
{
#region 鑾峰彇璐т綅
- var rGVLocationInfo = _rGVLocationInfoService.GetFreeLocationInfo(item.Roadway);
+ var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway);
if (rGVLocationInfo == null)
{
item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
@@ -456,21 +456,21 @@
{
WebResponseContent content = new WebResponseContent();
List<Dt_Task> dt_Tasks = new List<Dt_Task>();
- List<MoveBlockPodContentDto> moveBlocks = new List<MoveBlockPodContentDto>();
+ MoveBlockPodContentDto moveBlock = new MoveBlockPodContentDto();
try
{
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(MoveBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅鎵归噺鎼繍闃荤鎵樹换鍔℃帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
foreach (var item in tasks)
{
- MoveBlockPodContentDto moveBlock = new MoveBlockPodContentDto()
+ MoveBlockPodContentDtoInfo moveBlockInfo = new MoveBlockPodContentDtoInfo()
{
podID = item.PalletCode,
des = item.TargetAddress
};
- moveBlocks.Add(moveBlock);
+ moveBlock.content.Add(moveBlockInfo);
}
- string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlocks.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlock.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
content.Data = fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
@@ -502,7 +502,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(moveBlocks, content, "涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�", "", "");
+ _trackloginfoService.AddTrackLog(moveBlock, content, "涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�", "", "");
}
}
#endregion
@@ -537,24 +537,28 @@
try
{
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ var i = 0;
foreach (var item in tasks)
{
+ i++;
var stationManger = _stationMangerService.GetOutStationInfo(item.TargetAddress);
item.NextAddress = stationManger.StationCode;
if (stationManger.IsOccupied != LocationStatusEnum.Free.ObjToInt()) continue;
#region 涓嬪彂鍑哄簱浠诲姟
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
- fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
+ //fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
+ fOURBOTnewMovePodTask.desStationCodes = item.NextAddress;
fOURBOTnewMovePodTask.desExt = new
{
- unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ unload = 1//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
};
fOURBOTnewMovePodTask.taskExt = new
{
autoToRest = 1
};
fOURBOTnewMovePodTask.desType = 5;
+ fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmss") + i;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
content.Data = fOURBOTReturn;
--
Gitblit v1.9.3