From 5416aff03e28b3387ed77af527c62b291eea2595 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Mon, 31 Jul 2023 16:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BasicData/Tnb.BasicData/BasLocationService.cs                | 1 +
 BasicData/Tnb.BasicData/Tnb.BasicData.csproj                 | 1 +
 .../Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs         | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs            | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs | 5 +++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/BasicData/Tnb.BasicData/BasLocationService.cs b/BasicData/Tnb.BasicData/BasLocationService.cs
index 7a71e461..4f9dc202 100644
--- a/BasicData/Tnb.BasicData/BasLocationService.cs
+++ b/BasicData/Tnb.BasicData/BasLocationService.cs
@@ -11,6 +11,7 @@ using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.BasicData.Entities.Enums;
 using Tnb.BasicData.Interfaces;
+using Tnb.WarehouseMgr.Entities.Enums;
 
 namespace Tnb.BasicData
 {
diff --git a/BasicData/Tnb.BasicData/Tnb.BasicData.csproj b/BasicData/Tnb.BasicData/Tnb.BasicData.csproj
index b8c2bccd..5ce642a8 100644
--- a/BasicData/Tnb.BasicData/Tnb.BasicData.csproj
+++ b/BasicData/Tnb.BasicData/Tnb.BasicData.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
+    <ProjectReference Include="..\..\WarehouseMgr\Tnb.WarehouseMgr.Entities\Tnb.WarehouseMgr.Entities.csproj" />
     <ProjectReference Include="..\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
   </ItemGroup>
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
index 0128222d..e4cfc765 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
@@ -28,7 +28,7 @@ namespace Tnb.WarehouseMgr.Interfaces
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
+        Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
         /// <summary>
         /// 路径算法
         /// </summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index f93d0f53..1190542f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -179,7 +179,7 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<dynamic> OutStockStrategy(OutStockStrategyQuery input)
+        public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input)
         {
             var whereExpr = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
                                              .And((a, b, c) => a.is_lock == 0)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
index e763bf4d..1950e78e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
@@ -73,7 +73,8 @@ namespace Tnb.WarehouseMgr
                 VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true);
                 await _runService.Create(templateEntity, input);
                 //入库取终点
-                //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
+                var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
+                var outStkCarry = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
                 WmsPointH? sPoint = null;
                 WmsPointH? ePoint = null;
                 if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
@@ -82,7 +83,7 @@ namespace Tnb.WarehouseMgr
                 }
                 if (carry != null)
                 {
-                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == outStkCarry[0].location_id);
                 }
 
                 if (sPoint != null && ePoint != null)