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

烘房取数逻辑修改、工单准备物料清单添加

Browse Source
master
zhaoaomin 2 years ago
parent 074b4aa611
commit 6471c6c5b3
39 changed files with 558 additions and 139 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/CentralControl.exe
View File

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/CentralControl.pdb
View File

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/XGL.Data.dll
View File

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/XGL.Data.pdb
View File

Binary file not shown.

BIN
shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
shangjian/CentralControl/obj/Debug/CentralControl.exe
View File

Binary file not shown.

BIN
shangjian/CentralControl/obj/Debug/CentralControl.pdb
View File

Binary file not shown.

6
shangjian/XGL.Data/DBService/DBService.cs
Unescape Escape View File

@ -657,9 +657,11 @@ select a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber
//workorder.status = 'w1' and
string sql = $@"select wetDetail.id,wetDetail.factory_code,wetDetail.material_code as prod_code, wetDetail.sync_flag,wetDetail.plan_time,
wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name,
wetDetail.material_name as product_name,wetDetail.shift_desc,prod_line_code,workorder.status,workorder.workorder_code,route_code
wetDetail.material_name as product_name,shifts.shift_desc,prod_line_code,workorder.status,workorder.workorder_code,route_code
from pro_wet_material_plan_detail wetDetail
left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id where 1=1 and
left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id
left JOIN base_shifts_t shifts on wetDetail.shift_id = shifts.shift_id
where 1=1 and
workorder.end_flag = '1' and CONVERT(VARCHAR(10), wetDetail.plan_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120)";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

8
shangjian/XGL.Data/DBService/DringRoomService.cs
Unescape Escape View File

