From 88676143aeceaeec3bd108f9cd609c4f3470ba96 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 30 七月 2025 15:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CP.cs | 42 ------------------------------------------
1 files changed, 0 insertions(+), 42 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CP.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CP.cs"
index be2511e..1b4c87b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CP.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CP.cs"
@@ -157,48 +157,6 @@
}
}
- //Dt_StationManger? dt_StationManger = stationMangers.FirstOrDefault(x => x.StationType == StationTypeEnum.StationType_ProductBackTake.ObjToInt());
- //if (dt_StationManger != null)
- //{
- // DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == dt_StationManger.StationCode && x.DeviceProParamType == nameof(W_ConveyorLineCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- // List<Dt_StationManger> ProductBackStations = stationMangers.Where(x => x.StationType == StationTypeEnum.StationType_ProductBack.ObjToInt()).ToList();
- // for (int i = 0; i < ProductBackStations.Count(); i++)
- // {
- // short isCanTake = device.GetValue<GroundStationDBName, short>(GroundStationDBName.R_IsCanTake, dt_StationManger.StationCode);
- // Dt_StationManger stationManger = ProductBackStations[i];
- // string startDb = "DB29.";
- // short stationCurrentStatus = device.Communicator.Read<short>(startDb + stationManger.Remark.ToString());
- // short stationEndStatus = device.Communicator.Read<short>(startDb + (stationManger.Remark.ObjToInt() + 2).ToString());
- // bool endStatus = true;
- // if ((i != 2 && i != 5 && i != 8))
- // {
- // endStatus = (stationEndStatus == 1);
- // }
- // //璇诲彇绾夸綋娈电姸鎬�
- // if (isCanTake == 1 && stationCurrentStatus == 1 && stationManger.IsOccupied==0 && endStatus)
- // {
- // device.SetValue(W_ConveyorLineCPDB.StartPos, dt_StationManger.StationCode, dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.EndPos, stationManger.AGVStationCode, dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.Barcode, "C00001", dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.TaskNum, DateTime.Now.ToString("yyMMddHHmmss"), dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.WorkType, 1, dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.WorkMode, 1, dt_StationManger.StationCode);
- // device.SetValue(W_ConveyorLineCPDB.CheckPos, 1, dt_StationManger.StationCode);
- // //鍚姩鎸囦护
- // device.SetValue(W_ConveyorLineCPDB.ConveyArrival, 1, dt_StationManger.StationCode);
- // stationManger.IsOccupied = 1;
- // _stationMangerRepository.UpdateData(stationManger);
- // Thread.Sleep(2000);
- // return Task.CompletedTask;
- // }
- // else if(stationManger.IsOccupied == 1 && (stationCurrentStatus == 3))
- // {
- // stationManger.IsOccupied = 0;
- // _stationMangerRepository.UpdateData(stationManger);
- // }
- // }
- //}
-
}
return Task.CompletedTask;
}
--
Gitblit v1.9.3