From a73bb8e6b1b8992b10bc0f64e18d064306fca8cd Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Mon, 27 May 2024 11:08:06 +0800
Subject: [PATCH] =?UTF-8?q?1.BUG=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E9=80=80=E5=87=BA=E5=85=A5=E5=BA=93=E5=90=8E=20?=
 =?UTF-8?q?=E5=81=B6=E5=8F=91=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=85=A5=E5=BA=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PublishProfiles/FolderProfile1.pubxml           |  2 +-
 .../Properties/PublishProfiles/FolderProfile.pubxml | 13 +++++++++++++
 货架标准上位机/ViewModels/InInventoryViewModel.cs   |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 货架标准上位机/Properties/PublishProfiles/FolderProfile.pubxml

diff --git a/WCS.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml b/WCS.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml
index f5f22fe..b1eb0ee 100644
--- a/WCS.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/WCS.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -15,7 +15,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <ProjectGuid>118d453b-1693-4c00-8378-20ecbfcf2700</ProjectGuid>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
diff --git a/货架标准上位机/Properties/PublishProfiles/FolderProfile.pubxml b/货架标准上位机/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..98ba478
--- /dev/null
+++ b/货架标准上位机/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net472\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/货架标准上位机/ViewModels/InInventoryViewModel.cs b/货架标准上位机/ViewModels/InInventoryViewModel.cs
index cb9d04b..f88bfbb 100644
--- a/货架标准上位机/ViewModels/InInventoryViewModel.cs
+++ b/货架标准上位机/ViewModels/InInventoryViewModel.cs
@@ -149,6 +149,7 @@ namespace 货架标准上位机.ViewModel
                         if (Result != null && Result.Code == 200)
                         {
                             Logs.Write($"货架{scanner.ShelfCode}已成功退出入库！", LogsType.Scanner);
+                            scanner.IsInstoreMode = false;
                             scanner.ShelfCode = string.Empty;
                             scanner.ModulesStr = string.Empty;
                         }
@@ -229,6 +230,7 @@ namespace 货架标准上位机.ViewModel
                 var Result = ApiHelp.GetDataFromHttp<ResponseBase>(LocalFile.Config.ApiIpHost + "instore/shelfGoOutInStore", body, "POST");
                 if (Result != null && Result.Code == 200)
                 {
+                    scanner.IsInstoreMode = false;
                     scanner.ShelfCode = string.Empty;
                     scanner.ModulesStr = string.Empty;