From 0b4792ff8245f9eac16e6d02452eb9a091f6f72b Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 28 十月 2025 19:42:04 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
index c47f71c..d8bac0e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
@@ -77,6 +77,28 @@
CommonStackerCrane_AGVTaskCompletedEventHandler(getStackerObject, speStackerCrane);
}
+ //鍒ゆ柇褰撳墠璁惧鏄叆搴撹繕鏄嚭搴�
+ /*if (GetDeviceAddress.OutbounMotherChildCartbool(speStackerCrane.DeviceCode))
+ {
+ //鍒ゆ柇褰撳墠瀹夊叏闂ㄦ槸鍚︿负缁胯壊鐏�
+ if (GetDeviceAddress.ReadAqmDecicStice(1))
+ {
+ return null;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍏ュ簱绔畨鍏ㄩ棬鏄惁姝ｅ父
+ if (GetDeviceAddress.ReadAqmDecicStice(2))
+ {
+ return null;
+ }
+ }*/
+
+
+
+
+
if (getStackerObject.RgvCraneAutoStatusValue == RgvCraneAutoStatus.Automatic &&
getStackerObject.StaclerkJobJobStatusValue == RGV_Rgvtaskstutas.Ready && getStackerObject.RgvCraneWorkStatusValue == RGVStepprocess.NoAction)
{
@@ -139,8 +161,12 @@
}
else if (getStackerObject.StaclerkJobJobStatusValue == RGV_Rgvtaskstutas.AbnormalCompletion && getStackerObject.CurrentRgvtaskid != 0 && getStackerObject.CurrentRgvtaskid != 30001)
{
+
+ //淇敼浠诲姟鐘舵�佷负寮傚父瀹屾垚
+ _taskService.HandleInAbnormal(getStackerObject.CurrentRgvtaskid);
+
//鍐欏叆寮傚父瀹屾垚鎶ヨ淇℃伅
- speStackerCrane.Communicator.Write<short>("DB101.36", 1);
+ speStackerCrane.Communicator.Write<short>("DB101.36", 1); //鍐欏叆鎶ヨ
}
}
#endregion
@@ -179,7 +205,7 @@
=> GoodsPlacedCorridor(RGVTaskdevice), //瀛愯溅鏀捐揣浠诲姟(宸插畬鎴�)
((int)RGVEquipment.Mothertrailer, RgvEquipmentStatus.HasCargo)
- => MotherVehicleMovement(RGVTaskdevice), //锛堝凡瀹屾垚锛�
+ => MotherVehicleMovement(RGVTaskdevice), //姣嶈溅绉诲姩锛堝凡瀹屾垚锛�
_ => null
};
@@ -434,7 +460,13 @@
}
else
{
- RGVMovetask(Muche.ZicheMotherinlaw, Muche.ChildPosiDeviceCode); //濡傛灉娌℃湁浠诲姟锛屽垯鍙互杩涜绉诲姩鍑烘潵
+ //鍒ゆ柇姣嶈溅鏄惁鏈変换鍔�
+ Dt_Task _Task1 = _taskService.MothermacTask(Muche.ChildPosiDeviceCode);
+ if (task == null)
+ {
+ RGVMovetask(Muche.ZicheMotherinlaw, Muche.ChildPosiDeviceCode); //濡傛灉娌℃湁浠诲姟锛屽垯鍙互杩涜绉诲姩鍑烘潵
+ }
+
}
}
}
@@ -480,7 +512,12 @@
Dt_Task task = _taskService.MothermachinemovementTask2(Muche2.ChildPosiDeviceCode); //鑾峰彇鍒版瘝杞︾Щ鍔ㄤ换鍔�
if (task == null)
{
- RGVMovetask(Muche2.ZicheMotherinlaw, Muche2.ChildPosiDeviceCode); //濡傛灉娌℃湁浠诲姟锛屽垯鍙互杩涜绉诲姩鍑烘潵
+ Dt_Task _Task1 = _taskService.MothermacTask(Muche.ChildPosiDeviceCode);
+ if (task == null)
+ {
+ RGVMovetask(Muche2.ZicheMotherinlaw, Muche2.ChildPosiDeviceCode); //濡傛灉娌℃湁浠诲姟锛屽垯鍙互杩涜绉诲姩鍑烘潵
+ }
+
}
}
return null;
@@ -511,7 +548,7 @@
AGVStation Muche2 = _agvStationService.GetMothervehicle(aGVStation.MotherCardeputy); //鍐呬晶姣嶈溅
int mucheaddre2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode);
- if ((neizichecurraddres == neiziche.WaitmomentOne || neizichecurraddres == neiziche.WaitmomentTwo) && task == null && mucheaddre1 == Muche.Motherinlaw && mucheaddre2 == Muche2.Motherinlaw)
+ if ((neizichecurraddres == neiziche.WaitmomentOne || neizichecurraddres == neiziche.WaitmomentTwo) && task == null && neizichecurraddres != neiziche.HCJStorageaddress && mucheaddre1 == Muche.Motherinlaw && mucheaddre2 == Muche2.Motherinlaw)
{
return _Task;
}
@@ -869,7 +906,7 @@
GetStackerObject getStackerObject = GetDeviceAddress.GetChildDeviceCode(zichestation.ChildPosiDeviceCode);
if (getStackerObject.StaclerkJobJobStatusValue != RGV_Rgvtaskstutas.Executing && getStackerObject.RgvCraneAutoStatusValue == RgvCraneAutoStatus.Automatic
- && (getStackerObject.RGVCurrentlocation == zichestation.WaitmomentOne || getStackerObject.RGVCurrentlocation == zichestation.WaitmomentTwo) && getStackerObject.RGVCurrentlocation != zichestation.ZicheMotherinlaw)
+ && (getStackerObject.RGVCurrentlocation == zichestation.WaitmomentOne || getStackerObject.RGVCurrentlocation == zichestation.WaitmomentTwo || getStackerObject.RGVCurrentlocation==1171) && getStackerObject.RGVCurrentlocation != zichestation.ZicheMotherinlaw)
{
RGVMovetask(GdZiche.Motherinlaw, GdZiche.ChildPosiDeviceCode);
}
--
Gitblit v1.9.3