From 8bb8dd5bfad1ffd62e7856469b658d2a3febda62 Mon Sep 17 00:00:00 2001
From: zhaoaomin <18366680202@163.com>
Date: Wed, 8 May 2024 10:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=83=9A=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/.vs/BL/v17/.suo                     | Bin 901120 -> 901120 bytes
 .../CommonFunc/Tools/MachineRepairWin.xaml    |   4 +-
 shangjian/XGL/App.config                      |   2 +-
 shangjian/XGL/LoginPage.xaml.cs               |   1 +
 shangjian/XGL/Views/DryingRoomUC.xaml         |  13 +-
 shangjian/XGL/Views/DryingRoomUC.xaml.cs      |   8 +
 shangjian/XGL/Views/LanJu_Operator.xaml       | 223 ++++++++++--------
 shangjian/XGL/Views/LanJu_Operator.xaml.cs    |  10 +-
 .../XGLFinishPro/Views/LanJu_Operator.xaml    |   8 +-
 9 files changed, 157 insertions(+), 112 deletions(-)

diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index d4586027e840727d1155dd40b02148be71522feb..22b8af1c438150215967696fa9ca20e1f2f7c3a8 100644
GIT binary patch
delta 3212
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

delta 2884
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

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"