From d23b8b125abba82ba9ffa837d712888b9b7b7d8b Mon Sep 17 00:00:00 2001
From: taomin0419 <865692298@qq.com>
Date: Tue, 27 Jun 2023 16:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A5=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.BasicData.Entities/Entity/BasLocation.cs   |  2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs  | 14 +++++++++++++-
 .../Tnb.WarehouseMgr/WmsPDAInStockService.cs       |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
index 78e5b2ec..e27f81bd 100644
--- a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
+++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
@@ -43,7 +43,7 @@ public partial class BasLocation : BaseEntity<string>
     /// <summary>
     /// 是否使用
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(1)", SqlParameterDbType = typeof(CommonPropertyConvert))]
+    //[SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(CommonPropertyConvert))]
     public int is_use { get; set; }
 
     /// <summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 34a673f8..56f2fd96 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -210,7 +210,19 @@ namespace Tnb.WarehouseMgr
         [HttpGet]
         public async Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input)
         {
-            var items = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.warehouse_id && it.is_lock == 0 && it.is_use == (int)EnumCarryStatus.空闲 && it.is_type == "0").OrderBy(it => new { it.layers, it.loc_line, it.loc_column }, OrderByType.Asc).ToListAsync();
+            var items = new List<BasLocation>();
+            try
+            {
+
+                //var stauts = (int)EnumCarryStatus.空闲;
+                items = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.warehouse_id && it.is_lock == 0 && it.is_type == "0" && it.is_use == (int)EnumCarryStatus.空闲).OrderBy(it => new { it.layers, it.loc_line, it.loc_column }, OrderByType.Asc).ToListAsync();
+
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
             return items.Take(input.Size).ToList();
         }
         /// <summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index 3d9003e6..8f2d9b8a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -69,8 +69,8 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
-        public async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input)
+        //[HttpPost]
+        private async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input)
         {
             try
             {