@ -37,11 +37,13 @@ namespace XGL.Data.DBService
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public DataTable GetDringRoomData(string devicecode)
public DataTable GetDringRoomData(string devicecode,int inout)
{
string sql = $@"SELECT rfid_no,device_code,type,create_time,update_time,factory_no,workorder_code,material_code FROM [dbo].[mes_dryinghouse_info] where device_code = '{devicecode}' and type = '{inout}' and del_flag='0' ;";
//获取绑定中，且RFID没有出烘房（在烘房内）的数据
string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res
LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')";
// string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res
//LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id where equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')";
//where rfid !=null and equipmentCode = '{devicecode}' and rfid_status = '1' and rfid not in(select rfid from mes_material_transfer_result where taskcode = '1' and rfid_status = '1')

BIN
shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
View File

Binary file not shown.

BIN
shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
View File

Binary file not shown.

BIN
shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll
View File

Binary file not shown.

BIN
shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb
View File

Binary file not shown.

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

@ -12,7 +12,7 @@
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
<add key="ClientMode" value="0" />
<add key="ClientMode" value="2" />
<!--上位机类型 1 上件 ，2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->

6
shangjian/XGL/Tools/ModuleUC.xaml
Unescape Escape View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:XGL.Tools"
mc:Ignorable="d"
d:DesignHeight="250" d:DesignWidth="250">
d:DesignHeight="250" d:DesignWidth="150">
<UserControl.Resources>
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="16"></Setter>
@ -14,7 +14,7 @@
<Setter Property="Foreground" Value="Black"></Setter>
</Style>
</UserControl.Resources>
<Grid Width="250" Height="250">
<Grid Width="250" Height="150">
<!--<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#07437F" Offset="0"/>
@ -46,7 +46,7 @@
<TextBlock Grid.Row="3" Text="物料:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<TextBlock x:Name="TBMaterialCode" Grid.Row="3" Text="abcdefg" VerticalAlignment="Center" HorizontalAlignment="Center" ></TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed">
<StackPanel Orientation="Horizontal" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Visible">
<TextBlock Grid.Row="3" Text="时间:" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<TextBlock x:Name="TBTime" Grid.Row="3" Text="10" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
</StackPanel>

17
shangjian/XGL/Tools/ModuleUC.xaml.cs
Unescape Escape View File

@ -23,14 +23,14 @@ namespace XGL.Tools
string rfid = string.Empty;
string order = string.Empty;
string material = string.Empty;
string time = string.Empty;
int time = 0;
string boardID = string.Empty;
public ModuleUC()
{
InitializeComponent();
}
public ModuleUC(string bID, string rfid, string orderCode, string materialCode, string times)
public ModuleUC(string bID, string rfid, string orderCode, string materialCode, int times)
{
InitializeComponent();
//temp = t;
@ -39,13 +39,14 @@ namespace XGL.Tools
this.TBOrderCode.Text = orderCode;
this.TBMaterialCode.Text = materialCode;
this.TBRFID.Text = rfid;
this.TBTime.Text = times;
this.TBTime.Text = times.ToString();
time = times;
if (string.IsNullOrEmpty(rfid))
{
this.Background = Brushes.LightGray;
return;
}
//if (string.IsNullOrEmpty(rfid))
//{
// this.Background = Brushes.LightGray;
// return;
//}
//if (Convert.ToInt32(time) >= 7)
//{
// this.Background = Brushes.LightGray;

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

@ -29,11 +29,347 @@
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ApplicantList_ListBoxItem_Style" TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="10,10,10,0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border x:Name="Bd" BorderThickness="3"
Width="460"
Height="145"
Margin="2,0,0,0"
Style="{DynamicResource ListBoxItemNormalBackground_Border_Style}">
<Grid >
<TextBlock Text="{Binding Drug_info}"
Margin="110,12,0,0"
HorizontalAlignment="left"
VerticalAlignment="top"
TextAlignment="left"
Style="{DynamicResource ListBoxItemName_TextBlock_Style}"/>
<TextBlock Text="{Binding Pouch_comment}"
Margin="111,32,0,0" FontSize="16"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
<WrapPanel Orientation="Horizontal">
<TextBlock Margin="111,50,0,0" Text="批次单号：" FontSize="14"/>
<TextBlock Text="{Binding Batch_id}"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"
Margin="0,50,0,0"/>
</WrapPanel>
<WrapPanel>
<TextBlock Margin="111,68,0,0" Text="批次日期：" FontSize="14"></TextBlock>
<TextBlock Text="{Binding Batch_date}"
Margin="0,68,0,0"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
<WrapPanel>
<TextBlock Margin="111,86,0,0" Text="病区名称：" FontSize="14"></TextBlock>
<TextBlock Text="{Binding Ward_name}"
Margin="0,86,0,0"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
<Border Style="{DynamicResource ListBoxItemHeadBackground_Border_Style}"
Margin="15,15,0,0"
Width="82"
Height="102"
VerticalAlignment="Top"
HorizontalAlignment="Left" >
<!--<Image Source="{Binding 1.png,Converter={StaticResource IndsxToImageSourceConverter}}"
Margin="2"/>-->
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding Batch_type}" FontSize="18"
Foreground="{Binding Batch_type,Converter={StaticResource ForeGroundBatchType}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Image Source="..\Img\1.png"></Image>
</StackPanel>
</Border>
</Grid>
</Border>
<!--控件触发器-->
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd">
<Setter.Value>
<!--LinearGradientBrush,渐变线画笔-->
<LinearGradientBrush
StartPoint="0.4,0"
EndPoint="0.4,1">
<LinearGradientBrush.GradientStops>
<!--GradientStops渐变线停止，GradientStopCollection渐变线停止集合点-->
<GradientStopCollection>
<GradientStop
Color="#FFffeeac"
Offset="0" />
<GradientStop
Color="#FFfbe178"
Offset="0.4" />
<GradientStop
Color="#FFfbe178"
Offset="0.6" />
<GradientStop
Color="#FFfffbd9"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush" TargetName="Bd" Value="RoyalBlue"></Setter>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="Bd">
<Setter.Value>
<!--LinearGradientBrush,渐变线画笔-->
<LinearGradientBrush
StartPoint="0.4,0"
EndPoint="0.4,1">
<LinearGradientBrush.GradientStops>
<!--GradientStops渐变线停止，GradientStopCollection渐变线停止集合点-->
<GradientStopCollection>
<GradientStop
Color="#FFC2E0FF"
Offset="0" />
<GradientStop
Color="#FFC2E0dF"
Offset="0.4" />
<GradientStop
Color="#FFC2E0dF"
Offset="0.6" />
<GradientStop
Color="#FFfffbd9"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!--ListBox Item样式-->
<Style x:Key="ApplicantList_ListBoxItem_Style1" TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="10,10,10,0" />
<Setter Property="ToolTip">
<Setter.Value>
<ToolTip ToolTipService.Placement="Top" Content="双击开始调配！" ToolTipService.ShowOnDisabled="True" ToolTipService.ShowDuration="2000"></ToolTip>
</Setter.Value>
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border x:Name="Bd" BorderThickness="3"
Width="460"
Height="145"
Margin="2,0,0,0"
Style="{DynamicResource ListBoxItemNormalBackground_Border_Style1}">
<Grid >
<TextBlock Text="{Binding Drug_name}"
Margin="110,12,0,0"
HorizontalAlignment="left"
VerticalAlignment="top"
TextAlignment="left"
Style="{DynamicResource ListBoxItemName_TextBlock_Style}"/>
<TextBlock Text="{Binding Pouch_total}"
Margin="111,32,0,0" FontSize="16" Foreground="{Binding Pouch_total,Converter={StaticResource PouchTotalConverter}}"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
<WrapPanel Orientation="Horizontal">
<TextBlock Margin="111,48,0,0" Text="调配剂量：" FontSize="14"/>
<TextBlock Text="{Binding Dosage_total}" Foreground="{Binding Dosage_total,Converter={StaticResource PouchTotalConverter}}"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"
Margin="0,48,0,0"/>
</WrapPanel>
<WrapPanel>
<TextBlock Margin="111,64,0,0" Text="实际剂量：" FontSize="14"></TextBlock>
<TextBlock Text="{Binding Dosage_real_total}"
Margin="0,64,0,0"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
<WrapPanel>
<TextBlock Margin="111,80,0,0" Text="调配标志：" FontSize="14"></TextBlock>
<TextBlock Text="{Binding Exec_flag}"
Margin="0,80,0,0" Foreground="{Binding Exec_flag,Converter={StaticResource PouchTotalConverter}}"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
<WrapPanel>
<TextBlock Margin="111,96,0,0" Text="调配时间：" FontSize="14"></TextBlock>
<TextBlock Text="{Binding Exec_date}"
Margin="0,96,0,0"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
<Border Style="{DynamicResource ListBoxItemHeadBackground_Border_Style}"
Margin="15,15,0,0"
Width="82"
Height="82"
VerticalAlignment="Top"
HorizontalAlignment="Left" >
<!--<Image Source="{Binding 1.png,Converter={StaticResource IndsxToImageSourceConverter}}"
Margin="2"/>-->
<Image Source="..\Img\drug.png"></Image>
</Border>
</Grid>
</Border>
<!--控件触发器-->
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd">
<Setter.Value>
<!--LinearGradientBrush,渐变线画笔-->
<LinearGradientBrush
StartPoint="0.4,0"
EndPoint="0.4,1">
<LinearGradientBrush.GradientStops>
<!--GradientStops渐变线停止，GradientStopCollection渐变线停止集合点-->
<GradientStopCollection>
<GradientStop
Color="#FFffeeac"
Offset="0" />
<GradientStop
Color="#ddf9e1"
Offset="0.4" />
<GradientStop
Color="#DDf2e1"
Offset="0.6" />
<GradientStop
Color="#FFfffbd9"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush" TargetName="Bd" Value="SpringGreen"></Setter>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="Bd">
<Setter.Value>
<!--LinearGradientBrush,渐变线画笔-->
<LinearGradientBrush
StartPoint="0.4,0"
EndPoint="0.4,1">
<LinearGradientBrush.GradientStops>
<!--GradientStops渐变线停止，GradientStopCollection渐变线停止集合点-->
<GradientStopCollection>
<GradientStop
Color="#FFC2E0FF"
Offset="0" />
<GradientStop
Color="#FFC2E0dF"
Offset="0.4" />
<GradientStop
Color="#FFC2E0dF"
Offset="0.6" />
<GradientStop
Color="#FFfffbd9"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!--字体样式-->
<Style x:Key="Title_TextBlock_Style" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="34"/>
<Setter Property="FontFamily" Value="微软雅黑"/>
<Setter Property="Foreground" Value="#FFFFFFFF"/>
</Style>
<Style x:Key="Copyright_TextBlock_Style" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12"/>
<Setter Property="FontFamily" Value="宋体"/>
<Setter Property="Foreground" Value="#FF939393"/>
</Style>
<Style x:Key="ChirdrenControlTitle_TextBlock_Style" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontFamily" Value="微软雅黑"/>
<Setter Property="Foreground" Value="#FFFFFFFF"/>
</Style>
<Style x:Key="ListBoxItemName_TextBlock_Style" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="微软雅黑"/>
<Setter Property="Foreground" Value="#000000"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style>
<Style x:Key="ListBoxItemContent_TextBlock_Style" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontFamily" Value="微软雅黑"/>
<Setter Property="Foreground" Value="#333333"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style>
<!--ListBox元素边框样式-->
<Style x:Key="ListBoxItemNormalBackground_Border_Style" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="5" />
<Setter Property="BorderBrush" Value="#E1E1E1"/>
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush StartPoint="0.5,0"
EndPoint="0.5,1">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFffffff"
Offset="0" />
<GradientStop Color="#FFE4E4E4"
Offset="0.96" />
<GradientStop Color="#FFe4e4e4"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="#9e9e9e"
Direction="315"
ShadowDepth="3"
Opacity="1" />
</Setter.Value>
</Setter>
</Style>
<!--ListBox元素边框样式-->
<Style x:Key="ListBoxItemNormalBackground_Border_Style1" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="5" />
<Setter Property="BorderBrush" Value="#E1E1E1"/>
<Setter Property="Background">
<Setter.Value>
<LinearGradientBrush StartPoint="0.5,0"
EndPoint="0.5,1">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFffffff"
Offset="0" />
<GradientStop Color="PowderBlue"
Offset="0.96" />
<GradientStop Color="PaleTurquoise"
Offset="1" />
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Setter.Value>
</Setter>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="#9e9e9e"
Direction="315"
ShadowDepth="3"
Opacity="1" />
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.1*"/>
<RowDefinition Height="0.3*"/>
<RowDefinition Height="0.2*"/>
<RowDefinition />
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
@ -50,8 +386,8 @@
<Label x:Name="lbCurrPressure" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
</StackPanel>
</StackPanel>
<!--<ListBox Grid.Row="1" x:Name="DringRoomOuterListBox"></ListBox>-->
<!--ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"-->
<ListBox Grid.Row="1" x:Name="DringRoomOuterListBox" Style="{DynamicResource ApplicantList_ListBox_Style}" Margin="20,0,0,0"></ListBox>
<ListBox Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}" Margin="20,0,0,0">
</ListBox>

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

