From 13b9b11cf96a2b9764f5c567d1ccb7881349ae75 Mon Sep 17 00:00:00 2001
From: zhaojian <qj120227@163.com>
Date: Fri, 20 Oct 2023 20:08:48 +0800
Subject: [PATCH] 111

---
 shangjian/XGL/Views/LanJu_InOut.xaml.cs    | 2 +-
 shangjian/XGL/Views/LanJu_Operator.xaml.cs | 2 ++
 shangjian/XGL/Views/LanJu_Prepare.xaml     | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml.cs b/shangjian/XGL/Views/LanJu_InOut.xaml.cs
index 61097e1..0bd225b 100644
--- a/shangjian/XGL/Views/LanJu_InOut.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_InOut.xaml.cs
@@ -47,7 +47,7 @@ namespace XGL.Views
             GetInOutRecordInfo();
         }
 
-        private void GetInOutRecordInfo()
+        public void GetInOutRecordInfo()
         {
             try
             {
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 86fd975..82d5795 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -293,6 +293,8 @@ namespace XGL.Views
         private void btnRefresh_Click(object sender, RoutedEventArgs e)
         {
             GetWorkOrderInfo();
+            LanJu_InOut lanJu_In = new LanJu_InOut(_workOrderCode, deviceCode);
+            lanJu_In.GetInOutRecordInfo();
         }
 
         private void btnComplete_Click(object sender, RoutedEventArgs e)
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index c20c92f..0a5992b 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -12,10 +12,10 @@
     mc:Ignorable="d" Loaded="UserControl_Loaded">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <hc:ThemeResources />
-                <hc:Theme />
-            </ResourceDictionary.MergedDictionaries>
+            <!--<ResourceDictionary.MergedDictionaries>
+                --><!--<hc:ThemeResources />
+                <hc:Theme />--><!--
+            </ResourceDictionary.MergedDictionaries>-->
             <Style x:Key="RoundButton" TargetType="Button">
                 <Setter Property="Width" Value="25" />
                 <Setter Property="Height" Value="25" />