From 65cd5f24602dab6fce459226007c40923a209ae7 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 29 May 2024 08:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8D=AF=E5=93=81=E8=AF=B7?=
 =?UTF-8?q?=E9=A2=86=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight.sln                                    | 16 ++++++++++++++--
 DM_Weight/App.config                             |  2 +-
 DM_Weight/DM_Weight.csproj                       |  1 +
 .../ViewModels/RoleManagerWindowViewModel.cs     |  8 ++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/DM_Weight.sln b/DM_Weight.sln
index 9c198ec..7c397af 100644
--- a/DM_Weight.sln
+++ b/DM_Weight.sln
@@ -8,13 +8,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x64.ActiveCfg = Debug|x64
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x64.Build.0 = Debug|x64
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x86.ActiveCfg = Debug|x86
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x86.Build.0 = Debug|x86
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x64.ActiveCfg = Release|x64
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x64.Build.0 = Release|x64
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x86.ActiveCfg = Debug|x86
+		{439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x86.Build.0 = Debug|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index ddc7c74..e9a2333 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -60,7 +60,7 @@
 		<add  key="MultiOrder" value="1"/>
 		<!-- 多批次抽屉加药 0:不启用 1：启用
 		     启用channel_list记录库位信息 -->
-		<add  key="MultiBatch" value="1"/>
+		<add  key="MultiBatch" value="0"/>
 
 		<!--海康威视IP-->
 		<add key="HIKIP" value="192.168.1.15"/>
diff --git a/DM_Weight/DM_Weight.csproj b/DM_Weight/DM_Weight.csproj
index a7f1eb6..deb5a64 100644
--- a/DM_Weight/DM_Weight.csproj
+++ b/DM_Weight/DM_Weight.csproj
@@ -8,6 +8,7 @@
     <PackageIcon></PackageIcon>
     <Product>毒麻管理程序</Product>
     <ApplicationIcon>Images\favicon.ico</ApplicationIcon>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
index a2c2472..9b18ec6 100644
--- a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
+++ b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
@@ -256,6 +256,14 @@ namespace DM_Weight.ViewModels
                 };
                 jiayaoChild.Add(jiayao5);
             }
+            PremissionDm jiayao6 = new PremissionDm
+            {
+                Id = 26,
+                PremissionName = "药品请领",
+                PremissionPath = "CollectDrugWindow",
+            };
+            jiayaoChild.Add(jiayao6);
+
             jiayaoChild.Add(jiayao1);
             jiayaoChild.Add(jiayao2);
             jiayaoChild.Add(jiayao3);