From 969aafa8bd335025da4caf5939a1626bad4f4236 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 19 六月 2025 16:54:03 +0800
Subject: [PATCH] Merge branch 'csc'
---
Admin.NET/WCS.Application/Util/FourWayCarUtil.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs b/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
index e62d86b..0a8fe55 100644
--- a/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
+++ b/Admin.NET/WCS.Application/Util/FourWayCarUtil.cs
@@ -167,6 +167,15 @@
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="data">褰撳墠浠诲姟鎬昏矾寰�</param>
+ /// <param name="kXCarList">鎵�鏈夊皬杞�</param>
+ /// <param name="assignCar">褰撳墠鍒嗛厤灏忚溅</param>
+ /// <param name="waitTask">褰撳墠鎬讳换鍔�</param>
+ /// <param name="moveType">0鍘诲彇璐т换鍔� 1鍘绘斁璐�</param>
+ /// <returns></returns>
public static bool AddCarTask(List<CarModel> data, List<CarInfo> kXCarList, CarInfo assignCar, WcsTask waitTask,int moveType)
{
#region 鑾峰彇閫傚悎鎵ц褰撳墠浠诲姟鐨勫皬杞� 鐢熸垚璺緞锛堥渶鑰冭檻灏忚溅闃婚樆鎸★級
@@ -329,7 +338,7 @@
var lastPath = lastPathList[lastPathList.Length - 2];
var lastPath2 = lastPath.Substring(0,6);
- //濡傛灉姝ゆ鍒嗛厤璺緞鍖呭惈閱夎垶涓渶缁堣妭鐐硅矾寰勶紝娣诲姞绉昏蛋灏忚溅
+ //濡傛灉姝ゆ鍒嗛厤璺緞鍖呭惈浠诲姟涓渶缁堣妭鐐硅矾寰勶紝娣诲姞绉昏蛋灏忚溅
if (path.Contains(lastPath2))
{
--
Gitblit v1.8.0