Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

白胚报修

Browse Source
master
zhaoaomin 2 years ago
parent f8cd3171f9
commit 8bb8dd5bfa
9 changed files with 157 additions and 112 deletions
Show Stats Download Patch File Download Diff File

BIN
shangjian/.vs/BL/v17/.suo
View File

Binary file not shown.

4
shangjian/CommonFunc/Tools/MachineRepairWin.xaml
Unescape Escape View File

@ -278,9 +278,9 @@
<TextBox x:Name="txtP" Width="120" Height="30" FontSize="18" VerticalAlignment="Center" VerticalContentAlignment="Center" TextChanged="txtP_TextChanged"/> <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="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="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> </StackPanel>
<Button x:Name="btnCloseWin" HorizontalAlignment="Right" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
<DataGrid <DataGrid
Grid.Row="1" Grid.Column ="0" Grid.ColumnSpan="2" Grid.Row="1" Grid.Column ="0" Grid.ColumnSpan="2"
x:Name="dgUserInfo" x:Name="dgUserInfo"

2
shangjian/XGL/App.config
Unescape Escape View File

@ -12,7 +12,7 @@
<!--设备编码--> <!--设备编码-->
<add key="DeviceCode" value="C3" /> <add key="DeviceCode" value="C3" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录--> <!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
<add key="ClientMode" value="2" /> <add key="ClientMode" value="1" />
<add key="SerialPort" value="COM5" /> <add key="SerialPort" value="COM5" />
<add key="DryingHouseList" value="H16,H17,H18"/> <add key="DryingHouseList" value="H16,H17,H18"/>
<!--线体编码--> <!--线体编码-->

1
shangjian/XGL/LoginPage.xaml.cs
Unescape Escape View File

