From f501e1d11653b2500e032a0d3c255f62aac4b054 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 02 二月 2026 15:06:46 +0800
Subject: [PATCH] 清理杂项文件
---
代码管理/WCS/WCSServices/WIDESEAWCS_Tasks/原料库/ConveyorLineJob_YL1ndFloor.cs | 152 --------------------------------------------------
1 files changed, 0 insertions(+), 152 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
index feb8c6f..e1d746e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
@@ -70,158 +70,6 @@
//鑾峰彇鎵�鏈夊崗璁殑杈撻�佺嚎绔欏彴
List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).ToList();
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);
- foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
- {
- DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(WR_CLineYLDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- if (deviceProRead != null)
- {
- R_ConveyorLineYLInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineYLInfo>(deviceProRead.DeviceProAddress);
- if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID)) //涓�妤兼潵鏂欑О閲嶇珯鍙板厑璁稿叆搴撶敵璇�
- {
- WebResponseContent content = _taskService.YLPurchaseBoxing(conveyorLineInfoRead.WR_TMID, weight: conveyorLineInfoRead.WR_Weight, thickness: conveyorLineInfoRead.WR_Height, wide: conveyorLineInfoRead.WR_Width);
- if (content.Status)
- {
- device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode);
- WriteInfo(item.StationCode, $"璇锋眰鍏ュ簱鏉＄爜:{conveyorLineInfoRead.WR_TMID}");
- }
- else
- {
- WriteError(item.StationCode, $"璇锋眰鍏ュ簱澶辫触锛歿content.Message}");
- }
-
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && conveyorLineInfoRead.WR_Task <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID)) //涓�妤煎垎閰嶇珯鍙板叆搴撳垎閰嶇洰鏍囩偣(骞冲彴)
- {
- Dt_Task task = _taskRepository.QueryFirst(x => x.RfidCode == conveyorLineInfoRead.WR_TMID && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && x.DeviceCode == device.DeviceCode);
- if (task == null)
- {
- WebResponseContent content = _taskService.RequestYLWMSTaskSimple(conveyorLineInfoRead.WR_TMID, item.StationCode);
- if (!content.Status)
- {
- WriteError(item.StationCode, $"璇锋眰鍏ュ簱澶辫触锛歿content.Message}");
- }
- }
- else //鍙戦�佷换鍔�
- {
- device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode);
- _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
- WriteInfo(item.StationCode, $"{conveyorLineInfoRead.Serialize()}");
- }
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && conveyorLineInfoRead.WR_Task > 0) //涓�妤煎垎閰嶇珯鍙板叆搴撳垎閰嶇洰鏍囩偣(搴撳唴)
- {
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt() && x.DeviceCode == device.DeviceCode);
- //鍙戦�佷换鍔�
- if (task != null)
- {
- if (string.IsNullOrEmpty(task.Roadway) && string.IsNullOrEmpty(task.NextAddress))
- {
- WebResponseContent content = _taskService.AssignYLRoadwayNo(task.PalletCode);
- if (!content.Status)
- {
- WriteError(item.StationCode, $"璇锋眰鍏ュ簱澶辫触锛歿content.Message}");
- }
- string roadWay = content.Data.ToString();
- //鑾峰彇璺敱閰嶇疆
- List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == task.TaskType && task.CurrentAddress == x.StartPosi && x.ChildPosiDeviceCode== roadWay);
- Dt_Router router = routers.FirstOrDefault();
- if (router == null)
- {
- WriteError(item.StationName, $"浠诲姟鍙�:{task.TaskNum}鏈壘鍒拌矾鐢遍厤缃俊鎭�");
- return Task.CompletedTask;
- }
- task.Roadway = roadWay;
- task.NextAddress = router.NextPosi;
- _taskService.UpdateTask(task,TaskStatusEnum.AGV_Finish);
- }
- else
- {
- device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_TMID, task.PalletCode, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode);
- _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
- WriteInfo(item.StationCode, $"璇锋眰鍏ュ簱鎴愬姛:{conveyorLineInfoRead.Serialize()}");
- }
- }
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode > 0 && conveyorLineInfoRead.WR_Request == 86 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID) && conveyorLineInfoRead.WR_Task>0) //鍏ュ簱绔欏彴鐢宠
- {
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode);
- if (task != null)
- {
- //鍒嗛厤璐т綅
- string? local = _taskService.RequestAssignLocation(task.TaskNum, task.Roadway);
- if (!string.IsNullOrEmpty(local))
- {
- device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode);
- task.CurrentAddress = item.StackerCraneStationCode;
- task.TargetAddress = local;
- task.NextAddress = local;
- task.DeviceCode = item.StackerCraneCode;
- _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute);
- WriteInfo(item.StationName, $"浠诲姟鍙�:{task.TaskNum}杩涜鍫嗗灈鏈哄叆搴�");
- }
- else
- {
- WriteError(item.StationCode, $"璇锋眰鍏ュ簱璐т綅澶辫触");
- }
-
- }
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 99 && conveyorLineInfoRead.WR_Task > 0) //鍑虹珯鍙板垎閰嶇洰鏍囩偣
- {
- Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && x.TaskNum == conveyorLineInfoRead.WR_Task && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode);
- if (task != null)
- {
- //鍙戦�佺洰鏍囩偣
- device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_TMID, task.PalletCode, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode);
- device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode);
- if (task.TaskType==TaskTypeEnum.OutPick.ObjToInt())
- {
- task.Roadway = task.TargetAddress;
- task.TargetAddress = "";
- task.TaskType=TaskTypeEnum.InPick.ObjToInt();
- }
- _taskService.UpdateTask(task,TaskStatusEnum.Line_Executing);
- WriteInfo(item.StationCode, $"浠诲姟鍙�:{task.TaskNum}鍑哄簱鑷硔task.NextAddress}");
- }
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_Task > 0 && conveyorLineInfoRead.WR_Request == 98) //涓�妤艰�佸巶鍑哄簱鍙ｅ畬鎴�
- {
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode);
- if (task != null)
- {
- //浠诲姟鍥炲
- device.SetValue(WR_CLineYLDB.WR_Reresult, 98, item.StationCode);
- _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing, deviceCode: "CL3_YL");
- WriteInfo(item.StationCode, $"浠诲姟鍙�:{task.TaskNum}锛孯IFD{task.RfidCode}涓�妤煎嚭搴撹嚦鑰佸巶鎴垮畬鎴�");
- }
- }
- else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_Task <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID) && conveyorLineInfoRead.WR_Request == 98) //涓�妤艰�佸巶鍑哄簱鍙ｅ畬鎴�
- {
- Dt_Task task = _taskRepository.QueryFirst(x => (x.RfidCode == conveyorLineInfoRead.WR_TMID || x.PalletCode== conveyorLineInfoRead.WR_TMID) && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode);
- if (task != null)
- {
- //浠诲姟鍥炲
- device.SetValue(WR_CLineYLDB.WR_Reresult, 98, item.StationCode);
- _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing, deviceCode: "CL3_YL");
- WriteInfo(item.StationCode, $"浠诲姟鍙�:{task.TaskNum}锛孯IFD{task.RfidCode}涓�妤煎嚭搴撹嚦鑰佸巶鎴垮畬鎴�");
- }
- }
- }
- else
- {
- WriteError(item.StationName, $"鏈壘鍒拌澶囧瓙缂栧彿{item.StationCode}鐨勫崗璁俊鎭�");
- }
- }
}
return Task.CompletedTask;
}
--
Gitblit v1.9.3