111

shangjian/XGL/Views/LanJu_InOut.xaml.cs

@@ -47,7 +47,7 @@ namespace XGL.Views
             GetInOutRecordInfo();
         }
 
-        private void GetInOutRecordInfo()
+        public void GetInOutRecordInfo()
         {
             try
             {

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)

shangjian/XGL/Views/LanJu_Prepare.xaml

@@ -12,10 +12,10 @@
     mc:Ignorable="d" Loaded="UserControl_Loaded">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
+            <!--<ResourceDictionary.MergedDictionaries>
-                <hc:ThemeResources />
+                --><!--<hc:ThemeResources />
-                <hc:Theme />
+                <hc:Theme />--><!--
-            </ResourceDictionary.MergedDictionaries>
+            </ResourceDictionary.MergedDictionaries>-->
             <Style x:Key="RoundButton" TargetType="Button">
                 <Setter Property="Width" Value="25" />
                 <Setter Property="Height" Value="25" />