From 1a5e38b9d9cb0b8a325b768a0da83a603fe383f2 Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Fri, 15 Dec 2023 10:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A2=84=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=B7=A5=E5=97=AF=E5=91=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Inputs/TaskBatchDelInput.cs                 | 13 +++++++++++++
 WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs |  8 ++++++++
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs   | 12 +-----------
 WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs  |  4 ++--
 WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs  |  2 ++
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskBatchDelInput.cs

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskBatchDelInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskBatchDelInput.cs
new file mode 100644
index 00000000..6d2653cb
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskBatchDelInput.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
+{
+    public class TaskBatchDelInput
+    {
+        public List<string> ids { get; set; }
+    }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs b/WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs
index 681ceee0..f96951ed 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs
@@ -1,7 +1,9 @@
 using JNPF.Common.Contracts;
+using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Entity;
 
 namespace Tnb.WarehouseMgr
@@ -48,5 +50,11 @@ namespace Tnb.WarehouseMgr
                 throw;
             }
         }
+
+        [HttpPost]
+        public async Task<bool> BatchDelete(TaskBatchDelInput input)
+        {
+            return await _db.Deleteable<T>().Where(it => input.ids.Contains(it.id)).ExecuteCommandHasChangeAsync();
+        }
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 975cbf76..7d17e9da 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -451,17 +451,7 @@ namespace Tnb.WarehouseMgr
                                 task.device_id = e.device_id;
                             }
                         }
-
-                        /*foreach (var at in agvDTTasks)
-                        {
-                            var ele = elevatorList.Find(x => x.location_code == at.endlocation_code);
-                            Logger.Information($"ele.elevator_id:{ele?.elevator_id},elevator_code:{ele?.elevator_code}");
-                            if (ele != null)
-                            {
-                                at.device_id = ele.elevator_id;
-                            }
-                        }*/
-
+                        
                         List<(string endlocation_code, string device_id, string id, int start_floor)> endLocCodes = agvDTTasks
                                             .Select(it => (it.endlocation_code, it.device_id, it.id, it.start_floor)).ToList();
                         var callLiftCnt = endLocCodes?.Count ?? 0;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs
index a594fa26..75f13e5a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs
@@ -6,11 +6,11 @@ using Tnb.WarehouseMgr.Entities.Consts;
 namespace Tnb.WarehouseMgr
 {
     [OverideVisualDev(ModuleConsts.MODULE_WMSDISTASK_ID)]
-    public class WmsDistaskService : BaseWareHouseService
+    public class WmsDistaskService : TaskManagerDelBase<WmsDistaskH>
     {
         private readonly ISqlSugarClient _db;
 
-        public WmsDistaskService(ISqlSugarRepository<WmsDistaskH> repository)
+        public WmsDistaskService(ISqlSugarRepository<WmsDistaskH> repository):base(repository.AsSugarClient())
         {
             _db = repository.AsSugarClient();
             OverideFuncs.DeleteAsync = Delete;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs
index 834189c5..545dd45c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs
@@ -1,4 +1,5 @@
 using JNPF.VisualDev;
+using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.WarehouseMgr.Entities;
 
@@ -11,5 +12,6 @@ namespace Tnb.WarehouseMgr
         {
 
         }
+        
     }
 }