From ee3bdbf31d599672fc3427a66655412693e14096 Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 01 四月 2026 20:15:41 +0800
Subject: [PATCH] 最新
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 322d591..a7606c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -1,4 +1,5 @@
锘縰sing Autofac.Core;
+using HslCommunication;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Hosting;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
@@ -64,24 +65,21 @@
Dt_Task? currtask = _taskService.CurrtaskInfo(commonStackerCrane.CurrentTaskNum);
if(currtask != null)
{
+ string PalletCode = "";
//鍒ゆ柇浠诲姟绫诲瀷
- if(currtask.TaskType== (int)TaskTypeEnum.Inventorybound)
+ if (currtask.TaskType== (int)TaskTypeEnum.Inventorybound)
{
//璇诲彇鏉＄爜锛岃繘琛岄厤瀵�
-
+
DeviceProDTO? deviceProDTO = commonStackerCrane.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == "SCBarcode");
byte[] bytes = commonStackerCrane.Communicator.Read(deviceProDTO.DeviceProAddress, 64);
- string result = Encoding.ASCII.GetString(bytes).Replace(" ", "");
-
- bool pandianBort = false;
- if(currtask.PalletCode== result) pandianBort= true;
-
+ //璇诲彇鐨勬墭鐩樻潯鐮�
+ PalletCode = Encoding.ASCII.GetString(bytes).Replace(" ", "");
}
- WebResponseContent webResponse = _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
+ WebResponseContent webResponse = _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum, PalletCode);
if (webResponse.Status)
{
-
bool ddjfk = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
}
}
@@ -92,6 +90,7 @@
{
if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
+
Dt_Task? task = GetTask(commonStackerCrane);
if (task != null)
{
@@ -348,7 +347,7 @@
public string LaneModification(string Roadway,int SCRow)
{
- if (Roadway == "F")
+ if (Roadway == "G")
{
return SCRow == 1 ? "3" : "4";
}else if(Roadway == "C")
--
Gitblit v1.9.3