From a95a257a702360e7632b5daeb5b554163382720c Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 17 四月 2025 17:00:59 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CP.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 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 e098a47..35da841 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"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Microsoft.AspNetCore.Components.Routing;
+using Newtonsoft.Json;
using Quartz;
using SqlSugar.Extensions;
using System;
@@ -77,7 +78,7 @@
DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(W_ConveyorLineCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
if (item.StationType==StationTypeEnum.StationType_OnlyInbound.ObjToInt() && deviceProWrite!=null)
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && (x.TaskState == TaskStatusEnum.New.ObjToInt()) && x.WarehouseId == warehouseDevice.WarehouseId);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && (x.TaskState == TaskStatusEnum.New.ObjToInt()) && x.DeviceCode == device.DeviceCode);
if (task!=null)
{
//鑾峰彇绔欏彴
@@ -101,9 +102,13 @@
device.SetValue(W_ConveyorLineCPDB.TaskNum, task.TaskNum, item.StationCode);
device.SetValue(W_ConveyorLineCPDB.WorkType, task.PalletType, item.StationCode);
device.SetValue(W_ConveyorLineCPDB.WorkMode, 1, item.StationCode);
+ device.SetValue(W_ConveyorLineCPDB.CheckPos, 1, item.StationCode);
//鍚姩鎸囦护
device.SetValue(W_ConveyorLineCPDB.ConveyArrival, 1, item.StationCode);
-
+ if (task.TaskType==TaskTypeEnum.EmptyProductBack.ObjToInt())
+ {
+ _taskService.TaskCompleted(task.TaskNum);
+ }
}
}
else if (item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt() && deviceProRead != null)
@@ -115,7 +120,7 @@
if (conveyorLineInfoRead.ConveyArrivaled==1 && isCanTake==1)
{
//鑾峰彇浠诲姟
- Dt_Task task = _taskRepository.QueryFirst(x => x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && (x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()) && x.WarehouseId == warehouseDevice.WarehouseId && x.TaskNum == conveyorLineInfoRead.TaskNum.ObjToInt());
+ Dt_Task task = _taskRepository.QueryFirst(x => x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && (x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()) && x.DeviceCode == device.DeviceCode && x.TaskNum == conveyorLineInfoRead.TaskNum.ObjToInt());
//鑾峰彇绔欏彴
if (task!=null)
{
@@ -146,6 +151,48 @@
}
}
+ 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