From 2db17e312a9bf0cff60917104447260b86178ca2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 23 四月 2026 08:40:38 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
index 07fb90d..ac18766 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
@@ -83,11 +83,11 @@
private readonly ILogger _logger;
/// <summary>
- /// 鐩爣鍦板潃鍒拌澶囩被鍨嬬殑鏄犲皠
+ /// 鐩爣鍦板潃鍒拌澶囩被鍨嬬殑鏄犲皠(鍏ュ簱绔欏彴)
/// </summary>
/// <remarks>
/// </remarks>
- private static List<string> AddressToDeviceType = new List<string> { "11020", "11028" };
+ private static List<string> AddressToDeviceType = new List<string> { "11020", "11028", "2125" };
/// <summary>
/// 鎵樼洏妫�鏌ヤ綅缃殑鏈�杩戞墽琛屾椂闂达紙鐢ㄤ簬30绉掗棿闅旈檺鍒讹級
@@ -275,7 +275,7 @@
ProcessTaskState(conveyorLine, command, task, childDeviceCode);
return Task.CompletedTask;
}
- else if (command.TaskNo == 1 && !command.Barcode.IsNullOrEmpty() && childDeviceCode == "11068")
+ else if (!command.Barcode.IsNullOrEmpty() && childDeviceCode == "11068")
{
if (_robotTaskService.Db.Queryable<Dt_RobotTask>().Any(x => x.RobotTargetAddressPalletCode == command.Barcode))
{
--
Gitblit v1.9.3