From 51af2794f47d5b68496edbc09d0ccb168347f02b Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期六, 22 十一月 2025 10:19:05 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 1042243..c87ba04 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Routing;
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Routing;
using Quartz;
using SqlSugar;
using System.Threading.Tasks;
@@ -17,6 +18,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
@@ -50,7 +52,7 @@
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
if (flag && value != null)
{
- OtherDevice device = (OtherDevice)value;
+ OtherDevice device = (OtherDevice)value;
List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).Distinct().ToList();//鑾峰彇璁惧涓嬬殑绔欏彴
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode); //鑾峰彇璁惧涓嬬殑绔欏彴
try
@@ -91,6 +93,7 @@
if (dt_Ta != null)
{
device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
+ bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);
device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
@@ -110,13 +113,15 @@
//杈撻�佺嚎瀹屾垚淇敼鎴愯緭閫佺嚎瀹屾垚鐘舵�佸緟鍫嗗灈鏈烘墽琛屼换鍔�
if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
{
- if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))
+ Dt_Task dt_Task = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode);
+ if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& dt_Task !=null)
{
+ bool ack = device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
+ bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo,1, item.StationCode);
WebResponseContent contentweb = _taskService.UpdateTaskIninfo(conveyorLineInfoRead.Barcode,item.StationCode); //鏍规嵁鏉＄爜璺熻澶囩紪鍙峰幓鏌ヨ骞朵慨鏀逛换鍔�
if (contentweb.Status)
{
- device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
- device.SetValue(W_ConveyorLineDB.TaskNo,1, item.StationCode);
+
}
}
}
@@ -160,18 +165,29 @@
Dt_Task dt_Ta = _taskService.GetOutTaskInfo(item.StationCode); //鑾峰彇鍑哄簱浠诲姟
+
if (dt_Ta != null)
{
- device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
- device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);
- device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
- //鍫嗗灈鏈轰换鍔″畬鎴愪笅涓�鍦板潃鏀规垚杈撻�佺嚎涓嬩竴鍦板潃锛岃澶囩紪鍙锋敼鎴愯緭閫佺嚎
- _taskService.UpdateTaskStatusToNext(dt_Ta.TaskNum);
+ bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
+ bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.OutboundPlatform, item.StationCode);
+ bool stb = device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
- if (dt_Ta.TargetAddress !="2021" && dt_Ta.TargetAddress != "2020")
- {
- //鍒犻櫎浠诲姟
- _taskRepository.DeleteData(dt_Ta);
+ if (taskno && endpos && stb)
+ {
+ //鍫嗗灈鏈轰换鍔″畬鎴愪笅涓�鍦板潃鏀规垚杈撻�佺嚎涓嬩竴鍦板潃锛岃澶囩紪鍙锋敼鎴愯緭閫佺嚎
+ WebResponseContent webResponse = _taskService.UpdateTaskStatusToNext(dt_Ta.TaskNum);
+ if (webResponse.Status)
+ {
+ if (dt_Ta.TargetAddress != "2021" && dt_Ta.TargetAddress != "2020")
+ {
+ //鍒犻櫎浠诲姟
+ bool res = _taskRepository.DeleteData(dt_Ta);
+ if (res)
+ {
+ TaskService.AddTaskHistory(dt_Ta);
+ }
+ }
+ }
}
}
@@ -189,14 +205,28 @@
{
if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
{
- if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//閲囪喘鍏ュ簱
+ Dt_Task dt_Task = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode);
+
+ if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& dt_Task != null)//閲囪喘鍏ュ簱
{
Dt_Task dt_Ta = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode); //閫氳繃鏉＄爜鍘绘煡璇换鍔�
- if(dt_Ta != null)
+ //if (dt_Ta.SourceAddress == "2021" || dt_Ta.SourceAddress == "2020")
+ //{
+ // bool IsOccupied2008 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2008");
+ // bool IsOccupied2009 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2009");
+ // bool IsOccupied2015 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2015");
+ // bool IsOccupied2016 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2016");
+ // //鍒ゆ柇鏄惁鎴愮珛
+ // if (IsOccupied2008 || IsOccupied2009 || IsOccupied2015 || IsOccupied2016)
+ // {
+ // return null;
+ // }
+ //}
+ if (dt_Ta != null)
{
- device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.SourceAddress, item.StationCode);
- device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
- device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
+ bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.SourceAddress, item.StationCode);
+ bool taskno = device.SetValue(W_ConveyorLineDB.TaskNo, dt_Ta.TaskNum, item.StationCode);
+ bool ack = device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
}
}
@@ -210,10 +240,8 @@
}
}
}
-
}
-
-
+
catch (Exception ex)
{
}
@@ -223,5 +251,26 @@
}
return Task.CompletedTask;
}
+
+ //鑾峰彇鎷ｉ�夌姸鎬佹湁鏃犺揣鐘舵��
+ public static bool GetPick()
+ {
+ //bool IsOccupied2008 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2008");
+ //bool IsOccupied2009 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2009");
+ //bool IsOccupied2015 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2015");
+ //bool IsOccupied2016 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2016");
+
+ ////鍒ゆ柇鏄惁鎴愮珛
+ //if (IsOccupied2008&&IsOccupied2009&&IsOccupied2015&&IsOccupied2016)
+ //{
+ // return false;
+ //}
+ //else
+ //{
+ // return true;
+ //}
+
+ return true;
+ }
}
}
--
Gitblit v1.9.3