@ -34,14 +34,14 @@ namespace XGL.Views
{
InitComBoboxData();
GetDringRoomData();
GetOutDringRoomData();
}
private void GetDringRoomData()
{
DringRoomListBox.ItemsSource = null;
DringRoomListBox.Items.Clear();
DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString());
DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString(),1);
if (dt == null)
{
return;
@ -53,16 +53,57 @@ namespace XGL.Views
foreach (DataRow item in dt.Rows)
{
index = i++;
string rfid = item["rfid"].ToString();
string rfid = item["rfid_no"].ToString();
string workorder_code = item["workorder_code"].ToString();
string materialCode = item["product_code"].ToString();
string materialCode = item["material_code"].ToString();
string inTime = item["update_time"].ToString();
TimeSpan ts;
ts = DateTime.Now - Convert.ToDateTime(inTime);
int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
//string workorder_code = item["workorder_code"].ToString();
ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, "10");
ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
DringRoomListBox.Items.Add(uc);
}
}
private void GetOutDringRoomData()
{
DringRoomOuterListBox.ItemsSource = null;
DringRoomOuterListBox.Items.Clear();
DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString(),0);
if (dt == null)
{
return;
}
int index = 0;
int i = 0;
foreach (DataRow item in dt.Rows)
{
index = i++;
string rfid = item["rfid_no"].ToString();
string workorder_code = item["workorder_code"].ToString();
string materialCode = item["material_code"].ToString();
string inTime = item["update_time"].ToString();
TimeSpan ts;
ts = DateTime.Now - Convert.ToDateTime(inTime);
int minuteDiff = Convert.ToInt32(ts.TotalMinutes);
//string workorder_code = item["workorder_code"].ToString();
ModuleUC uc = new ModuleUC(index.ToString(), rfid, workorder_code, materialCode, minuteDiff);
DringRoomOuterListBox.Items.Add(uc);
}
}
private void InitComBoboxData()
@ -89,6 +130,7 @@ namespace XGL.Views
{
string hfCode = comboDryRoomInfo.SelectedValue.ToString();//.Text;
GetDringRoomData();
GetOutDringRoomData();
}
}
public class EquipmentMode

