From 2ecd9c5db603efcde9e6e51a500b3c2b1162fb85 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 28 四月 2025 17:15:44 +0800
Subject: [PATCH] 冲突合并
---
Admin.NET/WCS.Application/OpenApi/OpenApi.cs | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index 91917e5..c394ccf 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -42,38 +42,38 @@
{
throw Oops.Bah("浠诲姟:" + models.TaskNo + ";涓嶅瓨鍦�!");
}
- var data1 = FourWayCarUtil.GetCarPath(taskInfo.StartLocate, taskInfo.EndLocate);
+ 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涓嬪彂鐨勪换鍔�(澶�
--
Gitblit v1.8.0