From 1f909839d685470c72ad742454a91237cc19a166 Mon Sep 17 00:00:00 2001
From: "kang.luo" <986033787@qq.com>
Date: Wed, 20 Mar 2024 15:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs |  7 ++++---
 .../Tnb.WarehouseMgr/DeviceProviderService.cs      |  2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs  | 14 ++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
index 356249ef..197a304f 100644
--- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
@@ -218,8 +218,6 @@ namespace Tnb.ProductionMgr
                             ["Value"] = strs[4],
                         };
                         HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl,  dicCommand).Wait();
-
-
                         string codedata = _redisData.GetHash(strs[0], strs[2]).Result;
                         JObject? coderes = JsonConvert.DeserializeObject<JObject>(codedata);
                         string coderesult = coderes != null && coderes["Value"] != null ? coderes.Value<string>("Value")! : "";
@@ -279,7 +277,10 @@ namespace Tnb.ProductionMgr
                     string? result = res != null && res["Value"] != null ? res.Value<string>("Value") : "";
                     if (!string.IsNullOrEmpty(result))
                     {
-                        result = result.Replace("\r", "");
+                        if (result.Length < 5)
+                        {
+                            result = "LX" + result.Replace("\r", "");
+                        }
                         var DistaskH = _repository.AsSugarClient().Queryable<WmsDistaskH>().Where(p => p.carry_code == result && p.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).OrderByDescending(p => p.create_time).First();
                         if (DistaskH != null)
                         {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
index c4ac9eee..95c5f19c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
@@ -200,7 +200,7 @@ namespace Tnb.WarehouseMgr
             var dis = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code == input.taskCode).First();
             if (dis.area_code == "ZSCJ001")
             {
-                var flag = await _wareHouseService.Check(dis.startlocation_code, "UNLOAD");
+                var flag = await _wareHouseService.Check(dis.endlocation_code, "UNLOAD");
                 if (flag)
                 {
                     await _wareHouseService.SsxControl(dis, "UNLOAD");
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index e5a3f44f..4914e880 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -286,6 +286,8 @@ namespace Tnb.WarehouseMgr
             Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
             putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowCtuFullOut_CS04", });
             putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowCtuFullOut_CS02", });
+            getdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowAgvEmptyOut_CS01" });
+            getdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowAgvEmptyOut_CS03" });
 
             putdic.Add("ZS-C01-1", new string[] { "hxjC", "A2允许入空箱", });
             getdic.Add("ZS-C01-2", new string[] { "hxjC", "A2允许取满箱" });
@@ -350,8 +352,8 @@ namespace Tnb.WarehouseMgr
             getdic.Add("SSX-021-005", new string[] { "YTCS", "FullOut_CS05Done", "true" });
             getdic.Add("SSX-111-011", new string[] { "东面提升机输送线", "下升降机11出箱完毕", "true" });
             getdic.Add("SSX-111-012", new string[] { "东面提升机输送线", "下升降机12出箱完毕", "true" });
-            getdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AgvEmptyOut_CS03Done", "true" });
-            getdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AgvEmptyOut_CS01Done", "true" });
+            getdic.Add("ZSSSXCTU02", new string[] { "YTCS", "右输送线上层允许出箱3", "true" });
+            getdic.Add("ZSSSXCTU01", new string[] { "YTCS", "左输送线上层允许出箱1", "true" });
             getdic.Add("SSX-011-008", new string[] { "东面提升机输送线", "入库输送线8出箱完毕", "true" });
             getdic.Add("ZS-C01-2", new string[] { "hxjC", "A2AGV允许入满箱", "true" });
             getdic.Add("ZS-C02-2", new string[] { "hxjC", "A3AGV允许入满箱", "true" });
@@ -360,12 +362,16 @@ namespace Tnb.WarehouseMgr
             getdic.Add("ZS-C05-2", new string[] { "hxjC", "A6AGV允许入满箱", "true" });
             getdic.Add("ZS-C06-2", new string[] { "hxjC", "A7AGV允许入满箱", "true" });
 
+
+
+
+
             putdic.Add("SSX-021-007", new string[] { "东面提升机输送线", "出库输送线7入箱完毕", "true" });
             putdic.Add("SSX-011-006", new string[] { "YTCS", "EmptyIn_CS06Done", "true" });
             putdic.Add("SSX-021-003", new string[] { "YTCS", "AgvFullIn_CS03Done", "true" });
             putdic.Add("SSX-021-001", new string[] { "YTCS", "CtuEmptyIn_CS01Done", "true" });
-            putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AgvFullIn_CS04Done", "true" });
-            putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AgvFullIn_CS02Done", "true" });
+            putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "右输送线下层允许入箱4", "true" });
+            putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "左输送线下层允许入箱2", "true" });
             putdic.Add("SSX-121-009", new string[] { "东面提升机输送线", "上升降机9入箱完毕", "true" }); 
             putdic.Add("SSX-121-010", new string[] { "东面提升机输送线", "上升降机10入箱完毕", "true" });
             putdic.Add("YCLCKBGW", new string[] { "CP8", "PutDoneEmptyBox", "true" });