diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index d458602..22b8af1 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml
index 27738ee..d41d41e 100644
--- a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml
+++ b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml
@@ -278,9 +278,9 @@
                 <TextBox x:Name="txtP" Width="120" Height="30" FontSize="18" VerticalAlignment="Center" VerticalContentAlignment="Center" TextChanged="txtP_TextChanged"/>
                 <Button x:Name="btnQueryUser" Content="查询" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnQueryUser_Click" Visibility="Collapsed"/>
                 <Button x:Name="btnUserConfirm" Content="确认" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnUserConfirm_Click"/>
-               
+                <Button x:Name="btnCloseWin" HorizontalAlignment="Right" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
             </StackPanel>
-            <Button x:Name="btnCloseWin" HorizontalAlignment="Right" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
+          
             <DataGrid
          Grid.Row="1"  Grid.Column ="0" Grid.ColumnSpan="2"
        x:Name="dgUserInfo" 
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index 361d988..0f4164b 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C3" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
-		<add key="ClientMode" value="2" />
+		<add key="ClientMode" value="1" />
 		<add key="SerialPort" value="COM5" />
 		<add key="DryingHouseList" value="H16,H17,H18"/>
 		<!--线体编码-->
diff --git a/shangjian/XGL/LoginPage.xaml.cs b/shangjian/XGL/LoginPage.xaml.cs
index 577979f..e6f16bf 100644
--- a/shangjian/XGL/LoginPage.xaml.cs
+++ b/shangjian/XGL/LoginPage.xaml.cs
@@ -174,6 +174,7 @@ namespace XGL
 
                 bw.ReportProgress(1);
                 bool islogin = usdb.Login(ul.username, ul.pwd, ul.shiftID, ul.teamID, ul.workDate, ul.startTime, ul.endTime);
+                Utils.userList = usdb.GetUserList();
                 if (islogin)
                 {
                     usdb.UpdateWorkDate(deviceCode, ul.shiftID, ul.workDate);
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index a306fa4..483e9fe 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -446,7 +446,7 @@
                 <Label Content="当前湿度：" VerticalContentAlignment="Center" FontSize="16"/>
                 <Label x:Name="lbCurrHumilly"  
                             Foreground="#1A68CA"></Label>
-            </StackPanel>
+            </StackPanel> 
             <StackPanel Orientation="Horizontal">
                 <Button
                         x:Name="btnRefrsh"
@@ -460,6 +460,17 @@
                         Foreground="White"
                         IsCancel="True" />
                 <Button
+        x:Name="btnMachineRepair" 
+      Width="120"
+  Height="40"
+  Margin="0,0,20,0"
+  Background="#2F82E7"
+        HorizontalAlignment="Right"
+        VerticalAlignment="Center" 
+        FontSize="20"
+        Foreground="White"
+Click="btnMachineRepair_Click" Content="报修"></Button>
+                <Button
                         x:Name="btnCheckLog" 
                         Width="120"
                         Height="40"
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml.cs b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
index 18a83ed..cc1ad5b 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml.cs
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
@@ -297,6 +297,14 @@ namespace XGL.Views
             HFstatus hFstatus = new HFstatus();
             hFstatus.ShowDialog();
         }
