From 0b32cbb540e18be776966f455b5e891eb5a1fb1d Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Wed, 2 Aug 2023 16:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs | 1 +
 .../Dto/Inputs/TaskChainCallBackInput.cs                      | 4 ++++
 WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs        | 3 +++
 WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj         | 1 +
 4 files changed, 9 insertions(+)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs
index a5182436..81ad0a54 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs
@@ -28,6 +28,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// 取货/放货
         /// </summary>
         public string action { get; set; }
+       
 
 
     }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs
index 697ff122..5eb90d34 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs
@@ -12,6 +12,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// 状态
         /// </summary>
         public string status { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string deviceID { get; set; }
 
 
     }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
index 97600ffe..f3bc23f2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using NPOI.OpenXmlFormats;
 using Senparc.NeuChar.ApiHandlers;
 using SqlSugar;
+using Tnb.EquipMgr.Entities;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
@@ -106,9 +107,11 @@ namespace Tnb.WarehouseMgr
                     case "CREATED": break;
                     case "ALLOCATED":
                         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()
                         {
                             disTaskIds = disTasks.Select(x => x.id).ToList(),
+                            EqpIds = eps.Select(x => x.id).ToList(),
                         };
                         await _wareHouseService.TaskExecute(taskExecuteUpInput); break;
                     case "PROGRESSING": break;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
index 63e4864f..11bee379 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
+++ b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <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="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
     <ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" />