From 21078521d79f0eb5535cc34be7917a3fd1123b8f Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期三, 29 十月 2025 15:35:29 +0800
Subject: [PATCH] RGV监控
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 222 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 172 insertions(+), 50 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 889f1ac..ab1ef29 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -149,12 +149,12 @@
dt_Task.Roadway = "RGV101";
dt_Task.TaskType = (int)TaskInboundTypeEnum.Inbound;
dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp; //鍙栬揣
- dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
+ dt_Task.RGVCurrentexecution = ""; //鐩墠鏆傛棤
dt_Task.TaskState = (int)TaskInStatusEnum.RGV_InNew; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
dt_Task.TargetAddress = item.endAddress;
dt_Task.CurrentAddress = item.startAddress;
- dt_Task.NextAddress = "1021"; //鐩墠鏆傛棤
+ dt_Task.NextAddress = ""; //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
BaseDal.AddData(dt_Task);
@@ -190,10 +190,10 @@
dt_Task.Roadway = roadway;
dt_Task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly; //鍙栬揣
- dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
- dt_Task.TaskState = (int)TaskOutStatusEnum.OutNewLj; //鐩墠鏆傛棤
+ dt_Task.RGVCurrentexecution = ""; //鐩墠鏆傛棤
+ dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
- dt_Task.TargetAddress = "0";
+ dt_Task.TargetAddress = "";
dt_Task.CurrentAddress = gVStation.Motherinlaw.ToString();
dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString(); //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
@@ -257,18 +257,28 @@
{
return BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.NextAddress == Nextaderr, TaskOrderBy);
}
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅鏄惁鏈変换鍔★紝杩涜鍒ゆ柇
+ /// </summary>
public Dt_Task ObtainMuChetaskbool(AGVStation ZicheinnerSide)
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting) && x.NextAddress == ZicheinnerSide.MotherCarDeviceCode.ToString(), TaskOrderBy);
- if (dt_Task != null) return dt_Task;
- Dt_Task dt_Task2 = BaseDal.QueryFirst(x => x.Roadway == ZicheinnerSide.ChildPosiDeviceCode, TaskOrderBy);
- if (dt_Task2 != null) return dt_Task2;
- return null;
+ return BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskType == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting), TaskOrderBy);
}
public Dt_Task GetChariotTaskBool(string ChildPosiDeviceCode)
{
Dt_Task dt_Task2 = BaseDal.QueryFirst(x => x.Roadway == ChildPosiDeviceCode, TaskOrderBy);
+ if (dt_Task2 != null) return dt_Task2;
+ return null;
+ }
+
+ /// <summary>
+ /// 鑾峰彇HCJ绔欏彴鏄惁鏈変换鍔�
+ /// </summary>
+ public Dt_Task GetHCJTaskBool(string ChildPosiDeviceCode,int HCJaddres)
+ {
+ Dt_Task dt_Task2 = BaseDal.QueryFirst(x => x.Roadway == ChildPosiDeviceCode && x.CurrentAddress== HCJaddres.ToString(), TaskOrderBy);
if (dt_Task2 != null) return dt_Task2;
return null;
}
@@ -339,13 +349,30 @@
}
/// <summary>
- /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔�
+ /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔★紙鍏ュ簱锛�
/// </summary>
/// <param name="DeviceCode"></param>
/// <returns></returns>
public Dt_Task MothermachinemovementTask2(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish && x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly), TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔★紙鍏ュ簱锛�
+ /// </summary>
+ public Dt_Task MothermacTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || x.TaskState == (int)TaskInStatusEnum.SC_InExecuting || x.TaskState == (int)TaskInStatusEnum.InFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly), TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔★紙鍑哄簱锛�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task OutMothermaTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting && x.RGVTaskType == (int)TaskOutStatusEnum.RGV_OutMothercarFinish), TaskOrderBy);
}
@@ -389,6 +416,8 @@
+
+
public WebResponseContent UpdateDeliveryAddress(string NextAddress, int tasktype)
{
WebResponseContent webResponse = new WebResponseContent();
@@ -397,12 +426,12 @@
Dt_Task dt_Task = null;
if (tasktype == 1)
{
- dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.NextAddress == "999");
+ dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState== (int)TaskInStatusEnum.InexceptionalSelection);
}
else
{
- dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.NextAddress == "999");
+ dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.NextAddress == "");
}
if (dt_Task == null) return webResponse.Error("鏈壘鍒伴渶瑕佷慨鏀圭殑浠诲姟锛屾棤闇�淇敼");
dt_Task.NextAddress = NextAddress;
@@ -501,7 +530,7 @@
int oldState = task.TaskState;
if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
- if (task.TaskState >= (int)TaskInStatusEnum.RGV_InMothercarFinish)
+ if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
@@ -509,6 +538,11 @@
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = nextStatus;
+ /*if (task.TaskState == (int)TaskInStatusEnum.RGV_InPickupExecuting) //褰撲笅鍙戝叆搴撳彛鍙栬揣涓紝鍒欒皟鍙栧叞鍓戞帴鍙�
+ {
+ TaskResultIn(task.TaskNum.ToString(),"",1,"");
+ }*/
+
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
@@ -536,14 +570,15 @@
task.Modifier = "System";
BaseDal.UpdateData(task);
+
+
string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
-
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
- $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
- : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -622,15 +657,56 @@
int oldState = task.TaskState;
Dt_TaskExecuteDetail taskExecuteDetail = null;
- if (task.CurrentAddress == "1061")
+ if(task.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && task.CurrentAddress == "1061" && (task.NextAddress == "1091" || task.NextAddress == "1081"))
{
- taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && x.NextAddress== "1061" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+
+
+ //鍑哄簱鍐呭
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish && task.CurrentAddress == "1131" && task.NextAddress == "1171")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
}
else
{
taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
-
}
+
+
+
+ /*if (task.TaskState== (int)TaskInStatusEnum.RGV_InReleaseFinish && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+
+ }else if(task.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && task.CurrentAddress == "1021")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }*/
@@ -639,6 +715,15 @@
task.TaskState = taskExecuteDetail.TaskState;
task.CurrentAddress = taskExecuteDetail.CurrentAddress;
task.NextAddress = taskExecuteDetail.NextAddress;
+ task.RGVTaskType = taskExecuteDetail.RGVTaskType;
+ task.Roadway=taskExecuteDetail.Roadway;
+ }else if(task.TaskState == (int)TaskInStatusEnum.RGV_InPickupExecuting)
+ {
+ task.TaskState = (int)TaskInStatusEnum.RGV_InNew;
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
}
else
{
@@ -656,6 +741,7 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
$"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戝洖褰掑埌銆恵afterstaterem}銆�");
+
content = WebResponseContent.Instance.OK();
}
@@ -768,9 +854,9 @@
: $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
- if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish) //鍏ュ簱浠诲姟瀹屾垚
+ if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || task.TaskState == (int)TaskOutStatusEnum.OutFinish) //鍏ュ簱浠诲姟瀹屾垚
{
- //AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+
if (task.NextAddress == "1001" || task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
@@ -778,6 +864,10 @@
else
{
//姝ｅ父浠诲姟锛屾甯镐笂鎶�
+ TaskResultIn(task.TaskNum.ToString(), "", 2, "");
+
+ /*AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+ BaseDal.DeleteData(task);*/
}
}
@@ -792,6 +882,19 @@
}
#region 鍏ュ簱
+ public WebResponseContent HandleInAbnormal(int taskNum)
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ task.TaskState = (int)TaskInStatusEnum.InAbnormalFinish;
+ task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
+ BaseDal.UpdateData(task);
+ return WebResponseContent.Instance.OK();
+
+ }
+
+
private void HandleInboundTask(Dt_Task task)
{
switch (task.TaskState)
@@ -799,6 +902,7 @@
case (int)TaskInStatusEnum.RGV_InPickupExecuting:
task.TaskState = (int)TaskInStatusEnum.RGV_InPickupFinish;
task.RGVTaskType = (int)RGVTaskTypeEnum.Placing;
+ task.NextAddress = "1021";
break;
case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
@@ -944,6 +1048,8 @@
task.TaskState = (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish;
task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
task.Roadway = "RGV118";
+ task.CurrentAddress = "1171";
+ task.NextAddress = "";
}
else
{
@@ -992,7 +1098,6 @@
rGVstatus.msg = "鏄庡拰WCS鎺ユ敹鍒癛GV缂栧彿涓虹┖锛岃妫�鏌�";
return rGVstatus;
}
-
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == item.rgvTag);
if (device == null)
{
@@ -1000,11 +1105,10 @@
rGVstatus.msg = "鏌ヨ鐨凴GV宸叉柇绾�";
return rGVstatus;
}
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ SpeStackerCrane Commonstacker = (SpeStackerCrane)device;
//褰撳墠浣嶇疆
- DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RGVCurrentlocation" && x.DeviceProParamType == "RGVCurrentlocation");
-
+ DeviceProDTO? deviceProDTO = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RGVCurrentlocation" && x.DeviceProParamType == "RGVCurrentlocation");
if (item.type == "pick") //鍙栬揣
{
@@ -1018,8 +1122,18 @@
return rGVstatus;
}
- int Currentlocation = conveyorLine.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
- if (Currentlocation == aGVStation.Motherinlaw) //鏄惁鍦ㄥ彇璐т綅
+ //鏈夋棤璐х姸鎬�
+ DeviceProDTO? deviceProFh = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvEquipmentStatus" && x.DeviceProParamType == "RgvEquipmentStatus");
+
+ DeviceProDTO? RgvCraneAutoStatus = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvCraneAutoStatus" && x.DeviceProParamType == "RgvCraneAutoStatus");
+
+ int Itstock = Commonstacker.Communicator.Read<short>(deviceProFh.DeviceProAddress);
+
+ int RgvCraneAutoStatusValues = Commonstacker.Communicator.Read<short>(RgvCraneAutoStatus.DeviceProAddress);
+
+
+ int Currentlocation = Commonstacker.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
+ if (Currentlocation == aGVStation.Motherinlaw && Itstock == 1 && RgvCraneAutoStatusValues == 1) //鏄惁鍦ㄥ彇璐т綅
{
rGVstatus.code = 0;
rGVstatus.data = new List<RgvOperation>
@@ -1039,12 +1153,18 @@
else if (item.type == "put") //鏀捐揣
{
AGVStation aGVStation = _gvStationService.Corridorequipment(item.rgvTag);
- int Currentlocation = conveyorLine.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
+ int Currentlocation = Commonstacker.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
- DeviceProDTO? deviceProFh = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvEquipmentStatus" && x.DeviceProParamType == "RgvEquipmentStatus");
- int Itstock = conveyorLine.Communicator.Read<short>(deviceProFh.DeviceProAddress);
+ //鏈夋棤璐х姸鎬�
+ DeviceProDTO? deviceProFh = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvEquipmentStatus" && x.DeviceProParamType == "RgvEquipmentStatus");
- if (aGVStation.Motherinlaw== Currentlocation && Itstock==0)
+ DeviceProDTO? RgvCraneAutoStatus = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvCraneAutoStatus" && x.DeviceProParamType == "RgvCraneAutoStatus");
+
+ int Itstock = Commonstacker.Communicator.Read<short>(deviceProFh.DeviceProAddress);
+
+ int RgvCraneAutoStatusValues = Commonstacker.Communicator.Read<short>(RgvCraneAutoStatus.DeviceProAddress);
+
+ if (aGVStation.Motherinlaw== Currentlocation && Itstock==0 && RgvCraneAutoStatusValues==1) //Itstock:0涓烘棤璐� RgvCraneAutoStatusValues锛� 1涓鸿嚜鍔�
{
rGVstatus.code = 0;
rGVstatus.data = new List<RgvOperation>
@@ -1136,14 +1256,14 @@
}
dt_Task.TaskState = (int)TaskInStatusEnum.InFinish;
AutomaticTaskCompleted(dt_Task); //鏈夐棶棰�,绛夊緟浼樺寲
- BaseDal.DeleteData(dt_Task);
+ BaseDal.DeleteData(dt_Task); //鍒犻櫎浠诲姟
expoReverse.code = 0;
}
}
else if (item.type == "put") //鏀捐揣
{
- if (item.status == 2) //鍫嗗灈鏈烘墽琛屼腑
+/* if (item.status == 2) //鍫嗗灈鏈烘墽琛屼腑
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNewLj && x.Roadway == item.rgvTag);
if (dt_Task != null)
@@ -1151,7 +1271,7 @@
dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew;
BaseDal.UpdateData(dt_Task);
}
- }
+ }*/
expoReverse.code = 0;
}
else
@@ -1172,7 +1292,7 @@
}
/// <summary>
- /// 鍫嗗灈鏈烘晠闅滀俊鎭�
+ /// 鑾峰彇鍫嗗灈鏈烘晠闅滀俊鎭�
/// </summary>
/// <param name="sCErrorStatus"></param>
/// <returns></returns>
@@ -1191,24 +1311,21 @@
List<EquipmentStatus> equipmentdata = new List<EquipmentStatus>();
List<EquipmentStatus> equipmentList = _equipmentStatus.GetEquipmentStatus();
- string msgeetst = "";
foreach (var item in sCErrorStatus.data)
{
EquipmentStatus equipment = equipmentList.Find(x => x.Equipment_Number == item.stackerName);
-
- msgeetst += $"銆婅澶囷細{equipment.Equipment_Number}锛屼慨鏀瑰墠鐘舵�侊細{equipment.Equipment_Status}锛�";
-
- equipment.Equipment_Status = item.errorStatus;
-
- msgeetst += $"<淇敼鍚庣姸鎬侊細{equipment.Equipment_Status}>銆�................";
- equipmentdata.Add(equipment);
+ if (equipment.Equipment_Status != item.errorStatus)
+ {
+ equipment.Equipment_Status = item.errorStatus;
+ equipmentdata.Add(equipment);
+ }
}
-
- WriteLog.Write_Log("璁惧鐘舵�佹洿鏀�", "鍫嗗灈鏈虹姸鎬佹洿鏀�", "姝ｅ父", msgeetst);
- _equipmentStatus.UpdateData(equipmentdata); //淇敼鐘舵��
+ if (equipmentdata.Count > 0)
+ {
+ _equipmentStatus.UpdateData(equipmentdata); //淇敼鐘舵��
+ }
+
expoReverse.code = 0;
-
-
return expoReverse;
}
catch (Exception ex)
@@ -1386,6 +1503,7 @@
RGVTaskType = dt_task.RGVTaskType,
RGVCurrentexecution = dt_task.RGVCurrentexecution
});
+
return WebResponseContent.Instance.OK();
}
@@ -1589,5 +1707,9 @@
// 鍒涘缓骞惰祴鍊�
return responseContent;
}
+
+
+
+
}
}
--
Gitblit v1.9.3