28
shangjian/XGL/Views/LanJu_Prepare.xaml
Unescape Escape View File

@ -85,7 +85,7 @@
</Setter>
</Style>
<Style x:Key="CustomCellStyle" TargetType="DataGridCell">
<Setter Property="Foreground" Value="#707971" />
<Setter Property="Foreground" Value="Black" />
<Setter Property="TextBlock.TextAlignment" Value="Center" />
<Setter Property="TextBlock.FontSize" Value="22" />
</Style>
@ -130,11 +130,15 @@
</Label>
<DataGrid
x:Name="dgMaterialInfo"
Grid.Row="1"
Grid.Column="0"
Width="1500"
Height="309"
Margin="25,0,0,0"
CellStyle="{StaticResource CustomCellStyle}"
LoadingRow="dgMaterialInfo_LoadingRow"
HeadersVisibility="Column"
AutoGenerateColumns="False"
FrozenColumnCount="1"
EnableColumnVirtualization="False"
@ -149,12 +153,31 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="300" Header="工单" Binding="{Binding workorder_code}"/>
<DataGridTextColumn Width="300" Header="产品编码" Binding="{Binding product_code}"/>
<DataGridTextColumn Width="300" Header="产品名称" Binding="{Binding product_name}"/>
<DataGridTextColumn Width="300" Header="物料编码" Binding="{Binding material_code}"/>
<DataGridTextColumn Width="300" Header="物料名称" Binding="{Binding material_name}"/>
<DataGridTextColumn Width="200" Header="物料规格" Binding="{Binding product_spc}"/>
<DataGridTextColumn Width="80" Header="数量" Binding="{Binding quantity}" />
</DataGrid.Columns>
<!--<DataGrid.Columns>
<DataGridTextColumn Width="300" Header="序号" />
<DataGridTextColumn Width="300" Header="准备类型" />
<DataGridTextColumn Width="300" Header="准备内容" />
<DataGridTextColumn Width="300" Header="状态" />
<DataGridTextColumn Width="300" Header="完成时间" />
</DataGrid.Columns>
</DataGrid.Columns>-->
</DataGrid>
<Button Grid.Row="1" Grid.Column="1" Click="btnStartOrders_Click">
<Button.Template>
@ -216,6 +239,7 @@
LoadingRow="USERLIST_LoadingRow"
HeadersVisibility="Column"
IsReadOnly="True"
SelectionChanged="WorkOrder_SelectionChanged"
FontSize="24">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">