@ -174,6 +174,7 @@ namespace XGL
bw.ReportProgress(1); bw.ReportProgress(1);
bool islogin = usdb.Login(ul.username, ul.pwd, ul.shiftID, ul.teamID, ul.workDate, ul.startTime, ul.endTime); bool islogin = usdb.Login(ul.username, ul.pwd, ul.shiftID, ul.teamID, ul.workDate, ul.startTime, ul.endTime);
Utils.userList = usdb.GetUserList();
if (islogin) if (islogin)
{ {
usdb.UpdateWorkDate(deviceCode, ul.shiftID, ul.workDate); usdb.UpdateWorkDate(deviceCode, ul.shiftID, ul.workDate);

13
shangjian/XGL/Views/DryingRoomUC.xaml
Unescape Escape View File

@ -446,7 +446,7 @@
<Label Content="当前湿度：" VerticalContentAlignment="Center" FontSize="16"/> <Label Content="当前湿度：" VerticalContentAlignment="Center" FontSize="16"/>
<Label x:Name="lbCurrHumilly" <Label x:Name="lbCurrHumilly"
Foreground="#1A68CA"></Label> Foreground="#1A68CA"></Label>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button <Button
x:Name="btnRefrsh" x:Name="btnRefrsh"
@ -460,6 +460,17 @@
Foreground="White" Foreground="White"
IsCancel="True" /> IsCancel="True" />
<Button <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" x:Name="btnCheckLog"
Width="120" Width="120"
Height="40" Height="40"

8
shangjian/XGL/Views/DryingRoomUC.xaml.cs
Unescape Escape View File

@ -297,6 +297,14 @@ namespace XGL.Views
HFstatus hFstatus = new HFstatus(); HFstatus hFstatus = new HFstatus();
hFstatus.ShowDialog(); 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 public class EquipmentMode
{ {

223
shangjian/XGL/Views/LanJu_Operator.xaml
Unescape Escape View File

@ -56,7 +56,7 @@
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
@ -147,32 +147,35 @@
</StackPanel>--> </StackPanel>-->
<!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"--> <!--#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.Row="0"
Grid.Column="0" Grid.Column="0"
Width="220" Width="220"
Height="90" Visibility="Collapsed"> Height="90" Visibility="Collapsed">
<Button <Button
Width="170" Width="170"
Height="60" Height="60"
Margin="25,5" Margin="25,5"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6"> Background="#2B7EE6">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="开始" /> Text="开始" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="9" Grid.Column="9"
Height="90" Visibility="Collapsed"> Height="90" Visibility="Collapsed">
<Button Style="{StaticResource btnKey}" <Button Style="{StaticResource btnKey}"
x:Name="btnComplete" x:Name="btnComplete"
Width="170" Width="170"
Height="60" Height="60"
@ -180,176 +183,156 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Click="btnComplete_Click"> Background="#2B7EE6" Click="btnComplete_Click">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="完成" /> Text="完成" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel
Grid.Row="0" <StackPanel
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.Row="0"
Grid.Column="2" Grid.Column="2"
Height="90" Visibility="Collapsed"> Height="90" Visibility="Collapsed">
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" > Background="#2B7EE6" >
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="注销" /> Text="注销" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="3" Grid.Column="3"
Height="90" Visibility="Collapsed"> Height="90" Visibility="Collapsed">
<Button <Button
Width="170" Width="170"
Height="60" Height="60"
Margin="10,5" Margin="10,5"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6"> Background="#2B7EE6">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="首检确认" /> Text="首检确认" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Height="90"> Height="90">
<Button <Button
x:Name="btnPause" x:Name="btnPause"
Click="btnPause_Click" Click="btnPause_Click"
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6"> Background="#2B7EE6">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="暂停生产" /> Text="暂停生产" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Height="90"> Height="90">
<Button x:Name="btnRecover" <Button x:Name="btnRecover"
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Click="btnRecover_Click"> Background="#2B7EE6" Click="btnRecover_Click">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="恢复生产" /> Text="恢复生产" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
Height="90"> Height="90">
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Background="#2B7EE6"
Click="Flow_Click"> Click="Flow_Click">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="查看工艺" /> Text="查看工艺" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="3" Grid.Column="3"
Height="90"> Height="90">
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Background="#2B7EE6"
Click="Material_Click"> Click="Material_Click">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="查看物料" /> Text="查看物料" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="4" Grid.Column="4"
> >
<Button <Button
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#2B7EE6" Background="#2B7EE6"
Click="Button_Click"> Click="Button_Click">
<Button.Content> <Button.Content>
<TextBlock <TextBlock
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Text="查看SOP" /> Text="查看SOP" />
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="5" Grid.Column="5"
> >
<Button <Button
x:Name="btnCheckLog" x:Name="btnCheckLog"
Grid.Row="1" Grid.Row="1"
Grid.Column="5" Grid.Column="5"
@ -360,13 +343,13 @@
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Click="btnCheckLog_Click" Content="查看接口日志"></Button> Click="btnCheckLog_Click" Content="查看接口日志"></Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="6" Grid.Column="6"
> >
<Button <Button
x:Name="btnViewPlcvalue" x:Name="btnViewPlcvalue"
Grid.Row="1" Grid.Row="1"
Grid.Column="5" Grid.Column="5"
@ -377,11 +360,11 @@
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button> Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="7"> Grid.Column="7">
<Button <Button
x:Name="HFPlcvalue" x:Name="HFPlcvalue"
Grid.Row="1" Grid.Row="1"
Grid.Column="5" Grid.Column="5"
@ -392,12 +375,48 @@
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Click="HFPlcvalue_Click" Content="查看烘房值"></Button> 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.Row="0"
Grid.Column="8" Grid.Column="8"
> >
<Button <Button
x:Name="btnRefresh" x:Name="btnRefresh"
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -407,7 +426,9 @@
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Click="btnRefresh_Click" Content="刷新"></Button> Click="btnRefresh_Click" Content="刷新"></Button>
</StackPanel> </StackPanel>
</StackPanel>
</ScrollViewer>
<DataGrid <DataGrid
x:Name="dgWorkOrderInfo" x:Name="dgWorkOrderInfo"
Grid.Row="1" Grid.Row="1"
@ -450,7 +471,7 @@
<DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" /> <DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
<DataGridTextColumn Width="100" Header="数量" Binding="{Binding car_num}" /> <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="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> <!--<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{Binding status, Converter={StaticResource SyncFlagColorConvert}}" /> <Setter Property="Foreground" Value="{Binding status, Converter={StaticResource SyncFlagColorConvert}}" />
@ -462,7 +483,7 @@
<DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_id}" /> <DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_id}" />
<!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />--> <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
<!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>--> <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
@ -546,7 +567,7 @@
Grid.ColumnSpan="10" Grid.ColumnSpan="10"
Margin="0" Margin="0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top"> VerticalAlignment="Top">
<ContentControl <ContentControl
x:Name="Window1" x:Name="Window1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"

10
shangjian/XGL/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -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();
}
} }
} }

8
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
Unescape Escape View File

@ -430,11 +430,7 @@ Background="#F2F3F5"
</Button.Content> </Button.Content>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel Background="#F2F3F5" Grid.Row="0" Grid.Column="8">
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="8"
>
<Button <Button
x:Name="btnMachineRepair" x:Name="btnMachineRepair"
Style="{StaticResource btnKey}" Style="{StaticResource btnKey}"
@ -443,7 +439,7 @@ Background="#F2F3F5"
Background="#2B7EE6" Background="#2B7EE6"
FontSize="20" FontSize="20"
Foreground="White" Foreground="White"
Click="btnMachineRepair_Click" Content="报修"></Button> Click="btnMachineRepair_Click" Content="报修"></Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Background="#F2F3F5" Background="#F2F3F5"

Write Preview
Loading…
Cancel
Save