From a405703a3257bd0e6f6ec758a7fe6c500a1c47d0 Mon Sep 17 00:00:00 2001
From: qianjiawei <1184704771@qq.com>
Date: Mon, 18 Mar 2024 09:02:59 +0800
Subject: [PATCH] bug

---
 ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs     | 6 +++---
 WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs | 2 ++
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs      | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
index c02b9452..356249ef 100644
--- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
@@ -197,7 +197,7 @@ namespace Tnb.ProductionMgr
         private void ScanInStock(object state)
         {
             Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
-            getdic.Add("BGWRKYCL02", new string[] { "CP8", "AllowGetFullBox1", "code1", "PutDoneEmptyBox","false" });
+            getdic.Add("BGWRKYCL02", new string[] { "CP8", "AllowGetFullBox1", "code1", "PutDoneEmptyBox", "false" });
             getdic.Add("BGWRKYCL01", new string[] { "CP8", "AllowGetFullBox2", "code2", "PutDoneEmptyBox", "false" });
             foreach (var key in getdic.Keys)
             {
@@ -244,7 +244,7 @@ namespace Tnb.ProductionMgr
                                 input.data.Add("container_no", WmsCarryCode.container_no!);//箱号
                                 input.data.Add("material_id", WmsCarryCode.material_id);
                                 input.data.Add("id", null);
-                                _wmsPDAScanInStock.ScanInStockByRedis(input);
+                                _wmsPDAScanInStock.ScanInStockByRedis(input).Wait();
                             }
                         }
                     }
@@ -339,7 +339,7 @@ namespace Tnb.ProductionMgr
         {
             Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(300));
             CheckGettimer = new Timer(CheckGet, null, TimeSpan.Zero, TimeSpan.FromSeconds(10));
-            Scantimer = new Timer(ScanInStock, null, TimeSpan.Zero, TimeSpan.FromSeconds(30));
+            Scantimer = new Timer(ScanInStock, null, TimeSpan.Zero, TimeSpan.FromSeconds(60));
             SSXcodetimer= new Timer(SSXcode, null, TimeSpan.Zero, TimeSpan.FromSeconds(10));
             return Task.CompletedTask;
         }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
index 290cb8bb..c4ac9eee 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
@@ -101,10 +101,12 @@ namespace Tnb.WarehouseMgr
                 if (flag)
                 {
                     await _wareHouseService.SsxControl(dis, "LOAD");
+                    Logger.Information(dis.startlocation_code+"取货确认..................成功");
                     return await ToApiResult(HttpStatusCode.OK, "成功");
                 }
                 else
                 {
+                    Logger.Information(dis.startlocation_code + "取货确认..................失败");
                     return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
                 }
             }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index d7ad28c2..e5a3f44f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -255,8 +255,8 @@ namespace Tnb.WarehouseMgr
             putdic.Add("SSX-121-010", new string[] { "东面提升机输送线", "上升降机10允许入箱" });
             putdic.Add("SSX-021-003", new string[] { "YTCS", "AllowCtuEmptyIn_CS03" });
             putdic.Add("SSX-021-001", new string[] { "YTCS", "AllowCtuEmptyIn_CS01" });
-            putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowAgvFullIn_CS04",  });
-            putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowAgvFullIn_CS02", });
+            putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowCtuFullOut_CS04",  });
+            putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowCtuFullOut_CS02", });
             var strs = new string[] { };
             
             if (!putdic.ContainsKey(input.targetName))
@@ -284,6 +284,9 @@ namespace Tnb.WarehouseMgr
         {
             Dictionary<string, string[]> putdic = new Dictionary<string, string[]>();
             Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
+            putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowCtuFullOut_CS04", });
+            putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowCtuFullOut_CS02", });
+
             putdic.Add("ZS-C01-1", new string[] { "hxjC", "A2允许入空箱", });
             getdic.Add("ZS-C01-2", new string[] { "hxjC", "A2允许取满箱" });