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

增加设备ID

Browse Source
This commit is contained in:
FanLian
2023-08-02 16:39:26 +08:00
parent 9b4e76192a
commit 0b32cbb540
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs
View File

@@ -28,6 +28,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// 取货/放货 /// 取货/放货
/// </summary> /// </summary>
public string action { get; set; } public string action { get; set; }
} }

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs
View File

@@ -12,6 +12,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// 状态 /// 状态
/// </summary> /// </summary>
public string status { get; set; } public string status { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string deviceID { get; set; }
} }

3
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
using NPOI.OpenXmlFormats; using NPOI.OpenXmlFormats;
using Senparc.NeuChar.ApiHandlers; using Senparc.NeuChar.ApiHandlers;
using SqlSugar; using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
@@ -106,9 +107,11 @@ namespace Tnb.WarehouseMgr
case "CREATED": break; case "CREATED": break;
case "ALLOCATED": case "ALLOCATED":
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => it.bill_code.Contains(input.taskChainCode)).ToListAsync(); var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => it.bill_code.Contains(input.taskChainCode)).ToListAsync();
var eps = await _db.Queryable<EqpEquipment>().Where(it => it.code.Contains(input.deviceID)).ToListAsync();
TaskExecuteUpInput taskExecuteUpInput = new() TaskExecuteUpInput taskExecuteUpInput = new()
{ {
disTaskIds = disTasks.Select(x => x.id).ToList(), disTaskIds = disTasks.Select(x => x.id).ToList(),
EqpIds = eps.Select(x => x.id).ToList(),
}; };
await _wareHouseService.TaskExecute(taskExecuteUpInput); break; await _wareHouseService.TaskExecute(taskExecuteUpInput); break;
case "PROGRESSING": break; case "PROGRESSING": break;

1
WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
View File

@@ -11,6 +11,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" /> <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
<ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Entities\Tnb.EquipMgr.Entities.csproj" />
<ProjectReference Include="..\..\ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" /> <ProjectReference Include="..\..\ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" /> <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" /> <ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" />