白胚报修

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"/>
-               
-            </StackPanel>
                 <Button x:Name="btnCloseWin" HorizontalAlignment="Right" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
+            </StackPanel>
+          
             <DataGrid
          Grid.Row="1"  Grid.Column ="0" Grid.ColumnSpan="2"
        x:Name="dgUserInfo" 

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"/>
 		<!--线体编码-->

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);

shangjian/XGL/Views/DryingRoomUC.xaml

@@ -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"

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
     {

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -147,6 +147,9 @@
           
         </StackPanel>-->
         <!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"-->
+        <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"
@@ -189,27 +192,7 @@
                         </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
                     Grid.Row="0"
                     Grid.Column="2"
@@ -392,6 +375,42 @@
                         FontSize="20"
                         Foreground="White"
                 Click="HFPlcvalue_Click" 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
+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"
@@ -408,6 +427,8 @@
                         Foreground="White"
                 Click="btnRefresh_Click" Content="刷新"></Button>
                 </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
         <DataGrid
                     x:Name="dgWorkOrderInfo"
                     Grid.Row="1"

shangjian/XGL/Views/LanJu_Operator.xaml.cs

@@ -605,5 +605,13 @@ VALUES
 
           
         }
+
+        private void btnMachineRepair_Click(object sender, RoutedEventArgs e)
+        {
+            //调用首件检验接口
+            string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl);
+            machineRepairWin.ShowDialog();
+        }
     }
 }

shangjian/XGLFinishPro/Views/LanJu_Operator.xaml

@@ -430,11 +430,7 @@ Background="#F2F3F5"
                         </Button.Content>
                     </Button>
                 </StackPanel>
-                <StackPanel
+                <StackPanel Background="#F2F3F5" Grid.Row="0" Grid.Column="8">
-Background="#F2F3F5"
-       Grid.Row="0"
-       Grid.Column="8"
-       >
                     <Button
            x:Name="btnMachineRepair" 
          Style="{StaticResource btnKey}"