wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
qianjiawei
2023-12-15 16:37:26 +08:00
parent 0cca20b0ff 1a5e38b9d9
commit afaf05e5a4
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskBatchDelInput.cs Normal file
View File

@@ -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; }
}
}

8
WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs
View File

@@ -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();
}
}
}

12
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -446,17 +446,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;

4
WarehouseMgr/Tnb.WarehouseMgr/WmsDistaskService.cs
View File

@@ -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;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPretaskService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.VisualDev;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.WarehouseMgr.Entities;
@@ -11,5 +12,6 @@ namespace Tnb.WarehouseMgr
{
}
}
}