From 94a1a7574f7ce3c61148742cb6f8e6c60a4ed3aa Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期一, 28 四月 2025 17:19:53 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 96f193c..6d8a963 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -10,6 +10,7 @@
using NewLife;
using WCS.Application.Entity;
using WCS.Application.Service.WcsTask.Dto;
+using WCS.Application.Util;
namespace WCS.Application;
@@ -86,6 +87,13 @@
{
//鐢熸垚浠诲姟鍙�
entity.TaskNo = GetTaskCode();
+ // 鍒ゆ柇鏄惁绌挎杞︿换鍔�
+ if (entity.Type != PLCTypeEnum.AGV)
+ {
+ entity.TaskId = FourWayCarUtil.GetTaskId();
+ }
+
+
if (string.IsNullOrEmpty(entity.TaskNo))
{
throw Oops.Bah("浠诲姟鍙风敓鎴愬け璐�");
--
Gitblit v1.8.0