+        private void btnMachineRepair_Click(object sender, RoutedEventArgs e)
+        {
+            FormingMachineService formingMachineService = new FormingMachineService();
+            //调用首件检验接口
+            string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl);
+            machineRepairWin.ShowDialog();
+        }
     }
     public class EquipmentMode
     {
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index 969c4dc..4e52c93 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml
@@ -56,7 +56,7 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
-           
+
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
@@ -147,32 +147,35 @@
           
         </StackPanel>-->
         <!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"-->
-        <StackPanel
+        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Background="#F2F3F5"  Grid.Row="0"
+Grid.ColumnSpan="10" Grid.Column="0" Width="Auto">
+            <StackPanel Orientation="Horizontal" >
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="0"
                     Width="220"
                     Height="90"  Visibility="Collapsed">
-            <Button
+                    <Button
                         Width="170"
                         Height="60"
                         Margin="25,5"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="开始" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="9"
                     Height="90"  Visibility="Collapsed">
-            <Button Style="{StaticResource btnKey}"
+                    <Button Style="{StaticResource btnKey}"
                 x:Name="btnComplete"
                         Width="170"
                         Height="60"
@@ -180,176 +183,156 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6" Click="btnComplete_Click">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="完成" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
-                    Grid.Row="0"
-                    Grid.Column="9"
-                    Height="90"  Visibility="Visible">
-            <Button Style="{StaticResource btnKey}"
-                x:Name="btnChangeShifts"
-                        Width="170"
-                        Height="60"
-                        Margin="10,5"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Background="#2B7EE6" Click="btnChangeShifts_Click">
-                <Button.Content>
-                    <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="20"
-                                Foreground="White"
-                                Text="交接班" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="2"
                     Height="90" Visibility="Collapsed">
-            <Button
+                    <Button
                       Style="{StaticResource btnKey}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6" >
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White" 
                                 Text="注销" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="3"
                     Height="90"  Visibility="Collapsed">
-            <Button
+                    <Button
                         Width="170"
                         Height="60"
                         Margin="10,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="首检确认" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="0"
                     Height="90">
-            <Button
+                    <Button
                   x:Name="btnPause"
                 Click="btnPause_Click"
                     Style="{StaticResource btnKey}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="暂停生产" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="1"
                     Height="90">
-            <Button x:Name="btnRecover"
+                    <Button x:Name="btnRecover"
                        Style="{StaticResource btnKey}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6" Click="btnRecover_Click">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="恢复生产" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="2"
                     Height="90">
-            <Button
+                    <Button
                        Style="{StaticResource btnKey}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6"
                         Click="Flow_Click">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看工艺" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="3"
                     Height="90">
-            <Button
+                    <Button
                        Style="{StaticResource btnKey}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Background="#2B7EE6"
                         Click="Material_Click">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看物料" />
-                </Button.Content>
-            </Button>
-        </StackPanel>
-        <StackPanel
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="4"
                    >
-            <Button
+                    <Button
                          Style="{StaticResource btnKey}"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Background="#2B7EE6" 
                 Click="Button_Click">
-                <Button.Content>
-                    <TextBlock
+                        <Button.Content>
+                            <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="20"
                                 Foreground="White"
                                 Text="查看SOP" />
-                </Button.Content>
-            </Button>
+                        </Button.Content>
+                    </Button>
 
-        </StackPanel>
-      
-        <StackPanel
+                </StackPanel>
+
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="5"
                     >
-            <Button
+                    <Button
                         x:Name="btnCheckLog"
                         Grid.Row="1"
                         Grid.Column="5"
@@ -360,13 +343,13 @@
                         FontSize="20"
                         Foreground="White"
                 Click="btnCheckLog_Click" Content="查看接口日志"></Button>
-        </StackPanel>
+                </StackPanel>
 
-        <StackPanel
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="6"
                     >
-            <Button
+                    <Button
                         x:Name="btnViewPlcvalue"
                         Grid.Row="1"
                         Grid.Column="5"
@@ -377,11 +360,11 @@
                         FontSize="20"
                         Foreground="White"
                 Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
-        </StackPanel>
-        <StackPanel
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="7">
-            <Button
+                    <Button
                         x:Name="HFPlcvalue"
                         Grid.Row="1"
                         Grid.Column="5"
@@ -392,12 +375,48 @@
                         FontSize="20"
                         Foreground="White"
                 Click="HFPlcvalue_Click" Content="查看烘房值"></Button>
-        </StackPanel>
-        <StackPanel
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="9"
+                    Height="90"  Visibility="Visible">
+                    <Button Style="{StaticResource btnKey}"
+                x:Name="btnChangeShifts"
+                        Width="170"
+                        Height="60"
+                        Margin="10,5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6" Click="btnChangeShifts_Click">
+                        <Button.Content>
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontSize="20"
+                                Foreground="White"
+                                Text="交接班" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+                <StackPanel
+Background="#F2F3F5"
+       Grid.Row="0"
+       Grid.Column="10"
+       >
+                    <Button
+           x:Name="btnMachineRepair" 
+         Style="{StaticResource btnKey}"
+           HorizontalAlignment="Right"
+           VerticalAlignment="Center"
+           Background="#2B7EE6" 
+           FontSize="20"
+           Foreground="White"
+   Click="btnMachineRepair_Click" Content="报修"></Button>
+                </StackPanel>
+                <StackPanel
                     Grid.Row="0"
                     Grid.Column="8"
                     >
-            <Button
+                    <Button
                         x:Name="btnRefresh"
                 
                       Style="{StaticResource btnKey}"
@@ -407,7 +426,9 @@
                         FontSize="20"
                         Foreground="White"
                 Click="btnRefresh_Click" Content="刷新"></Button>
-        </StackPanel>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
         <DataGrid
                     x:Name="dgWorkOrderInfo"
                     Grid.Row="1"
@@ -450,7 +471,7 @@
                 <DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
                 <DataGridTextColumn Width="100" Header="数量" Binding="{Binding car_num}" />
                 <DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
-                <DataGridTextColumn Width="60" Header="状态"   Binding="{Binding status,Converter={StaticResource MyConverter}}" > 
+                <DataGridTextColumn Width="60" Header="状态"   Binding="{Binding status,Converter={StaticResource MyConverter}}" >
                     <!--<DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
                             <Setter Property="Foreground" Value="{Binding status, Converter={StaticResource SyncFlagColorConvert}}" />
@@ -462,7 +483,7 @@
                 <DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_id}" />
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
-               
+
             </DataGrid.Columns>
         </DataGrid>
 
@@ -546,7 +567,7 @@
                     Grid.ColumnSpan="10"  
                     Margin="0" 
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Top"> 
+                    VerticalAlignment="Top">
             <ContentControl
                         x:Name="Window1"
                         Grid.ColumnSpan="2"
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 63c88c3..02f2ee7 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -604,6 +604,14 @@ VALUES
             }
 
           
-        } 
+        }
+
+        private void btnMachineRepair_Click(object sender, RoutedEventArgs e)
+        {
+            //调用首件检验接口
+            string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl);
+            machineRepairWin.ShowDialog();
+        }
     }
 }
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
index 00ede6a..1ff9d18 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
@@ -430,11 +430,7 @@ Background="#F2F3F5"
                         </Button.Content>
                     </Button>
                 </StackPanel>
-                <StackPanel
-Background="#F2F3F5"
-       Grid.Row="0"
-       Grid.Column="8"
-       >
+                <StackPanel Background="#F2F3F5" Grid.Row="0" Grid.Column="8">
                     <Button
            x:Name="btnMachineRepair" 
          Style="{StaticResource btnKey}"
@@ -443,7 +439,7 @@ Background="#F2F3F5"
            Background="#2B7EE6" 
            FontSize="20"
            Foreground="White"
-   Click="btnMachineRepair_Click" Content="报修"></Button>
+        Click="btnMachineRepair_Click" Content="报修"></Button>
                 </StackPanel>
                 <StackPanel
        Background="#F2F3F5"