From ffc097a3c3548add7a27482f82a19a719031f6cc Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Mon, 13 Nov 2023 15:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=95=E8=BD=BD=E5=85=B7=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs    |  2 +-
 .../Tnb.WarehouseMgr/WmsEmptyOutstockService .cs     | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 247c8b0e..523819c6 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -1047,7 +1047,7 @@ namespace Tnb.WarehouseMgr
                         {
                             throw new AppFriendlyException("电梯被禁用或未配置", 500);
                         }
-                        if(Math.Abs(ele) % 2 == 1)
+                        if(ele % 2 == 1)
                         {
                             //判断电梯组中各电梯任务数
                             if (curEle == null || sGpEle.FindAll(x => Math.Abs(x.task_nums - curEle.task_nums) % 2 == 1)?.Count > 0)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
index ba077a7a..ca9358cb 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs	
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs	
@@ -111,8 +111,6 @@ namespace Tnb.WarehouseMgr
                 if (carrys?.Count > 0)
                 {
                     int min = (carrys.Count > setQty.qty) ? setQty.qty : carrys.Count;
-                    //当出现多个载具同时出库，可能需要进入电梯时
-                    int ele = 2;
                     for (int i = 0; i < min; i++)
                     {
                         sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[i].location_id);
@@ -120,7 +118,7 @@ namespace Tnb.WarehouseMgr
                         bool isOk = false;
                         if (sPoint != null && ePoint != null)
                         {
-                            List<WmsPointH> points = await _wareHouseService.PathAlgorithmsEle(sPoint.id, ePoint.id ,ele);
+                            List<WmsPointH> points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
                             if (points.Count <= 2)
                             {
                                 throw new AppFriendlyException("该路径不存在", 500);
@@ -168,13 +166,7 @@ namespace Tnb.WarehouseMgr
                                 {
                                     preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
                                 }
-                                isOk = await _wareHouseService.GenPreTask(preTasks, null!);
-                                //判断当前任务中 是否有电梯任务。有的话ele+1
-                                var eleP = preTasks.Find(x => x.area_code.Contains("ELE"));
-                                if (eleP != null)
-                                {
-                                    ele++;
-                                }
+                                isOk = await _wareHouseService.GenPreTask(preTasks, null!);                             
                             }
                             if (isOk)
                             {