22
shangjian/XGL/Views/LanJu_Prepare.xaml.cs
Unescape Escape View File

@ -339,6 +339,28 @@ namespace XGL.Views
{
e.Row.Header = (e.Row.GetIndex() + 1).ToString();
}
private void WorkOrder_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
try
{
var selectedRow = WorkOrder.SelectedItem as WetMaterialModel;
var processid = selectedRow.workorder_code;
DataTable dt = userDbWareHouse.GetMaterialInfo(processid);
this.dgMaterialInfo.ItemsSource = dt.DefaultView;
}
catch (Exception ex)
{
CustomMessageBox.Show(ex.Message,CustomMessageBoxButton.OK,CustomMessageBoxIcon.Error);
LogHelper.instance.log.Error("获取工单物料信息时发生异常：" + ex.Message);
}
}
private void dgMaterialInfo_LoadingRow(object sender, DataGridRowEventArgs e)
{
e.Row.Header = (e.Row.GetIndex() + 1).ToString();
}
}
}

BIN
shangjian/XGL/bin/x86/Debug/CentralControl.exe
View File

Binary file not shown.

BIN
shangjian/XGL/bin/x86/Debug/CentralControl.pdb
View File

Binary file not shown.

BIN
shangjian/XGL/bin/x86/Debug/XGL.Data.dll
View File

Binary file not shown.

BIN
shangjian/XGL/bin/x86/Debug/XGL.Data.pdb
View File

Binary file not shown.

BIN
shangjian/XGL/bin/x86/Debug/XGL.exe
View File

Binary file not shown.

