解决冲突

chengsc

2025-04-28 94a1a7574f7ce3c61148742cb6f8e6c60a4ed3aa

 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("任务号生成失败");