From 9b3567a5a2f1a81bec684e8aecda3a1146906cca Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 28 四月 2025 17:10:46 +0800
Subject: [PATCH] 托盘输送线交互
---
Admin.NET/WCS.Application/Util/FourWayCarUtil.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs b/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
index 5116b4d..25c77d6 100644
--- a/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
+++ b/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
@@ -7,6 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using WCS.Application.Entity;
+using static Elastic.Clients.Elasticsearch.JoinField;
namespace WCS.Application.Util;
@@ -257,7 +258,21 @@
//}
if (currentModel.Make != locationModel.Make)
{
- neighbor.IsSendPlc = true;
+ //if (current.X != neighbor.X)
+ //{
+ // current.IsSendPlc = true;
+ //}
+
+ if (current.Y > neighbor.Y)
+ {
+ current.IsSendPlc = true;
+ }
+ else if (current.Y < neighbor.Y)
+ {
+ neighbor.IsSendPlc = true;
+ }
+
+ //current.IsSendPlc = true;
}
@@ -439,6 +454,28 @@
}
/// <summary>
+ /// 鑾峰彇鎬讳换鍔¤〃涓嬪彂ID涓婚敭
+ /// </summary>
+ /// <returns></returns>
+ public static int GetTaskId()
+ {
+ var list = _db.Queryable<WcsTask>().ToList();
+ var maxNo = list.Max(m => m.TaskId);
+
+ if (maxNo != null && maxNo > 0)
+ {
+ if (maxNo++ > 99999999)
+ {
+ return 1;
+ }
+
+ return (int)maxNo++;
+ }
+
+ return 1;
+ }
+
+ /// <summary>
/// 璁＄畻鏇煎搱椤胯窛绂�
/// </summary>
/// <param name="start">璧峰浣嶇疆</param>
--
Gitblit v1.8.0