2
shangjian/XGL/bin/x86/Debug/XGL.exe.config
Unescape Escape View File

@ -12,7 +12,7 @@
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
<add key="ClientMode" value="0" />
<add key="ClientMode" value="2" />
<!--上位机类型 1 上件 ，2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->

BIN
shangjian/XGL/bin/x86/Debug/XGL.pdb
View File

Binary file not shown.

10
shangjian/XGL/bin/x86/Debug/config/ConnectionConfig.Config
Unescape Escape View File

@ -2,11 +2,13 @@
<ConnectionConfig>
<Recommand>强烈建议:对数据库以及本软件的参数更改,不要在此页进行.可以通过系统配置页进行更新.</Recommand>
<!--服务器上的业务数据库-->
<MESNetClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THmyUqdarOD4hLgFIvnCg0Z5JcMnCcII6fP2O7usaxD2yxms2iG3eLDegOrDQOCCjq</MESNetClientConnectionString>
<!--<MESNetClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THmyUqdarOD4hLgFIvnCg0Z5JcMnCcII6fP2O7usaxD2yxms2iG3eLDUbqRzra4aRVWyptaS06VoI5ijFvcRfLsDJTcpjMhCY6BLuczFcXp04=</MESNetClientConnectionString>-->
<!--云数据库-->
<CloudConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</CloudConnectionString>
<!--<CloudConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1SeyBo9i02eVJXgQThZLtJ4i8onuEvQtnfNObn1j0jgO</CloudConnectionString>-->
<!--本地的业务数据库-->
<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>
<!--数据库-->
<!--<MySqlConnectionString>igZ3PbqeXzez1HUpTvRW4+LN/9fIQE8w7lqtFwpDujEJchOzHF4jJWgEwT3oxB+uW0XXOd7lwTdL1w6kdh7LQieRTzhe4Z2yGk1RKM8hcNnxWfNsUqIOH89niuwO6y1z</MySqlConnectionString>-->
<!--榄菊业务数据库-->
<MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91A7V9zSnfhmhLWUQKZQdqof6chkC37l6QElb57z876mZdo9764iNmLGULHBiQyMu6PXowBdyaQVt17BPsWFn4EUs7Z7zTZwBP+2iJBVXitA3OF6EZXxAztmeZk/1iCwni+JzeWNpXqeOoGzkmSSzmVQH2Yf9m/mlqag2TbldSCcnUQl6lE7tcGg==</MESNetClientConnectionString>
<!--榄菊云数据库-->
<CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91ML11cYCqHcHmTXJFsNQamIbW3UEpkjgNPUcBwRfgP6AWftvk9YFyv7y7/6nzX/c+6z6xMDIdcjYVvfteU+7YtOQhJXTfF5ScosAA0GliBfD8dWAunW+ZCos5LemAj2xb2wvvCxlbnrof8IunWslCaBEAGrdC/KhE0qEfNbxydwc=</CloudConnectionString>
</ConnectionConfig>

10
shangjian/XGL/config/ConnectionConfig.Config
Unescape Escape View File

