From 9f5fdc24e9d8ebbc42098f6414bc397e7a165782 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Thu, 28 Nov 2024 17:59:29 +0800
Subject: [PATCH] V1.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.增加硬件禁用逻辑
2.弹窗报错逻辑优化（入库中的错误不再发再次进入入库指令）
---
 WCS.BLL/Manager/WarningManager.cs    |  8 ++++++++
 货架标准上位机/货架标准上位机.csproj | 14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WCS.BLL/Manager/WarningManager.cs b/WCS.BLL/Manager/WarningManager.cs
index 50f8ccf..1e7ef56 100644
--- a/WCS.BLL/Manager/WarningManager.cs
+++ b/WCS.BLL/Manager/WarningManager.cs
@@ -136,6 +136,14 @@ namespace WCS.BLL.Manager
                     }
                 }
 
+                if (warning.WarningType == WarningTypeEnum.入库中未扫描上架 ||
+                    warning.WarningType == WarningTypeEnum.入库中异常取出 ||
+                    warning.WarningType == WarningTypeEnum.出库中丢失 ||
+                    warning.WarningType == WarningTypeEnum.出库中未扫描上架)
+                {
+                    return;
+                }
+
                 #region 重新发指令进入对应模式
                 Logs.Write($"GoInRightMode", LogsType.WebSocket);
                 GoInRightMode(warning);
diff --git a/货架标准上位机/货架标准上位机.csproj b/货架标准上位机/货架标准上位机.csproj
index aaa8a8d..ea45d11 100644
--- a/货架标准上位机/货架标准上位机.csproj
+++ b/货架标准上位机/货架标准上位机.csproj
@@ -8,7 +8,7 @@
 		<LangVersion>latest</LangVersion>
 		<Company>重庆盟讯电子科技有限公司</Company>
 		<Copyright>Copyright ©  2024</Copyright>
-		<AssemblyVersion>1.0.1</AssemblyVersion>
+		<AssemblyVersion>1.0.2</AssemblyVersion>
 		<FileVersion>1.0.1</FileVersion>
 		<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
 		<Authors>重庆盟讯电子科技有限公司</Authors>
@@ -84,12 +84,12 @@
 		<Resource Include="Resources\Logo.ico" />
 		<Resource Include="Resources\Logo.png" />
 		<Resource Include="Resources\主页.png" />
-		<Resource Include="Resources\入库.png"/>
-		<Resource Include="Resources\出库.png"/>
-		<Resource Include="Resources\盘点.png"/>
-		<Resource Include="Resources\查询.png"/>
-		<Resource Include="Resources\货架.png"/>
-		<Resource Include="Resources\物料.png"/>
+		<Resource Include="Resources\入库.png" />
+		<Resource Include="Resources\出库.png" />
+		<Resource Include="Resources\盘点.png" />
+		<Resource Include="Resources\查询.png" />
+		<Resource Include="Resources\货架.png" />
+		<Resource Include="Resources\物料.png" />
 		<Resource Include="Resources\权限.png" />
 		<Resource Include="Resources\调试.png" />
 	</ItemGroup>