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

读取箱体数量

Browse Source
master
范 11 months ago
parent d9f18a2636
commit 7050ab32bc
7 changed files with 544 additions and 401 deletions
Show Stats Download Patch File Download Diff File

11
shangjian/XGL.Data/DBService/FormingMachineService.cs
Unescape Escape View File

@ -1705,6 +1705,17 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
}
return "";
}
public DataTable GetWcsPlcPointBoxCount(string pointNo)
{
string sql = $"SELECT * FROM wcs_plc_point WHERE plc_point_no ='{pointNo}' and equip='BoxCount'";
DataSet ds = Utils.netClientDBHelper.getDataSet(sql);
if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
return ds.Tables[0];
}
return null;
}
}
public class MesTableSelfDetialModel
{

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

@ -10,7 +10,7 @@
<!--车间编码-->
<add key="SiteCode" value="999" />
<!--设备编码-->
<add key="DeviceCode" value="C4" />
<add key="DeviceCode" value="C3" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
<add key="ClientMode" value="1" />
<add key="SerialPort" value="COM5" />

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

@ -10,7 +10,7 @@
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="XL02" />
<add key="DeviceCode" value="XL03" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录,4:称重系统-->
<add key="ClientMode" value="1" />

3
shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
Unescape Escape View File

@ -369,8 +369,7 @@
Margin="20,0"
Click="ReadOrder_Click"
Content="获取"
Style="{StaticResource btnKey}"
Visibility="Collapsed" />
Style="{StaticResource btnKey}" />
</StackPanel>
<StackPanel
Grid.Row="2"

44
shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
Unescape Escape View File

@ -1035,29 +1035,49 @@ namespace XGLFinishPro.Views
{
}
private bool IsReading = false;
private void ReadOrder_Click(object sender, RoutedEventArgs e)
{
int count = 0;
bool isSuccess = false;
while (count++ < 3)
{
try
{
if (IsReading)
{
return;
}
IsReading = true;
LanJu_Operator.plc.Connection(LanJu_Operator.PlcIp);
int number = int.Parse(_deviceCode.Substring(2));
isSuccess = true;
break;
DataTable dataTable = formingMachineService.GetWcsPlcPointBoxCount("BoxCount" + number);
if (dataTable != null && dataTable.Rows.Count > 0)
{
string address = dataTable.Rows[0]["plc_point_address"].ToString();
var boxCount = LanJu_Operator.plc.Read(new CentralControl.BaseData.PlcSetting
{
PlcAddress = address,
PlcDataType = 1,
PlcValueLength = "2"
});
if (boxCount != null && int.TryParse(boxCount.ToString(), out int count))
{
txtQuantity.Text = boxCount.ToString();
}
else
{
CustomMessageBox.Show("读取失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
}
}
else
{
CustomMessageBox.Show("获取点位信息失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
}
}
catch
{
LanJu_Operator.plc = new PlcHelper();
CustomMessageBox.Show("Plc连接失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
}
}
if (!isSuccess)
finally
{
CustomMessageBox.Show("读取失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return;
IsReading = false;
}
}
}

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

@ -1,51 +1,55 @@
<UserControl
x:Class="XGLFinishPro.Views.LanJu_Operator"
x:Name="UCOperator"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:convert="clr-namespace:XGLFinishPro.Tools"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="UCOperator"
Width="1920"
Height="800"
mc:Ignorable="d" Loaded="UCOperator_Loaded">
Loaded="UCOperator_Loaded"
mc:Ignorable="d">
<UserControl.Resources>
<convert:MyValueConverter x:Key="MyConverter"/>
<convert:BatchStatusValueConverter x:Key="BatchStatusConverter"/>
<convert:OrderInOutConverter x:Key="TaskCodeConverter"/>
<convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
<convert:ParentOrderConverter x:Key="ParentOrderConverter"/>
<convert:MyValueConverter x:Key="MyConverter" />
<convert:BatchStatusValueConverter x:Key="BatchStatusConverter" />
<convert:OrderInOutConverter x:Key="TaskCodeConverter" />
<convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter" />
<convert:ParentOrderConverter x:Key="ParentOrderConverter" />
<convert:ShiftConvert x:Key="ShiftValueConvert" />
<Style x:Key="CustomCellStyle" TargetType="DataGridCell">
<Setter Property="Foreground" Value="Black" />
<Setter Property="TextBlock.TextAlignment" Value="Center" />
<Setter Property="TextBlock.FontSize" Value="22" />
</Style>
<SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
<SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
<SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0" />
<SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF" />
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="{StaticResource EvenRowBackground}" />
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
<Setter Property="Background" Value="{StaticResource OddRowBackground}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="btnKey" TargetType="Button">
<Setter Property="Width" Value="130" />
<Setter Property="Height" Value="60" />
<Setter Property="Margin" Value="3"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="Template" >
<Setter Property="Margin" Value="3" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border Background="#2B7EE6" BorderThickness="2" CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
<Border
Background="#2B7EE6"
BorderThickness="2"
CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
</ControlTemplate>
@ -55,7 +59,7 @@
</UserControl.Resources>
<Grid Background="LightGray" >
<Grid Background="LightGray">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
@ -152,23 +156,30 @@
</Label>
</StackPanel>-->
<!--#70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"-->
<!-- #70B603Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}" -->
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Background="#F2F3F5" Grid.Row="0"
Grid.ColumnSpan="11" Grid.Column="0" Width="Auto">
<StackPanel Orientation="Horizontal" >
<StackPanel
<ScrollViewer
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="11"
Width="Auto"
Background="#F2F3F5"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Horizontal">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Height="90" Visibility="Collapsed">
Height="90"
Background="#F2F3F5"
Visibility="Collapsed">
<Button
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6" >
Background="#2B7EE6"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -179,17 +190,17 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="0"
Height="90">
Height="90"
Background="#F2F3F5">
<Button
x:Name="btnPause1"
Click="btnPause1_Click"
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6">
Background="#2B7EE6"
Click="btnPause1_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -200,17 +211,17 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="1"
Height="90">
Height="90"
Background="#F2F3F5">
<Button
x:Name="btnPause"
Click="btnPause_Click"
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6">
Background="#2B7EE6"
Click="btnPause_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -221,15 +232,17 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="2"
Height="90">
<Button x:Name="btnRecover"
Style="{StaticResource btnKey}"
Height="90"
Background="#F2F3F5">
<Button
x:Name="btnRecover"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6" Click="btnRecover_Click">
Background="#2B7EE6"
Click="btnRecover_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -240,16 +253,16 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="3"
Height="90">
Height="90"
Background="#F2F3F5">
<Button
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="Flow_Click">
Click="Flow_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -260,16 +273,16 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="4"
Height="90">
Height="90"
Background="#F2F3F5">
<Button
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="Material_Click">
Click="Material_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -280,15 +293,16 @@
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="5" Visibility="Visible">
Grid.Column="5"
Background="#F2F3F5"
Visibility="Visible">
<Button
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="Button_Click">
Click="Button_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -300,16 +314,16 @@ Background="#F2F3F5"
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="6"
>
<Button x:Name="btnSalaryCal"
Style="{StaticResource btnKey}"
Background="#F2F3F5">
<Button
x:Name="btnSalaryCal"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="btnSalaryCal_Click">
Click="btnSalaryCal_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -321,65 +335,72 @@ Background="#F2F3F5"
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="7"
>
Background="#F2F3F5">
<Button
x:Name="btnCheckLog"
Grid.Row="1" Visibility="Collapsed"
Grid.Row="1"
Grid.Column="5"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="btnCheckLog_Click"
Content="查看接口日志"
FontSize="20"
Foreground="White"
Click="btnCheckLog_Click" Content="查看接口日志"></Button>
Style="{StaticResource btnKey}"
Visibility="Collapsed" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="8"
>
Background="#F2F3F5">
<Button
x:Name="btnViewPlcvalue"
Grid.Row="1" Visibility="Collapsed"
Grid.Row="1"
Grid.Column="5"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="btnViewPlcvalue_Click"
Content="查看Plc值"
FontSize="20"
Foreground="White"
Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
Style="{StaticResource btnKey}"
Visibility="Collapsed" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="9">
Grid.Column="9"
Background="#F2F3F5">
<Button
x:Name="HFPlcvalue"
Grid.Row="1" Visibility="Collapsed"
Grid.Row="1"
Grid.Column="5"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="HFPlcvalue_Click"
Content="查看烘房值"
FontSize="20"
Foreground="White"
Click="HFPlcvalue_Click" Content="查看烘房值"></Button>
Style="{StaticResource btnKey}"
Visibility="Collapsed" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="6"
Height="90" Visibility="Visible">
<Button Style="{StaticResource btnKey}"
Height="90"
Background="#F2F3F5"
Visibility="Visible">
<Button
x:Name="btnComplete"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6" Click="btnComplete_Click">
Background="#2B7EE6"
Click="btnComplete_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -390,15 +411,18 @@ Background="#F2F3F5"
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="8"
Height="90" Visibility="Collapsed">
<Button Style="{StaticResource btnKey}"
Height="90"
Background="#F2F3F5"
Visibility="Collapsed">
<Button
x:Name="btnCallMaterial"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6" Click="btnCallMaterial_Click">
Background="#2B7EE6"
Click="btnCallMaterial_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -409,16 +433,17 @@ Background="#F2F3F5"
</Button>
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="7"
Height="90">
Height="90"
Background="#F2F3F5">
<Button
x:Name="btnFirstCheck"
Style="{StaticResource btnKey}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6" Click="btnFirstCheck_Click">
Background="#2B7EE6"
Click="btnFirstCheck_Click"
Style="{StaticResource btnKey}">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -428,78 +453,79 @@ Background="#F2F3F5"
</Button.Content>
</Button>
</StackPanel>
<StackPanel Background="#F2F3F5" Grid.Row="0" Grid.Column="8">
<StackPanel
Grid.Row="0"
Grid.Column="8"
Background="#F2F3F5">
<Button
x:Name="btnMachineRepair"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="btnMachineRepair_Click"
Content="报修"
FontSize="20"
Foreground="White"
Click="btnMachineRepair_Click" Content="报修"></Button>
Style="{StaticResource btnKey}" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="9"
>
Background="#F2F3F5">
<Button
x:Name="btnRefresh"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="btnRefresh_Click"
Content="刷新"
FontSize="20"
Foreground="White"
Click="btnRefresh_Click" Content="刷新"></Button>
Style="{StaticResource btnKey}" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="9"
>
Background="#F2F3F5">
<Button
x:Name="weigh"
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="weigh_Click"
Content="打卡"></Button>
Content="打卡"
FontSize="20"
Foreground="White"
Style="{StaticResource btnKey}" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="9"
>
Background="#F2F3F5">
<Button
Style="{StaticResource btnKey}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="report_Click"
Content="查看报表"></Button>
Content="查看报表"
FontSize="20"
Foreground="White"
Style="{StaticResource btnKey}" />
</StackPanel>
<StackPanel
Background="#F2F3F5"
Grid.Row="0"
Grid.Column="9"
>
Background="#F2F3F5">
<Button
Style="{StaticResource btnKey}"
Visibility="Collapsed"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="auxiliary_personnel"
Content="辅助人员"
FontSize="20"
Foreground="White"
Click="auxiliary_personnel"
Content="辅助人员"></Button>
Style="{StaticResource btnKey}"
Visibility="Collapsed" />
</StackPanel>
</StackPanel>
@ -511,19 +537,23 @@ Background="#F2F3F5"
Grid.ColumnSpan="11"
MinWidth="1900"
MinHeight="340"
Margin="10,0,0,5"
MaxHeight="400"
Margin="10,0,0,5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
AlternatingRowBackground="{StaticResource OddRowBackground}"
AlternationCount="2"
SelectedIndex="0"
RowStyle="{StaticResource DataGridRowStyle}"
LoadingRow="dgWorkOrderInfo_LoadingRow"
HeadersVisibility="Column"
AutoGenerateColumns="False"
CanUserAddRows="False"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True"
AutoGenerateColumns="False" CanUserAddRows="False" SelectionChanged="dgWorkOrderInfo_SelectionChanged">
<DataGrid.ColumnHeaderStyle >
HeadersVisibility="Column"
IsReadOnly="True"
LoadingRow="dgWorkOrderInfo_LoadingRow"
RowStyle="{StaticResource DataGridRowStyle}"
SelectedIndex="0"
SelectionChanged="dgWorkOrderInfo_SelectionChanged">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
@ -533,55 +563,135 @@ Background="#F2F3F5"
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="50" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn
Width="50"
MinWidth="10"
Header=" 序号"
IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
<TextBlock
Margin="10,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGridRow}}, Path=Header}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn Width="60" Header="母单" Binding="{Binding parent_order,Converter={StaticResource ParentOrderConverter}}"/>-->
<DataGridTemplateColumn Header="状态" Width="100">
<DataGridTemplateColumn Width="100" Header="状态">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Button IsEnabled="{Binding IsEnabled}" Content="{Binding BtnTest}" Tag="{Binding batchId}" Click="Button_Click_3" HorizontalAlignment="Center" VerticalAlignment="Center" Width="75" Height="35" Background="#2B7EE6" FontSize="20" Foreground="White" />
<Button
Width="75"
Height="35"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6"
Click="Button_Click_3"
Content="{Binding BtnTest}"
FontSize="20"
Foreground="White"
IsEnabled="{Binding IsEnabled}"
Tag="{Binding batchId}" />
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="200" Header="SAP工单" Binding="{Binding workorder_code_sap}"/>
<DataGridTextColumn
Width="200"
Binding="{Binding workorder_code_sap}"
Header="SAP工单" />
<!--<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>-->
<DataGridTextColumn Width="480" Header="产品名称" Binding="{Binding product_name}" />
<DataGridTextColumn Width="320" Header="批次号" Binding="{Binding batch_code}" />
<DataGridTextColumn
Width="480"
Binding="{Binding product_name}"
Header="产品名称" />
<DataGridTextColumn
Width="320"
Binding="{Binding batch_code}"
Header="批次号" />
<DataGridTextColumn Width="100" Header="订单数量" Binding="{Binding quantity_split}" />
<DataGridTextColumn
Width="100"
Binding="{Binding quantity_split}"
Header="订单数量" />
<DataGridTextColumn Width="80" Header="工单状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
<DataGridTextColumn
Width="80"
Binding="{Binding status, Converter={StaticResource MyConverter}}"
Header="工单状态">
<!--<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{Binding status, Converter={StaticResource SyncFlagColorConvert}}" />
</Style>
</DataGridTextColumn.ElementStyle>-->
</DataGridTextColumn>
<DataGridTextColumn Width="100" Header="批次数量" Binding="{Binding batch_quantity}" />
<DataGridTextColumn Width="100" Header="报工数量" Binding="{Binding batchQty}" />
<DataGridTextColumn Width="100" Header="剩余数量" Binding="{Binding diffQty}" />
<DataGridTextColumn Width="100" Header="批次状态" Binding="{Binding batchStatus,Converter={StaticResource BatchStatusConverter}}" />
<DataGridTextColumn Width="100" Header="质检状态" Binding="{Binding qc_status,Converter={StaticResource MyConverter}}" />
<DataGridTextColumn Width="100" Header="质检结果" Binding="{Binding qc_result,Converter={StaticResource MyConverter}}" />
<DataGridTextColumn
Width="100"
Binding="{Binding batch_quantity}"
Header="批次数量" />
<DataGridTextColumn
Width="100"
Binding="{Binding batchQty}"
Header="报工数量" />
<DataGridTextColumn
Width="100"
Binding="{Binding diffQty}"
Header="剩余数量" />
<DataGridTextColumn
Width="100"
Binding="{Binding batchStatus, Converter={StaticResource BatchStatusConverter}}"
Header="批次状态" />
<DataGridTextColumn
Width="100"
Binding="{Binding qc_status, Converter={StaticResource MyConverter}}"
Header="质检状态" />
<DataGridTextColumn
Width="100"
Binding="{Binding qc_result, Converter={StaticResource MyConverter}}"
Header="质检结果" />
<!--<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />-->
<DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_desc}" />
<DataGridTextColumn Width="250" Header="产品编码" Binding="{Binding product_code}" />
<DataGridTextColumn
Width="180"
Binding="{Binding shift_desc}"
Header="班次" />
<DataGridTextColumn
Width="250"
Binding="{Binding product_code}"
Header="产品编码" />
<DataGridTextColumn Width="200" Header="工单/SFC" Binding="{Binding workorder_code}" />
<DataGridTextColumn Width="180" Header="工单code" Visibility="Hidden" Binding="{Binding workorder_id}" />
<DataGridTextColumn Width="100" Header="生产顺序" Binding="{Binding sort_no}" />
<DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="250" Header="单位" Binding="{Binding unit}" />
<DataGridTextColumn Width="200" Header="创建批次成品检验时间" Binding="{Binding create_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="200" Header="批次成品检验结果" Binding="{Binding check_status ,Converter={StaticResource ShiftValueConvert}}" />
<DataGridTextColumn
Width="200"
Binding="{Binding workorder_code}"
Header="工单/SFC" />
<DataGridTextColumn
Width="180"
Binding="{Binding workorder_id}"
Header="工单code"
Visibility="Hidden" />
<DataGridTextColumn
Width="100"
Binding="{Binding sort_no}"
Header="生产顺序" />
<DataGridTextColumn
Width="250"
Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
Header="计划时间" />
<DataGridTextColumn
Width="250"
Binding="{Binding unit}"
Header="单位" />
<DataGridTextColumn
Width="200"
Binding="{Binding create_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
Header="创建批次成品检验时间" />
<DataGridTextColumn
Width="200"
Binding="{Binding check_status, Converter={StaticResource ShiftValueConvert}}"
Header="批次成品检验结果" />
<!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
<!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
@ -593,10 +703,10 @@ Background="#F2F3F5"
Grid.ColumnSpan="11"
Width="1905"
Height="69"
Background="#F2F3F5"
Margin="0,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="#F2F3F5"
Orientation="Horizontal">
<!--<Button
Width="196"
@ -615,9 +725,9 @@ Background="#F2F3F5"
<Button
Width="196"
Height="69"
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="10,0,0,0"
Background="White"
Click="GetQitaolv_Click">
<TextBlock
@ -629,9 +739,9 @@ Background="#F2F3F5"
<Button
Width="196"
Height="69"
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="10,0,0,0"
Background="White"
Click="Complete_Click">
<TextBlock
@ -643,9 +753,9 @@ Background="#F2F3F5"
<Button
Width="196"
Height="69"
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="10,0,0,0"
Background="White"
Click="Paused_Click">
<TextBlock
@ -657,9 +767,9 @@ Background="#F2F3F5"
<Button
Width="196"
Height="69"
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="10,0,0,0"
Background="White"
Click="Button_Click_2">
<TextBlock
@ -700,17 +810,16 @@ Background="#F2F3F5"
Grid.Row="3"
Grid.ColumnSpan="11"
Margin="-30,0,0,0"
Background="LightGray"
HorizontalAlignment="Center"
VerticalAlignment="Top">
VerticalAlignment="Top"
Background="LightGray">
<ContentControl
x:Name="Window1"
Grid.ColumnSpan="2"
Height="300"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Width="1920"
/>
Height="300"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" />
</Grid>

14
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -2,11 +2,14 @@
using CommonFunc;
using CommonFunc.Tools;
using HandyControl.Tools.Extension;
using LiveCharts.Charts;
using Microsoft.SqlServer.Server;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Net.Http;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using System.Timers;
@ -30,7 +33,7 @@ namespace XGLFinishPro.Views
/// </summary>
public partial class LanJu_Operator : UserControl
{
public static string PlcIp= "172.18.15.20";
public static string PlcIp = "172.18.15.20";
public static bool isSuccess = false;
public static bool IsWrite = false;
public static PlcHelper plc = new PlcHelper();
@ -789,7 +792,7 @@ namespace XGLFinishPro.Views
}
else if (type == 1)
{
if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status,productCode,productName))
if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status, productCode, productName))
{
CustomMessageBox.Show("更新打印机表状态失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return false;
@ -1211,9 +1214,10 @@ namespace XGLFinishPro.Views
{
if (row["plc_point_no"].ToString() == height)
{
plc.Write(new PlcSetting() {
PlcAddress= row["plc_point_address"].ToString() ,
PlcValueLength="2"
plc.Write(new PlcSetting()
{
PlcAddress = row["plc_point_address"].ToString(),
PlcValueLength = "2"
}, h);
}
else if (row["plc_point_no"].ToString() == width1)

Write Preview
Loading…
Cancel
Save