@ -2,11 +2,13 @@
<ConnectionConfig>
<Recommand>强烈建议:对数据库以及本软件的参数更改,不要在此页进行.可以通过系统配置页进行更新.</Recommand>
<!--服务器上的业务数据库-->
<MESNetClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THmyUqdarOD4hLgFIvnCg0Z5JcMnCcII6fP2O7usaxD2yxms2iG3eLDegOrDQOCCjq</MESNetClientConnectionString>
<!--<MESNetClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THmyUqdarOD4hLgFIvnCg0Z5JcMnCcII6fP2O7usaxD2yxms2iG3eLDUbqRzra4aRVWyptaS06VoI5ijFvcRfLsDJTcpjMhCY6BLuczFcXp04=</MESNetClientConnectionString>-->
<!--云数据库-->
<CloudConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</CloudConnectionString>
<!--<CloudConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1SeyBo9i02eVJXgQThZLtJ4i8onuEvQtnfNObn1j0jgO</CloudConnectionString>-->
<!--本地的业务数据库-->
<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>
<!--数据库-->
<!--<MySqlConnectionString>igZ3PbqeXzez1HUpTvRW4+LN/9fIQE8w7lqtFwpDujEJchOzHF4jJWgEwT3oxB+uW0XXOd7lwTdL1w6kdh7LQieRTzhe4Z2yGk1RKM8hcNnxWfNsUqIOH89niuwO6y1z</MySqlConnectionString>-->
<!--榄菊业务数据库-->
<MESNetClientConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91A7V9zSnfhmhLWUQKZQdqof6chkC37l6QElb57z876mZdo9764iNmLGULHBiQyMu6PXowBdyaQVt17BPsWFn4EUs7Z7zTZwBP+2iJBVXitA3OF6EZXxAztmeZk/1iCwni+JzeWNpXqeOoGzkmSSzmVQH2Yf9m/mlqag2TbldSCcnUQl6lE7tcGg==</MESNetClientConnectionString>
<!--榄菊云数据库-->
<CloudConnectionString>vadMWi9D6ZC3usVUY51rbTRH8TjL6CxlHbduXNDkc8suJwqe10me6ktk8XD3QU91ML11cYCqHcHmTXJFsNQamIbW3UEpkjgNPUcBwRfgP6AWftvk9YFyv7y7/6nzX/c+6z6xMDIdcjYVvfteU+7YtOQhJXTfF5ScosAA0GliBfD8dWAunW+ZCos5LemAj2xb2wvvCxlbnrof8IunWslCaBEAGrdC/KhE0qEfNbxydwc=</CloudConnectionString>
</ConnectionConfig>

62
shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
Unescape Escape View File

@ -1,62 +1,2 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}


BIN
shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
View File

Binary file not shown.

63
shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77CABBF885A9D1381971FDBA7D4DDF6E19DF188E7735A376E7D1A27836120D92"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,7 +43,15 @@ namespace XGL.Views {
public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
#line 197 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 133 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgMaterialInfo;
#line default
#line hidden
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
@ -51,7 +59,7 @@ namespace XGL.Views {
#line hidden
#line 208 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 231 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid WorkOrder;
@ -97,28 +105,43 @@ namespace XGL.Views {
#line hidden
return;
case 2:
this.dgMaterialInfo = ((System.Windows.Controls.DataGrid)(target));
#line 159 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line 140 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.dgMaterialInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgMaterialInfo_LoadingRow);
#line default
#line hidden
return;
case 3:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line 182 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line default
#line hidden
return;
case 4:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 221 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
#line hidden
return;
case 5:
this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
#line 216 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
#line default
#line hidden
#line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
#line default
#line hidden
return;
@ -135,25 +158,25 @@ namespace XGL.Views {
void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 5:
#line 325 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
break;
case 6:
#line 332 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line 352 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
break;
case 7:
#line 339 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 359 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line default
#line hidden
break;
case 8:
#line 366 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default

63
shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F430F137153B10D1FB7EFC67A79F115AF750C771080C3D4ECBEAEFB55E18CF05"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77CABBF885A9D1381971FDBA7D4DDF6E19DF188E7735A376E7D1A27836120D92"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,7 +43,15 @@ namespace XGL.Views {
public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
#line 197 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 133 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgMaterialInfo;
#line default
#line hidden
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
@ -51,7 +59,7 @@ namespace XGL.Views {
#line hidden
#line 208 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 231 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid WorkOrder;
@ -97,28 +105,43 @@ namespace XGL.Views {
#line hidden
return;
case 2:
this.dgMaterialInfo = ((System.Windows.Controls.DataGrid)(target));
#line 159 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line 140 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.dgMaterialInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgMaterialInfo_LoadingRow);
#line default
#line hidden
return;
case 3:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 198 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line 182 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line default
#line hidden
return;
case 4:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 221 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
#line hidden
return;
case 5:
this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
#line 216 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
#line default
#line hidden
#line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
#line default
#line hidden
return;
@ -135,25 +158,25 @@ namespace XGL.Views {
void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 5:
#line 325 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
break;
case 6:
#line 332 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line 352 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
break;
case 7:
#line 339 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 359 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line default
#line hidden
break;
case 8:
#line 366 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default

BIN
shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/XGL.exe
View File

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/XGL.g.resources
View File

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/XGL.pdb
View File

Binary file not shown.

2
shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
Unescape Escape View File

@ -1,4 +1,4 @@

D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;

Write Preview
Loading…
Cancel
Save