From 6ce793ea5c1a6a9352706b4dd5785231ff7e047b Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Fri, 15 Dec 2023 10:00:19 +0800
Subject: [PATCH] 1

---
 .../Dto/Queries/ElevagorInfoQuery.cs          |  4 ++++
 .../Tnb.WarehouseMgr/WareHouseService.cs      | 22 -------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/ElevagorInfoQuery.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/ElevagorInfoQuery.cs
index 5f709c6d..7418b67b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/ElevagorInfoQuery.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/ElevagorInfoQuery.cs
@@ -10,5 +10,9 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Queries
     {
         public string taskCode { get; set; }
         public string endlocation_id { get; set; }
+        public string startlocation_id { get; set; }
+        public string sourceName { get; set; }
+
+
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 539ddfd1..975cbf76 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -290,27 +290,6 @@ namespace Tnb.WarehouseMgr
             SqlSugarClient db = _db.CopyNew();
             try
             {
-                //一楼中储仓CTU
-                //CTUTaskExecute(db);
-
-
-
-                //获取电梯数据
-                /*List<WmsElevatorH> elevatorList = await db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
-                                            .Where((a, b) => a.enabled == 1)
-                                           .Select((a, b) => new WmsElevatorH
-                                           {
-
-                                               bill_id = b.bill_id,
-                                               location_id = b.location_id,
-                                               location_code = b.location_code,
-                                               point_id = b.point_id,
-                                               point_code = b.point_code,
-                                               floor = b.floor
-
-                                           }, true).ToListAsync();*/
-
-
                 //获取所有未下发的预任务申请
                 List<WmsPretaskH> preTasks = await db.Queryable<WmsPretaskH>().InnerJoin<WmsCarryH>((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id)
                                     .InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id)
@@ -332,7 +311,6 @@ namespace Tnb.WarehouseMgr
                                         .ToList();
             
 
-                //it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)
                 var elePreTasks = preTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList();
                 var normalPreTasks = preTasks.Where(it =>it.area_code!="B"&& !agvElevatorTasks.Concat(elePreTasks).Select(x => x.endlocation_code).Contains(it.endlocation_code)).ToList();