From 90db5740ec482c39223337ed7ef34fad7de23475 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Mon, 16 Sep 2024 15:15:42 +0800
Subject: [PATCH 1/2] bug

---
 ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs b/ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs
index f79fd93d..6725f680 100644
--- a/ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs
@@ -125,19 +125,19 @@ namespace Tnb.ProductionMgr
             //         Log.Information($"{device},{eqpDaq3.label_name}称重完成返回结果:{responseresult}");
             //     }
             // }
-            string equipStatus = await _redisData.GetHash(device, "1 启动 2 停止 3手动 4 急停");
+            int equipStatus = await _redisData.TryGetValueByKeyField<int>(device, "1 启动 2 停止 3手动 4 急停");
             Log.Information($"换箱机状态:{equipStatus}");
-            if (equipStatus != "1")
+            if (equipStatus.ToString() != "1")
             {
-                if (equipStatus.Trim() == "2")
+                if (equipStatus.ToString().Trim() == "2")
                 {
                     throw Oops.Bah("换箱机状态为停止");
                 }
-                if (equipStatus.Trim() == "3")
+                if (equipStatus.ToString().Trim() == "3")
                 {
                     throw Oops.Bah("换箱机状态为手动");
                 }
-                if (equipStatus.Trim() == "4")
+                if (equipStatus.ToString().Trim() == "4")
                 {
                     throw Oops.Bah("换箱机状态为急停");
                 }

From 2ca29a3a14af6fd2ad4c29c11f079977fe73a26c Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Mon, 16 Sep 2024 16:29:01 +0800
Subject: [PATCH 2/2] bug

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
index 2b30dfef..82598acb 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
@@ -1032,7 +1032,7 @@ namespace Tnb.WarehouseMgr
                     List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();
                     DictionaryDataEntity unitData = await _db.Queryable<DictionaryTypeEntity>()
                         .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
-                        .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id)
+                        .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && (y.EnCode == wmsMaterialTransferd.unit_id || y.Id==wmsMaterialTransferd.unit_id))
                         .Select((x, y) => y)
                         .FirstAsync();
                     string unitId = unitData?.Id ?? "";