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/OpenApi/OpenApi.cs | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index 7d62853..c394ccf 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -1,23 +1,7 @@
-锘縰sing DocumentFormat.OpenXml.Presentation;
-using Elastic.Clients.Elasticsearch;
+锘縰sing Admin.NET.Core.Service;
using Furion.DatabaseAccessor;
using Furion.Logging;
-using NewLife.Serialization;
-using Newtonsoft.Json;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
using WCS.Application.Entity;
-using Microsoft.AspNetCore.Mvc;
-using Admin.NET.Core.Service;
-using DocumentFormat.OpenXml.Bibliography;
-using AngleSharp.Common;
-using AngleSharp.Text;
-using Newtonsoft.Json.Linq;
-using SqlSugar;
-using NewLife.Reflection;
-using static SKIT.FlurlHttpClient.Wechat.Api.Models.CustomServiceKfSessionGetWaitCaseResponse.Types;
using WCS.Application.Util;
namespace WCS.Application;
@@ -58,38 +42,38 @@
{
throw Oops.Bah("浠诲姟:" + models.TaskNo + ";涓嶅瓨鍦�!");
}
- var data1 = FourWayCarUtil.GetCarPath("090601", "080401");
+ var data1 = FourWayCarUtil.GetCarPath("090501", "080501","0");
if (data1 == null) //|| data1.Count == 0
{
throw Oops.Bah("鍒嗛厤璺緞涓嶅瓨鍦�!");
}
// 鏍规嵁浠诲姟鐘舵�� 琛ュ厖璧峰缁撴潫鑺傜偣鐘舵��
- var data2 = FourWayCarUtil.GetCarPathUp(data1, 1);
+ var data2 = FourWayCarUtil.GetCarPathUp(data1, 0);
var path = "";
var executionPath1 = "";
- foreach (var item in data1)
- {
- //璺緞鑺傜偣
- var pathXYZ = item.X.ToString().PadLeft(2, '0') + item.Y.ToString().PadLeft(2, '0') + item.Z.ToString().PadLeft(2, '0') + item.NodeCom.ToString();
- path += pathXYZ + ";";
- if (item.IsSendPlc)
- {
- executionPath1 += pathXYZ + ";";
- }
- }
- // 鎻掑叆鍥涘悜杞︿换鍔¤〃
- var carTask1 = new WcsCarTasks()
- {
- TaskNo = taskInfo.TaskNo,
- PreId = "",
- ExecutionPath = executionPath1,
- Path = path,
- CarNo = "",
- Status = TaskStatusEnum.Wait
- };
- var i = _db.Insertable(carTask1).ExecuteCommand();
- Console.WriteLine(""+i);
+ //foreach (var item in data1)
+ //{
+ // //璺緞鑺傜偣
+ // var pathXYZ = item.X.ToString().PadLeft(2, '0') + item.Y.ToString().PadLeft(2, '0') + item.Z.ToString().PadLeft(2, '0') + item.NodeCom.ToString();
+ // path += pathXYZ + ";";
+ // if (item.IsSendPlc)
+ // {
+ // executionPath1 += pathXYZ + ";";
+ // }
+ //}
+ //// 鎻掑叆鍥涘悜杞︿换鍔¤〃
+ //var carTask1 = new WcsCarTasks()
+ //{
+ // TaskNo = taskInfo.TaskNo,
+ // PreId = "",
+ // ExecutionPath = executionPath1,
+ // Path = path,
+ // CarNo = "",
+ // Status = TaskStatusEnum.Wait
+ //};
+ //var i = _db.Insertable(carTask1).ExecuteCommand();
+ //Console.WriteLine(""+i);
}
/// WCS鎺ュ彈WMS涓嬪彂鐨勪换鍔�(澶�
@@ -122,7 +106,7 @@
//鏂板浠诲姟
var taskAdd = new WcsTask()
{
- TaskNo = models.TaskNo,
+ TaskNo = models.TaskNo,
TaskType = (TaskTypeEnum)Convert.ToInt32(models.TaskType),
Type = models.Type,
Status = TaskStatusEnum.Wait,
@@ -134,6 +118,13 @@
EndRoadway = models.EndRoadway,
PalletNo = models.PalletNo,
};
+
+ // 鑻ラ潪AGV浠诲姟澧炲姞浠诲姟ID
+ if (models.Type != PLCTypeEnum.AGV)
+ {
+ taskAdd.TaskId = FourWayCarUtil.GetTaskId();
+ }
+
listTask.Add(taskAdd);
}
await _db.Insertable(listTask).ExecuteCommandAsync();
@@ -175,6 +166,13 @@
EndRoadway = models.EndRoadway,
PalletNo = models.PalletNo,
};
+
+ // 鑻ラ潪AGV浠诲姟澧炲姞浠诲姟ID
+ if (models.Type != PLCTypeEnum.AGV)
+ {
+ taskAdd.TaskId = FourWayCarUtil.GetTaskId();
+ }
+
await _db.Insertable(taskAdd).ExecuteCommandAsync();
}
--
Gitblit v1.8.0