From 638a684258fb4bc6adf76a1964bdf0d7f99e404f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 31 三月 2025 02:18:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/ConveyorLineJob_BC.cs | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
index 160aaee..fa79a4f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/ConveyorLineJob_BC.cs"
@@ -1,4 +1,5 @@
锘縰sing Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Quartz;
using SqlSugar;
using System;
@@ -98,7 +99,21 @@
ConveyorLineSignal conveyorLineSignalRead = conveyorLineInfoRead.Signal.ByteToBoolObject<ConveyorLineSignal>();
ConveyorLineSignal conveyorLineSignalWrite = conveyorLineInfoWrite.Signal.ByteToBoolObject<ConveyorLineSignal>();
-
+ if (item.StationType == StationTypeEnum.StationType_PakcPallet.ObjToInt())
+ {
+ if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK)
+ {
+ device.SetValue(W_ConveyorLineDB.TaskNum, 1, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, item.StationCode, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.EndPos, 1102, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
+ device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
+ }
+ else if(!conveyorLineSignalRead.STB && conveyorLineSignalWrite.ACK)
+ {
+ device.SetValue(W_ConveyorLineDB.ACK, false, item.StationCode);
+ }
+ }
if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt())
{
{
@@ -256,6 +271,7 @@
deviceCode = item.StackerCraneCode;
roadwayNo = responseContent.Data.ToString();
device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
}
else
{
@@ -266,10 +282,14 @@
else
{
//task.NextAddress鍙兘鏄痳outer.NextPosi
- device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
+ roadwayNo = responseContent.Data.ToString();
+ deviceCode = router.ChildPosiDeviceCode;
+ currentAddress = router.StartPosi;
+ nextAddress= router.NextPosi;
+ device.SetValue(W_ConveyorLineDB.EndPos, router.NextPosi, item.StationCode);
+ device.SetValue(W_ConveyorLineDB.StartPos, router.StartPosi, item.StationCode);
}
device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);
- device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Outbound.ObjToInt(), item.StationCode);
device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
_taskService.UpdateTask(task, taskState, currentAddress: currentAddress, nextAddress: nextAddress, targetAddress: targetAddress, deviceCode: deviceCode, roadwayNo: roadwayNo,heightType: conveyorLineInfoRead.Spare2);
--
Gitblit v1.9.3