20260122
zhaoaomin 2 years ago
parent 6471c6c5b3
commit 26c57b329a

Binary file not shown.

@ -16,10 +16,16 @@ namespace XGL.Data.DBService
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public DataTable GetDringRoomInfo()
public DataTable GetDringRoomInfo(string list)
{
string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf'";
string[] str = list.Split(',');
string where = "";
foreach (string str2 in str)
{
where += $"'{str2}',";
}
where = "("+where.Trim(',')+")";
string sql = $@"select equipment_code as quipCode,equipment_name as quipName,equipment_type_code from base_equipment where equipment_type_code = 'equ_type_hf' and equipment_code in {where}";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@ -47,6 +53,25 @@ namespace XGL.Data.DBService
//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')
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
return dtset.Tables[0];
}
return null;
}
/// <summary>
/// 获取烘房温湿度
/// </summary>
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public DataTable GetTemperAndHumilly(string devicecode)
{
string sql = $@"select isnull(isvalue,0) from base_equipment_attached where device_code = '{devicecode}' and (property='temperature' or property = 'humidity') ; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{

@ -5,6 +5,7 @@ using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using XGL.Models.Model.FoamingMac;
namespace XGL.Data.DBService
{
@ -17,12 +18,13 @@ namespace XGL.Data.DBService
/// <param name="edt"></param>
/// <returns></returns>
public DataTable GetFormingMachineInfo(string devicecode)
{
string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status ,ord.route_code
{
string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,product_name,product_code,isnull(car_num,0) as car_num,
isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status ,ord.route_code,ord.attr1,work_batch_code,res.taskcode,res.rfid
FROM [dbo].[mes_material_transfer_result] res
LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
where equipmentCode = '{devicecode}'; ";
LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
where equipmentCode = '{devicecode}' and rfid_status = '1'; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@ -93,7 +95,7 @@ where res.taskcode = '1' and equipmentCode = '{devicecode}'; ";
}
/// <summary>
/// 获取工单当前状态
/// 获取工单当前状态,弃用
/// </summary>
/// <param name="bdt"></param>
/// <param name="edt"></param>
@ -123,5 +125,55 @@ where res.taskcode = '1' and equipmentCode = '{devicecode}'; ";
return issucc > 0 ? true : false;
}
/// <summary>
/// 更新工单
/// </summary>
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public bool InsertData(FoamingMacModel formingModel)
{
string sql = $@"INSERT INTO [lanju_op_xiaolan_ds].[dbo].[mes_material_transfer_result] (
[id],
[begin],
[beout],
[equipmentCode],
[OrderCode],
[sku],
[planID],
[rfid],
[now_process_id],
[status],
[create_time],
[rfid_status],
[taskcode],
[state],
[update_time]
)
VALUES
(
'{CommonFunc.Common.GetUUID()}',
'GetDate()',
'GetDate()',
'{Utils.GetAppSetting("DeviceCode")}',
'{formingModel.workorder_id}',
'{formingModel.product_code}',
'',
'{formingModel.rfid}',
'',
'4',
'GetDate()',
'1',
'0',
'1',
'GetDate()'
);";
int issucc = Utils.netClientDBHelper.executeUpdate(sql);
return issucc > 0 ? true : false;
}
}
}

@ -23,5 +23,10 @@ namespace XGL.Models.Model.FoamingMac
public string product_date { get; set; }
public string create_by { get; set; }
public string process_id { get; set; }
public string attr1 { get; set; }
public string work_batch_code { get; set; }
public string taskcode { get; set; }
public string rfid { get; set; }
}
}

@ -1,105 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="XGL.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="ITE.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<appSettings>
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房-->
<add key="ClientMode" value="2" />
<!--上位机类型 1 上件 2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->
<add key="LineCode" value="101" />
<add key="plcIp" value="127.0.0.1" />
<add key="plcIp2" value="127.0.0.1" />
<add key="plcport" value="60001" />
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="XGL.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="ITE.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<appSettings>
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房-->
<add key="ClientMode" value="2" />
<add key="DryingHouseList" value="H1,H2,H3" />
<!--上位机类型 1 上件 2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->
<add key="LineCode" value="101" />
<add key="plcIp" value="127.0.0.1" />
<add key="plcIp2" value="127.0.0.1" />
<add key="plcport" value="60001" />
<add key="LineId" value="1" />
<!--看板刷新时间 单位秒-->
<add key="BoardRefresh" value="6000" />
<!--下件界面刷新时间 单位秒-->
<add key="TakeOffRefresh" value="10" />
<!--排空区刷新时间 单位秒-->
<add key="EmptyRefresh" value="10" />
<!--获取设备状态间隔时间 单位秒-->
<add key="GetDeviceStateInterval" value="30000" />
<add key="thriftIp" value="192.168.3.150" />
<!--上件点发车thrift端口 7911 ,7912-->
<add key="thriftPort" value="7921" />
<!--出库点thrift端口-->
<add key="thriftBoxPort" value="7915" />
<!--FormBoardthrift端口-->
<add key="FormBoardThriftPort" value="7931" />
<!--物料同步接口地址-->
<add key="WCSMaterialSyncAddress" value="http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync"/>
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<applicationSettings>
<XGL.Properties.Settings>
<setting name="XGL_SendMailAndFile_InterfacesServiceImplService" serializeAs="String">
<value>http://192.168.1.125:8080/webservice/interfacesService</value>
</setting>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="XGL_AutoUpdate1_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="HFXXDR_AutoUpdate1_WebService" serializeAs="String">
<value>http://localhost:55277/WebService.asmx</value>
</setting>
</XGL.Properties.Settings>
<ITE.Properties.Settings>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
</ITE.Properties.Settings>
</applicationSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.3.11" newVersion="1.3.3.11" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<add key="LineId" value="1" />
<!--看板刷新时间 单位秒-->
<add key="BoardRefresh" value="6000" />
<!--下件界面刷新时间 单位秒-->
<add key="TakeOffRefresh" value="10" />
<!--排空区刷新时间 单位秒-->
<add key="EmptyRefresh" value="10" />
<!--获取设备状态间隔时间 单位秒-->
<add key="GetDeviceStateInterval" value="30000" />
<!--获取设备温湿度间隔时间 单位秒-->
<add key="GetDeviceTempAndHumInterval" value="15000" />
<add key="thriftIp" value="192.168.3.150" />
<!--上件点发车thrift端口 7911 ,7912-->
<add key="thriftPort" value="7921" />
<!--出库点thrift端口-->
<add key="thriftBoxPort" value="7915" />
<!--FormBoardthrift端口-->
<add key="FormBoardThriftPort" value="7931" />
<!--物料同步接口地址-->
<add key="WCSMaterialSyncAddress" value="http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync"/>
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<applicationSettings>
<XGL.Properties.Settings>
<setting name="XGL_SendMailAndFile_InterfacesServiceImplService" serializeAs="String">
<value>http://192.168.1.125:8080/webservice/interfacesService</value>
</setting>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="XGL_AutoUpdate1_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="HFXXDR_AutoUpdate1_WebService" serializeAs="String">
<value>http://localhost:55277/WebService.asmx</value>
</setting>
</XGL.Properties.Settings>
<ITE.Properties.Settings>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
</ITE.Properties.Settings>
</applicationSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.3.11" newVersion="1.3.3.11" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

@ -379,7 +379,7 @@
FontSize="20"
Text="设备状态:" />
<Border CornerRadius="50" Width="40" Height="35" Background="{Binding ElementName=LbDeviceState,Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}">
<Label Name="LbDeviceState" Content="Hello" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontWeight="Bold"/>
<Label Name="LbDeviceState" Content="Hi" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontWeight="Bold"/>
</Border>
<!--<Label x:Name="LbDeviceState" Style="{StaticResource RoundButton}"
Background="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content, Converter={StaticResource ButtonContentToBackgroundColorConverter}}"></Label>
@ -545,8 +545,24 @@
<Run Name="btnText" Text="{Binding PingSeconds}"></Run>
<Run Text="ms"></Run>
</TextBlock>
<Button BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent" FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="btnZXH" Margin="1400,4,0,2" ToolTip="最小化" Click="btnZXH_Click" >
<StackPanel Orientation="Horizontal">
<Label
Width="66"
Height="40"
HorizontalAlignment="Left"
Content="版本:"
FontSize="20px"
Foreground="Black" VerticalContentAlignment="Center"/>
<Label
x:Name="lbVersion"
Width="150"
Height="40"
HorizontalAlignment="Left"
Content="20231001001"
FontSize="20px"
Foreground="Black" VerticalContentAlignment="Center"/>
</StackPanel>
<Button BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent" FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="btnZXH" Margin="1200,4,0,2" ToolTip="最小化" Click="btnZXH_Click" >
<Image Source="..\Resources\zxh.png" />
</Button>
<Button

@ -135,6 +135,7 @@ namespace XGL.FormItem
private void Window_Loaded(object sender, RoutedEventArgs e)
{
TimerDeciveState_Elapsed(null,null);
this.tbOperator.Text = LoginUser.UserName;
this.tbDevice.Text = Utils.GetAppSetting("DeviceCode");
string sitecode = Utils.GetAppSetting("SiteCode");
@ -145,6 +146,7 @@ namespace XGL.FormItem
timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
timerDeciveState.Start();
this.lbVersion.Content = "20231003001";
}

@ -7,6 +7,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:loadin="clr-namespace:LoadingIndicators.WPF;assembly=LoadingIndicators.WPF"
Title="Login" Height="500" Width="350" ResizeMode="NoResize" WindowStyle="None"
xmlns:customControlLibrary1="clr-namespace:WpfCustomControlLibrary1;assembly=WpfCustomControlLibrary1"
WindowStartupLocation="CenterScreen" MouseLeftButtonDown="Window_MouseLeftButtonDown" Loaded="Window_Loaded">
<Grid>
<Rectangle Height="280" VerticalAlignment="Top">
@ -42,10 +43,11 @@
IsChecked="True">
记住密码
</CheckBox>
<loadin:LoadingIndicator x:Name="dldh" Margin="156,434,154,26" SpeedRatio="1.5" IsActive="True" Style="{DynamicResource LoadingIndicatorArcsStyle}">
</loadin:LoadingIndicator>
<!--<loadin:LoadingIndicator x:Name="dldh" Margin="156,434,154,26" SpeedRatio="1.5" IsActive="True" Style="{DynamicResource LoadingIndicatorArcsStyle}">
</loadin:LoadingIndicator>-->
<customControlLibrary1:CustomControl1 x:Name="dldh" Margin="156,434,154,26" Width="50" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<Label x:Name="zzdl" HorizontalAlignment="Center" Margin="115,476,100,0" Content="正在登陆" Foreground="#0454D7"></Label>
<!--<TextBlock Text="ESQUECEU SUA SENHA?" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="50" Foreground="Gray" Cursor="Hand"></TextBlock>-->
</Grid>
</Window>

@ -47,7 +47,8 @@ namespace XGL
{
try
{
this.dldh.IsActive = true;//遮罩层可见
//this.dldh.IsActive = true;//遮罩层可见
this.dldh.Visibility = Visibility.Visible;//遮罩层可见
zzdl.Visibility = Visibility.Visible;
ul = new UserLogin
{
@ -190,7 +191,8 @@ namespace XGL
CustomMessageBox.Show("登录异常,请重试", CustomMessageBoxIcon.Error);
break;
}
dldh.IsActive = false;
//dldh.IsActive = false;
this.dldh.Visibility = Visibility.Hidden;//遮罩层可见
zzdl.Visibility = Visibility.Collapsed;
}
@ -207,7 +209,8 @@ namespace XGL
try
{
username.Focus();
dldh.IsActive = false;
//dldh.IsActive = false;
this.dldh.Visibility = Visibility.Hidden;//遮罩层可见
zzdl.Visibility = Visibility.Collapsed;
string name = Common.IniReadValue("登录明细", "loginUser");
username.Text = name;

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace XGL.Tools
{
public class OrderInOutConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
// 根据输入值返回对应的输出值 已派发w1未派w0活动w2报工w3
if (value.Equals("0"))
{
return "进";
}
else
{
return "出";
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
// 如果需要双向绑定,也需要实现 ConvertBack 方法
throw new NotImplementedException();
}
}
}

@ -32,8 +32,9 @@
</StackPanel>
<Label x:Name="tbMsg" Width="500" Height="60" Grid.Row="3" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" FontSize="18" Foreground="Red" FontWeight="Bold"></Label>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="4">
<Button x:Name="btnCancel" Width="120" Height="50" Content="取消" Margin="10" FontWeight="Bold" Click="btnCancel_Click"/>
<Button x:Name="btnOK" Width="120" Height="50" Content="确定" Margin="10" Background="#2F82E7" Foreground="White" FontWeight="Bold" Click="btnOK_Click"/>
<Button x:Name="btnCancel" Width="120" Height="50" Content="取消" Margin="10" FontWeight="Bold" Click="btnCancel_Click"/>
</StackPanel>
</Grid>
</Window>

@ -37,35 +37,35 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border x:Name="Bd" BorderThickness="3"
Width="460"
Height="145"
Width="250"
Height="150"
Margin="2,0,0,0"
Style="{DynamicResource ListBoxItemNormalBackground_Border_Style}">
<Grid >
<TextBlock Text="{Binding Drug_info}"
<TextBlock Text="{Binding workorder_code}"
Margin="110,12,0,0"
HorizontalAlignment="left"
VerticalAlignment="top"
TextAlignment="left"
Style="{DynamicResource ListBoxItemName_TextBlock_Style}"/>
<TextBlock Text="{Binding Pouch_comment}"
<TextBlock Text="{Binding material_code}"
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}"
<TextBlock Text="{Binding rfid_no}"
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}"
<TextBlock Text="{Binding update_time}"
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}"
<TextBlock Text="{Binding rfid_no}"
Margin="0,86,0,0"
Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
</WrapPanel>
@ -77,11 +77,11 @@
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"/>
<!--<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding rfid_no}" FontSize="18"
Foreground="{Binding rfid_no,Converter={StaticResource ForeGroundBatchType}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Image Source="..\Img\1.png"></Image>
</StackPanel>
</StackPanel>-->
</Border>
</Grid>
</Border>
@ -149,132 +149,7 @@
</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"/>
@ -365,6 +240,94 @@
</Setter.Value>
</Setter>
</Style>
<!--ComboBox下拉按钮-->
<Style TargetType="ToggleButton" x:Key="ComboxStyleBtn">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border x:Name="Back" Background="#F7FDF7" BorderThickness="1" BorderBrush="Transparent">
<Path Name="PathFill" Fill="Blue" Width="8" Height="6" StrokeThickness="0" Data="M5,0 L10,10 L0,10 z" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
<Path.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="180"/>
<TranslateTransform/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="PathFill" Property="Fill" Value="White"></Setter>
<Setter TargetName="Back" Property="Background" Value="#3697A4"></Setter>
<Setter TargetName="Back" Property="BorderBrush" Value="#3697A4"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="ComboBox" x:Key="ComboBoxStyle">
<Setter Property="ItemContainerStyle">
<Setter.Value>
<!--ComBoxItem #59CA4F #81D779-->
<Style TargetType="ComboBoxItem">
<Setter Property="MinHeight" Value="22"></Setter>
<Setter Property="MinWidth" Value="60"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ComboBoxItem">
<Border Name="Back" Background="Transparent" CornerRadius="5,5,5,5"
RenderTransformOrigin="0.5,0.5" BorderThickness="0,0,0,0" BorderBrush="Blue" >
<ContentPresenter ContentSource="{Binding Source}" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5,0,0,0"></ContentPresenter>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Back" Property="Background" Value="LightGray"></Setter>
</Trigger>
<Trigger Property="IsHighlighted" Value="True">
<Setter TargetName="Back" Property="Background" Value="LightGray"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Setter.Value>
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ComboBox">
<Grid Background="#F7FDF7">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.7*"/>
<ColumnDefinition Width="0.3*" MaxWidth="30"/>
</Grid.ColumnDefinitions>
<TextBox x:Name="PART_EditableTextBox" Grid.Column="0" IsReadOnly="{TemplateBinding IsReadOnly}" FontSize="18" VerticalContentAlignment="Center" Text="{TemplateBinding Text}"></TextBox>
<Border Grid.Column="0" BorderThickness="1,1,0,1" BorderBrush="LightGray" CornerRadius="1,0,0,1">
</Border>
<Border Grid.Column="1" BorderThickness="0,1,1,1" BorderBrush="LightGray" CornerRadius="0,1,1,0">
<ToggleButton Style="{StaticResource ComboxStyleBtn}" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press"></ToggleButton>
</Border>
<Popup IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" x:Name="Popup" Focusable="False" AllowsTransparency="True" PopupAnimation="Slide">
<Border CornerRadius="1" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}" x:Name="DropDown" SnapsToDevicePixels="True">
<Border.Effect>
<DropShadowEffect Color="Black" BlurRadius="2" ShadowDepth="0" Opacity="0.5"/>
</Border.Effect>
<ScrollViewer Margin="4,6,4,6" Style="{DynamicResource ScrollViewerStyle}" MaxHeight="{TemplateBinding MaxDropDownHeight}" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
<!-- StackPanel 用于显示子级,方法是将 IsItemsHost 设置为 True -->
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" Background="White"/>
</ScrollViewer>
</Border>
</Popup>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
@ -375,21 +338,35 @@
<StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal">
<Label Content="请选择烘房:" VerticalContentAlignment="Center" FontSize="16" Margin="20,0,0,0"/>
<ComboBox x:Name="comboDryRoomInfo" Width="200" VerticalContentAlignment="Center" SelectionChanged="comboDryRoomInfo_SelectionChanged"></ComboBox>
<ComboBox x:Name="comboDryRoomInfo" Width="200" Style="{StaticResource ComboBoxStyle}" VerticalContentAlignment="Center" SelectionChanged="comboDryRoomInfo_SelectionChanged"></ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="10,0,0,0">
<Label Content="当前温度:" VerticalContentAlignment="Center" FontSize="16"/>
<Label x:Name="lbCurrTemperature" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
<Label x:Name="lbCurrTemperature" Width="60" VerticalContentAlignment="Center" FontSize="24"
Foreground="#1A68CA"></Label>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Content="当前压强:" VerticalContentAlignment="Center" FontSize="16"/>
<Label x:Name="lbCurrPressure" Width="40" VerticalContentAlignment="Center" FontSize="16"></Label>
<Label Content="当前湿度:" VerticalContentAlignment="Center" FontSize="16"/>
<Label x:Name="lbCurrHumilly" Width="60" VerticalContentAlignment="Center" FontSize="24"
Foreground="#1A68CA"></Label>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Button
x:Name="btnRefrsh"
Width="100"
Height="40"
Margin="60,0,0,0"
Background="#2F82E7"
Click="btnRefrsh_Click"
Content="刷新"
FontSize="20"
Foreground="White"
IsCancel="True" />
</StackPanel>
</StackPanel>
<!--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 Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}" Margin="20,0,0,0">
</ListBox>
</Grid>
</UserControl>

@ -16,6 +16,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using XGL.Data.DBService;
using XGL.Tools;
using System.Timers;
namespace XGL.Views
{
@ -25,6 +26,9 @@ namespace XGL.Views
public partial class DryingRoomUC : UserControl
{
DringRoomService dringRoomService = new DringRoomService();
Timer timerDeciveState = new Timer();
string deviceCode = "";
public DryingRoomUC()
{
InitializeComponent();
@ -32,22 +36,76 @@ namespace XGL.Views
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
timerDeciveState.Start();
InitComBoboxData();
GetDringRoomData();
GetOutDringRoomData();
GetDeviceInfo();
}
private void GetDeviceInfo()
{
TimerDeciveState_Elapsed(null,null);
}
private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e)
{
DataTable dt = dringRoomService.GetTemperAndHumilly(deviceCode);
if (dt == null)
{
//使用Dispatcher来在UI线程上更新UI
this.Dispatcher.Invoke(
new Action(() =>
{
lbCurrTemperature.Content = "0";
lbCurrHumilly.Content = "0";
}
),
System.Windows.Threading.DispatcherPriority.Render);
}
else
{
//使用Dispatcher来在UI线程上更新UI
this.Dispatcher.Invoke(
new Action(() =>
{
lbCurrTemperature.Content = dt.Rows[0][0].ToString();
lbCurrHumilly.Content = dt.Rows[1][0].ToString();
}
),
System.Windows.Threading.DispatcherPriority.Render);
}
//if (dt.Rows[0][0].ToString() == "1")
//{
// this.Dispatcher.Invoke(
// new Action(() => { LbDeviceState.Background = Brushes.Green; }
// ),
// System.Windows.Threading.DispatcherPriority.Render);
//}
//else
//{
// this.Dispatcher.Invoke(
// new Action(() => { LbDeviceState.Background = Brushes.Red; }
// ),
// System.Windows.Threading.DispatcherPriority.Render);
//}
}
private void GetDringRoomData()
{
DringRoomListBox.ItemsSource = null;
DringRoomListBox.Items.Clear();
DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString(),1);
DataTable dt = dringRoomService.GetDringRoomData(deviceCode, 1);
if (dt == null)
{
return;
}
int index = 0;
int i = 0;
foreach (DataRow item in dt.Rows)
@ -59,24 +117,27 @@ namespace XGL.Views
string inTime = item["update_time"].ToString();
TimeSpan ts;
ts = DateTime.Now - Convert.ToDateTime(inTime);
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);
DringRoomListBox.Items.Add(uc);
}
//DringRoomListBox.ItemsSource = null;
//DringRoomListBox.Items.Clear();
//DringRoomListBox.ItemsSource = dt.DefaultView;
}
private void GetOutDringRoomData()
{
DringRoomOuterListBox.ItemsSource = null;
DringRoomOuterListBox.Items.Clear();
DataTable dt = dringRoomService.GetDringRoomData(comboDryRoomInfo.SelectedValue.ToString(),0);
DataTable dt = dringRoomService.GetDringRoomData(deviceCode, 0);
if (dt == null)
{
return;
@ -108,7 +169,7 @@ namespace XGL.Views
private void InitComBoboxData()
{
DataTable dt = dringRoomService.GetDringRoomInfo();
DataTable dt = dringRoomService.GetDringRoomInfo(Utils.GetAppSetting("DryingHouseList"));
if (dt == null)
{
CustomMessageBox.Show("没有维护设备信息,请维护设备后重试!", CustomMessageBoxIcon.Warning);
@ -129,8 +190,16 @@ namespace XGL.Views
private void comboDryRoomInfo_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
string hfCode = comboDryRoomInfo.SelectedValue.ToString();//.Text;
deviceCode = hfCode;
GetDringRoomData();
GetOutDringRoomData();
GetDeviceInfo();
}
private void btnRefrsh_Click(object sender, RoutedEventArgs e)
{
GetDringRoomData();
GetOutDringRoomData();
}
}
public class EquipmentMode

@ -31,13 +31,13 @@
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="24" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn Header=" 序号" Width="50" 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>

@ -31,13 +31,13 @@
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="24" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn Header=" 序号" Width="50" 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>
@ -45,8 +45,8 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="250" Header="操作" />
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin}"/>
<DataGridTextColumn Width="250" Header="结束时间" Binding="{Binding beout}"/>
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Width="250" Header="结束时间" Binding="{Binding beout, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_code}"/>
<DataGridTextColumn Width="250" Header="工单数量" Binding="{Binding car_num}"/>
<DataGridTextColumn Width="*" Header="人员" Binding="{Binding create_by}"/>

@ -56,12 +56,12 @@
Margin="25,0"
LoadingRow="DataGrid_LoadingRow"
HeadersVisibility="Column"
AutoGenerateColumns="False">
AutoGenerateColumns="False" FontSize="20" IsReadOnly="True" CanUserAddRows="False" VerticalContentAlignment="Center" HorizontalContentAlignment="Center">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="24" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
@ -74,7 +74,7 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="250" Header="物料编码" Binding="{Binding material_code}"/>
<DataGridTextColumn Width="250" Header="物料编码" Binding="{Binding material_code}" />
<DataGridTextColumn Width="250" Header="物料名称" Binding="{Binding material_name}" />
<DataGridTextColumn Width="250" Header="规格型号" Binding="{Binding product_spc}" />
<DataGridTextColumn Width="250" Header="数量" Binding="{Binding quantity}" />

@ -12,24 +12,22 @@
mc:Ignorable="d" Loaded="UCOperator_Loaded">
<UserControl.Resources>
<convert:MyValueConverter x:Key="MyConverter"/>
<convert:OrderInOutConverter x:Key="TaskCodeConverter"/>
<convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
<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>
</UserControl.Resources>
<Grid Background="#F2F3F5"
Width="1920"
Height="800"
Margin="0">
<Grid Background="#F2F3F5" >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="270" />
<RowDefinition Height="80" />
<RowDefinition Height="330" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="220" />
@ -126,7 +124,7 @@
Height="90" Visibility="Collapsed">
<Button
Width="170"
Height="80"
Height="60"
Margin="25,5"
HorizontalAlignment="Left"
VerticalAlignment="Center"
@ -142,15 +140,16 @@
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="1"
Height="90" Visibility="Collapsed">
Grid.Column="6"
Height="90" Visibility="Visible">
<Button
x:Name="btnComplete"
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="#2B7EE6">
Background="#2B7EE6" Click="btnComplete_Click">
<Button.Content>
<TextBlock
VerticalAlignment="Center"
@ -166,7 +165,7 @@
Height="90" Visibility="Collapsed">
<Button
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -186,7 +185,7 @@
Height="90" Visibility="Collapsed">
<Button
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -208,7 +207,7 @@
x:Name="btnPause"
Click="btnPause_Click"
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -228,7 +227,7 @@
Height="90">
<Button x:Name="btnRecover"
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -248,7 +247,7 @@
Height="90">
<Button
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -269,7 +268,7 @@
Height="90">
<Button
Width="170"
Height="80"
Height="60"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@ -291,7 +290,7 @@
Height="90">
<Button
Width="170"
Height="80"
Height="60"
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Center"
@ -305,51 +304,78 @@
Text="查看SOP" />
</Button.Content>
</Button>
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="5"
Width="220"
Height="90">
<Button
x:Name="btnRefresh"
Grid.Row="1"
Grid.Column="5"
Width="170"
Height="60"
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="btnRefresh_Click" Content="刷新"></Button>
</StackPanel>
<DataGrid
x:Name="dgWorkOrderInfo"
Grid.Row="2"
Grid.ColumnSpan="9"
Width="1870"
Height="220"
Margin="0,20"
LoadingRow="dgWorkOrderInfo_LoadingRow"
HeadersVisibility="Column"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Center"
VerticalAlignment="Top"
AutoGenerateColumns="False">
<DataGrid.ColumnHeaderStyle>
MinWidth="1000"
MinHeight="340"
Margin="20,20"
LoadingRow="dgWorkOrderInfo_LoadingRow"
HeadersVisibility="Column"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Left"
VerticalAlignment="Top" IsReadOnly="True"
AutoGenerateColumns="False" CanUserAddRows="False">
<DataGrid.ColumnHeaderStyle >
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="24" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="160" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn Header=" 序号" Width="50" 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="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Hidden"/>
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_code}" />
<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>
<DataGridTextColumn Width="250" Header="产品名称" Binding="{Binding product_name}" />
<DataGridTextColumn Width="250" Header="产品型号" Binding="{Binding product_code}" />
<DataGridTextColumn Width="250" Header="工单数量" Binding="{Binding car_num}" />
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin}" />
<DataGridTextColumn Width="*" Header="工单状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
<DataGridTextColumn Width="50" Header="数量" Binding="{Binding car_num}" />
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="60" Header="状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
<!--<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{Binding status, Converter={StaticResource SyncFlagColorConvert}}" />
</Style>
</DataGridTextColumn.ElementStyle>-->
</DataGridTextColumn>
<DataGridTextColumn Width="70" Header="完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="250" Header="流转码" Binding="{Binding work_batch_code}" />
<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>
</DataGrid.Columns>
</DataGrid>
@ -431,8 +457,8 @@
<Grid
Grid.Row="4"
Grid.ColumnSpan="9"
Width="1920"
Height="330"
MinHeight="330"
Margin="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
@ -454,7 +480,7 @@
Grid.RowSpan="5"
Grid.Column="0"
Grid.ColumnSpan="9"
Width="1920"
Height="800" />
MinWidth="1000"
MinHeight="340"/>
</Grid>
</UserControl>

@ -102,9 +102,9 @@ namespace XGL.Views
try
{
List<FoamingMacModel> orderList = new List<FoamingMacModel>();
//modelWareHouse = new List<WorkOrder>();
//userDbWareHouse = new DBService();
userDbWareHouse = new DBService();
DataTable dt = formingMachineService.GetFormingMachineInfo(deviceCode);
if (dt == null) return;
foreach (DataRow i in dt.Rows)
@ -116,14 +116,18 @@ namespace XGL.Views
order.product_code = i["product_code"].ToString();
order.car_num = Convert.ToInt32(i["car_num"].ToString());
order.begin = Convert.ToDateTime(i["begin"].ToString());
order.begin = Convert.ToDateTime(i["begin"].ToString());
order.status = i["status"].ToString();
order.process_id = i["route_code"].ToString();
order.work_batch_code = i["work_batch_code"].ToString();
order.attr1 = i["attr1"].ToString();
order.taskcode = i["taskcode"].ToString();
order.rfid = i["rfid"].ToString();
orderList.Add(order);
}
this.dgWorkOrderInfo.ItemsSource = null;
this.dgWorkOrderInfo.ItemsSource = orderList;
this.dgWorkOrderInfo.ItemsSource = orderList;//dt.DefaultView;
}
catch (Exception ex)
{
@ -185,6 +189,7 @@ namespace XGL.Views
private void Flow_Click(object sender, RoutedEventArgs e)
{
var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
if (selectedRow == null) return;
var workordercode = selectedRow.workorder_code;
DataTable dt = userDbWareHouse.GetFlowInfo(workordercode);
FlowInfoWin flowInfoWin = new FlowInfoWin(dt);
@ -199,7 +204,8 @@ namespace XGL.Views
private void Material_Click(object sender, RoutedEventArgs e)
{
var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
var processid = selectedRow.process_id;
if (selectedRow == null) return;
var processid = selectedRow.workorder_code;
DataTable dt = userDbWareHouse.GetMaterialInfo(processid);
LanJu_Material sopInfoWin = new LanJu_Material(dt);
sopInfoWin.ShowDialog();
@ -213,10 +219,28 @@ namespace XGL.Views
private void Button_Click(object sender, RoutedEventArgs e)
{
var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
if (selectedRow == null) return;
var workordercode = selectedRow.workorder_code;
DataTable dt = userDbWareHouse.GetSOPInfo(workordercode);
SopInfoWin sopInfoWin = new SopInfoWin(dt);
sopInfoWin.ShowDialog();
}
}
private void btnRefresh_Click(object sender, RoutedEventArgs e)
{
GetWorkOrderInfo();
}
private void btnComplete_Click(object sender, RoutedEventArgs e)
{
if (dgWorkOrderInfo.SelectedItems.Count == 0)
{
CustomMessageBox.Show("请选择要完成的数据", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
return;
}
var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
ShouPeiWin shouPeiWin = new ShouPeiWin(selectedRow);
shouPeiWin.ShowDialog();
}
}
}

@ -133,16 +133,16 @@
x:Name="dgMaterialInfo"
Grid.Row="1"
Grid.Column="0"
Width="1500"
Height="309"
MinHeight="309"
Margin="25,0,0,0"
CellStyle="{StaticResource CustomCellStyle}"
LoadingRow="dgMaterialInfo_LoadingRow"
HeadersVisibility="Column"
LoadingRow="dgMaterialInfo_LoadingRow"
HeadersVisibility="Column"
AutoGenerateColumns="False"
FrozenColumnCount="1"
EnableColumnVirtualization="False"
ScrollViewer.HorizontalScrollBarVisibility="Visible">
ScrollViewer.HorizontalScrollBarVisibility="Visible" IsReadOnly="True" CanUserAddRows="False">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
@ -179,10 +179,10 @@
<DataGridTextColumn Width="300" Header="完成时间" />
</DataGrid.Columns>-->
</DataGrid>
<Button Grid.Row="1" Grid.Column="1" Click="btnStartOrders_Click">
<Button Grid.Row="1" Grid.Column="1" Width="250" Height="250" Click="btnStartOrders_Click">
<Button.Template>
<ControlTemplate>
<Image Width="250" Height="250" Margin="0,0,0,0" Source="/Resources/startOrder.jpg" />
<Image Margin="0,0,0,0" Source="/Resources/startOrder.png" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
</ControlTemplate>
</Button.Template>
</Button>
@ -229,8 +229,8 @@
<!-- Foreground="Black" FontWeight="Bold"-->
<DataGrid
x:Name="WorkOrder"
Width="2490"
Height="309"
Width="1920"
MinHeight="309"
Margin="25,0,0,0"
HorizontalAlignment="Left"
AutoGenerateColumns="False"
@ -240,7 +240,7 @@
HeadersVisibility="Column"
IsReadOnly="True"
SelectionChanged="WorkOrder_SelectionChanged"
FontSize="24">
FontSize="24" CanUserAddRows="False">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
@ -307,15 +307,15 @@
Header="料罐编码" />
<DataGridTextColumn
Width="*"
Width="80"
Binding="{Binding prod_line_code}"
Header="成型机" />
Header="设备" />
<DataGridTextColumn
Width="*"
Width="80"
Binding="{Binding status,Converter={StaticResource MyConverter}}"
Header="工单状态" />
<DataGridTextColumn
Width="*"
Width="80"
Binding="{Binding sync_flag,Converter={StaticResource SyncFlagConverter}}"
Header="同步状态" >
<DataGridTextColumn.ElementStyle>
@ -326,14 +326,14 @@
</DataGridTextColumn>
<DataGridTextColumn
Width="200"
Binding="{Binding plan_time}"
Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
Header="工单时间" />
<DataGridTextColumn
Width="250"
Binding="{Binding id}"
Header="计划编码" />
<DataGridTextColumn
Width="*"
Width="50"
Binding="{Binding shift_desc}"
Header="班次" />
<DataGridTemplateColumn Width="350" Header="操作">

@ -345,6 +345,7 @@ namespace XGL.Views
try
{
var selectedRow = WorkOrder.SelectedItem as WetMaterialModel;
if (selectedRow == null) return;
var processid = selectedRow.workorder_code;
DataTable dt = userDbWareHouse.GetMaterialInfo(processid);
this.dgMaterialInfo.ItemsSource = dt.DefaultView;

@ -0,0 +1,42 @@
<Window x:Class="XGL.Views.ShouPeiWin"
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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:XGL.Views"
mc:Ignorable="d"
Title="ShouPeiWin" Height="200" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None" Closing="Window_Closing">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Label Grid.Row="0" FontSize="18" Content="请输入筛盘车号码" VerticalContentAlignment="Center"/>
<TextBox x:Name="txtBarcode" Grid.Row="1" FontSize="18" Width="300" Height="45" VerticalContentAlignment="Center" TextChanged="txtBarcode_TextChanged"/>
<Label x:Name="lbMsg" Grid.Row="2" Foreground="Red" VerticalContentAlignment="Center" FontSize="18"/>
<StackPanel Grid.Row="3" VerticalAlignment="Center" Orientation="Horizontal">
<Button
x:Name="btnOK"
Width="100"
Height="40"
Margin="60,0,0,0"
Background="#2F82E7"
Content="确定"
FontSize="20"
Foreground="White"
IsCancel="True" Click="btnOK_Click" />
<Button
x:Name="btnCancel"
Width="100"
Height="40"
Margin="60,0,0,0"
Background="#2F82E7"
Content="取消"
FontSize="20"
Foreground="White"
IsCancel="True" Click="btnCancel_Click"/>
</StackPanel>
</Grid>
</Window>

@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using XGL.Data.DBService;
using XGL.Models.Model.FoamingMac;
namespace XGL.Views
{
/// <summary>
/// ShouPeiWin.xaml 的交互逻辑
/// </summary>
public partial class ShouPeiWin : Window
{
FormingMachineService formingMachineService = new FormingMachineService();
FoamingMacModel _foamingMacModel;
public ShouPeiWin()
{
InitializeComponent();
}
public ShouPeiWin(FoamingMacModel foamingMac)
{
InitializeComponent();
_foamingMacModel = foamingMac;
}
private void btnOK_Click(object sender, RoutedEventArgs e)
{
this.lbMsg.Content = "";
if (string.IsNullOrEmpty(this.txtBarcode.Text))
{
this.lbMsg.Content = "条码号不能为空!";
return;
}
else if (formingMachineService.InsertData(_foamingMacModel))
{
//this.Close();
}
else
{
this.lbMsg.Content = "完成失败!";
}
}
private void btnCancel_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void txtBarcode_TextChanged(object sender, TextChangedEventArgs e)
{
this.lbMsg.Content = "";
}
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
if (this.DialogResult == false)
{
e.Cancel = true;
}
}
}
}

@ -162,6 +162,9 @@
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity">
<HintPath>..\Libs\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
@ -170,6 +173,9 @@
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="Telerik.Windows.Controls">
<HintPath>..\Libs\Telerik.Windows.Controls.dll</HintPath>
</Reference>
<Reference Include="Thrift">
<HintPath>..\packages\Thrift.dll</HintPath>
</Reference>
@ -177,6 +183,9 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="WindowsFormsIntegration" />
<Reference Include="WpfCustomControlLibrary1">
<HintPath>..\Libs\WpfCustomControlLibrary1.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
@ -241,6 +250,7 @@
<Compile Include="Tools\ModuleUC.xaml.cs">
<DependentUpon>ModuleUC.xaml</DependentUpon>
</Compile>
<Compile Include="Tools\OrderInOutConverter.cs" />
<Compile Include="Tools\SyncFlagColorConverter.cs" />
<Compile Include="Tools\NetStatusToColorConvert.cs" />
<Compile Include="Tools\MyValueConverter.cs" />
@ -323,6 +333,9 @@
<Compile Include="Views\DryingRoomUC.xaml.cs">
<DependentUpon>DryingRoomUC.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ShouPeiWin.xaml.cs">
<DependentUpon>ShouPeiWin.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SopInfoWin.xaml.cs">
<DependentUpon>SopInfoWin.xaml</DependentUpon>
</Compile>
@ -549,6 +562,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ShouPeiWin.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\SopInfoWin.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -1000,8 +1017,8 @@
<Resource Include="Resources\Success.png" />
<Resource Include="Resources\logo.png" />
<Resource Include="Resources\topblank.png" />
<Resource Include="Resources\startOrder.jpg" />
<Resource Include="Resources\zxh.png" />
<Resource Include="Resources\startOrder.png" />
<Content Include="snap7.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

@ -1,105 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="XGL.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="ITE.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<appSettings>
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房-->
<add key="ClientMode" value="2" />
<!--上位机类型 1 上件 2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->
<add key="LineCode" value="101" />
<add key="plcIp" value="127.0.0.1" />
<add key="plcIp2" value="127.0.0.1" />
<add key="plcport" value="60001" />
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="XGL.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="ITE.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<appSettings>
<!--车间编码-->
<add key="SiteCode" value="1000" />
<!--设备编码-->
<add key="DeviceCode" value="C1" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房-->
<add key="ClientMode" value="2" />
<add key="DryingHouseList" value="H1,H2,H3" />
<!--上位机类型 1 上件 2 排空区 0下件区-->
<add key="PostType" value="1" />
<!--线体编码-->
<add key="LineCode" value="101" />
<add key="plcIp" value="127.0.0.1" />
<add key="plcIp2" value="127.0.0.1" />
<add key="plcport" value="60001" />
<add key="LineId" value="1" />
<!--看板刷新时间 单位秒-->
<add key="BoardRefresh" value="6000" />
<!--下件界面刷新时间 单位秒-->
<add key="TakeOffRefresh" value="10" />
<!--排空区刷新时间 单位秒-->
<add key="EmptyRefresh" value="10" />
<!--获取设备状态间隔时间 单位秒-->
<add key="GetDeviceStateInterval" value="30000" />
<add key="thriftIp" value="192.168.3.150" />
<!--上件点发车thrift端口 7911 ,7912-->
<add key="thriftPort" value="7921" />
<!--出库点thrift端口-->
<add key="thriftBoxPort" value="7915" />
<!--FormBoardthrift端口-->
<add key="FormBoardThriftPort" value="7931" />
<!--物料同步接口地址-->
<add key="WCSMaterialSyncAddress" value="http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync"/>
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<applicationSettings>
<XGL.Properties.Settings>
<setting name="XGL_SendMailAndFile_InterfacesServiceImplService" serializeAs="String">
<value>http://192.168.1.125:8080/webservice/interfacesService</value>
</setting>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="XGL_AutoUpdate1_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="HFXXDR_AutoUpdate1_WebService" serializeAs="String">
<value>http://localhost:55277/WebService.asmx</value>
</setting>
</XGL.Properties.Settings>
<ITE.Properties.Settings>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
</ITE.Properties.Settings>
</applicationSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.3.11" newVersion="1.3.3.11" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<add key="LineId" value="1" />
<!--看板刷新时间 单位秒-->
<add key="BoardRefresh" value="6000" />
<!--下件界面刷新时间 单位秒-->
<add key="TakeOffRefresh" value="10" />
<!--排空区刷新时间 单位秒-->
<add key="EmptyRefresh" value="10" />
<!--获取设备状态间隔时间 单位秒-->
<add key="GetDeviceStateInterval" value="30000" />
<!--获取设备温湿度间隔时间 单位秒-->
<add key="GetDeviceTempAndHumInterval" value="15000" />
<add key="thriftIp" value="192.168.3.150" />
<!--上件点发车thrift端口 7911 ,7912-->
<add key="thriftPort" value="7921" />
<!--出库点thrift端口-->
<add key="thriftBoxPort" value="7915" />
<!--FormBoardthrift端口-->
<add key="FormBoardThriftPort" value="7931" />
<!--物料同步接口地址-->
<add key="WCSMaterialSyncAddress" value="http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync"/>
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<applicationSettings>
<XGL.Properties.Settings>
<setting name="XGL_SendMailAndFile_InterfacesServiceImplService" serializeAs="String">
<value>http://192.168.1.125:8080/webservice/interfacesService</value>
</setting>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="XGL_AutoUpdate1_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
<setting name="HFXXDR_AutoUpdate1_WebService" serializeAs="String">
<value>http://localhost:55277/WebService.asmx</value>
</setting>
</XGL.Properties.Settings>
<ITE.Properties.Settings>
<setting name="XGL_AutoUpdate_WebService" serializeAs="String">
<value>http://10.142.236.11:81/WebService.asmx</value>
</setting>
</ITE.Properties.Settings>
</applicationSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.3.11" newVersion="1.3.3.11" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "832B0933F9C91C190825FC376F3177C85C0F3074DBC62B719E66E660B2252330"
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96FE6E60B8351FE9881A94429F41129A75A6575DC95F871E2ECB804C101688DC"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -147,7 +147,15 @@ namespace XGL.FormItem {
#line hidden
#line 549 "..\..\..\..\FormItem\Main.xaml"
#line 557 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label lbVersion;
#line default
#line hidden
#line 565 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnZXH;
@ -155,7 +163,7 @@ namespace XGL.FormItem {
#line hidden
#line 553 "..\..\..\..\FormItem\Main.xaml"
#line 569 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnFault;
@ -246,18 +254,21 @@ namespace XGL.FormItem {
this.btnText = ((System.Windows.Documents.Run)(target));
return;
case 15:
this.lbVersion = ((System.Windows.Controls.Label)(target));
return;
case 16:
this.btnZXH = ((System.Windows.Controls.Button)(target));
#line 549 "..\..\..\..\FormItem\Main.xaml"
#line 565 "..\..\..\..\FormItem\Main.xaml"
this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
#line default
#line hidden
return;
case 16:
case 17:
this.btnFault = ((System.Windows.Controls.Button)(target));
#line 558 "..\..\..\..\FormItem\Main.xaml"
#line 574 "..\..\..\..\FormItem\Main.xaml"
this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
#line default

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "832B0933F9C91C190825FC376F3177C85C0F3074DBC62B719E66E660B2252330"
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96FE6E60B8351FE9881A94429F41129A75A6575DC95F871E2ECB804C101688DC"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -147,7 +147,15 @@ namespace XGL.FormItem {
#line hidden
#line 549 "..\..\..\..\FormItem\Main.xaml"
#line 557 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label lbVersion;
#line default
#line hidden
#line 565 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnZXH;
@ -155,7 +163,7 @@ namespace XGL.FormItem {
#line hidden
#line 553 "..\..\..\..\FormItem\Main.xaml"
#line 569 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnFault;
@ -246,18 +254,21 @@ namespace XGL.FormItem {
this.btnText = ((System.Windows.Documents.Run)(target));
return;
case 15:
this.lbVersion = ((System.Windows.Controls.Label)(target));
return;
case 16:
this.btnZXH = ((System.Windows.Controls.Button)(target));
#line 549 "..\..\..\..\FormItem\Main.xaml"
#line 565 "..\..\..\..\FormItem\Main.xaml"
this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
#line default
#line hidden
return;
case 16:
case 17:
this.btnFault = ((System.Windows.Controls.Button)(target));
#line 558 "..\..\..\..\FormItem\Main.xaml"
#line 574 "..\..\..\..\FormItem\Main.xaml"
this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
#line default

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8ECB723432748A6F9BD594B756C48D7681FBD6EC9DA90326450A8EC5714428F"
#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3A9951444C1DB0B5BA3B58A6798A91E51C4C7B8EEE68E9E2CABC5710A6105FF8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -34,6 +34,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using WpfCustomControlLibrary1;
namespace XGL {
@ -45,7 +46,7 @@ namespace XGL {
public partial class LoginPage : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 35 "..\..\..\LoginPage.xaml"
#line 36 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox username;
@ -53,7 +54,7 @@ namespace XGL {
#line hidden
#line 36 "..\..\..\LoginPage.xaml"
#line 37 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.PasswordBox userpwd;
@ -61,7 +62,7 @@ namespace XGL {
#line hidden
#line 39 "..\..\..\LoginPage.xaml"
#line 40 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnlogin;
@ -69,7 +70,7 @@ namespace XGL {
#line hidden
#line 40 "..\..\..\LoginPage.xaml"
#line 41 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnloginout;
@ -77,7 +78,7 @@ namespace XGL {
#line hidden
#line 41 "..\..\..\LoginPage.xaml"
#line 42 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox rememberpwd;
@ -85,15 +86,15 @@ namespace XGL {
#line hidden
#line 45 "..\..\..\LoginPage.xaml"
#line 48 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal LoadingIndicators.WPF.LoadingIndicator dldh;
internal WpfCustomControlLibrary1.CustomControl1 dldh;
#line default
#line hidden
#line 47 "..\..\..\LoginPage.xaml"
#line 49 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label zzdl;
@ -132,13 +133,13 @@ namespace XGL {
{
case 1:
#line 10 "..\..\..\LoginPage.xaml"
#line 11 "..\..\..\LoginPage.xaml"
((XGL.LoginPage)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_MouseLeftButtonDown);
#line default
#line hidden
#line 10 "..\..\..\LoginPage.xaml"
#line 11 "..\..\..\LoginPage.xaml"
((XGL.LoginPage)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
@ -153,7 +154,7 @@ namespace XGL {
case 4:
this.btnlogin = ((System.Windows.Controls.Button)(target));
#line 39 "..\..\..\LoginPage.xaml"
#line 40 "..\..\..\LoginPage.xaml"
this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
#line default
@ -162,7 +163,7 @@ namespace XGL {
case 5:
this.btnloginout = ((System.Windows.Controls.Button)(target));
#line 40 "..\..\..\LoginPage.xaml"
#line 41 "..\..\..\LoginPage.xaml"
this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
#line default
@ -172,7 +173,7 @@ namespace XGL {
this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
return;
case 7:
this.dldh = ((LoadingIndicators.WPF.LoadingIndicator)(target));
this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
return;
case 8:
this.zzdl = ((System.Windows.Controls.Label)(target));

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8ECB723432748A6F9BD594B756C48D7681FBD6EC9DA90326450A8EC5714428F"
#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3A9951444C1DB0B5BA3B58A6798A91E51C4C7B8EEE68E9E2CABC5710A6105FF8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -34,6 +34,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using WpfCustomControlLibrary1;
namespace XGL {
@ -45,7 +46,7 @@ namespace XGL {
public partial class LoginPage : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 35 "..\..\..\LoginPage.xaml"
#line 36 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox username;
@ -53,7 +54,7 @@ namespace XGL {
#line hidden
#line 36 "..\..\..\LoginPage.xaml"
#line 37 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.PasswordBox userpwd;
@ -61,7 +62,7 @@ namespace XGL {
#line hidden
#line 39 "..\..\..\LoginPage.xaml"
#line 40 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnlogin;
@ -69,7 +70,7 @@ namespace XGL {
#line hidden
#line 40 "..\..\..\LoginPage.xaml"
#line 41 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnloginout;
@ -77,7 +78,7 @@ namespace XGL {
#line hidden
#line 41 "..\..\..\LoginPage.xaml"
#line 42 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox rememberpwd;
@ -85,15 +86,15 @@ namespace XGL {
#line hidden
#line 45 "..\..\..\LoginPage.xaml"
#line 48 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal LoadingIndicators.WPF.LoadingIndicator dldh;
internal WpfCustomControlLibrary1.CustomControl1 dldh;
#line default
#line hidden
#line 47 "..\..\..\LoginPage.xaml"
#line 49 "..\..\..\LoginPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label zzdl;
@ -132,13 +133,13 @@ namespace XGL {
{
case 1:
#line 10 "..\..\..\LoginPage.xaml"
#line 11 "..\..\..\LoginPage.xaml"
((XGL.LoginPage)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_MouseLeftButtonDown);
#line default
#line hidden
#line 10 "..\..\..\LoginPage.xaml"
#line 11 "..\..\..\LoginPage.xaml"
((XGL.LoginPage)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
@ -153,7 +154,7 @@ namespace XGL {
case 4:
this.btnlogin = ((System.Windows.Controls.Button)(target));
#line 39 "..\..\..\LoginPage.xaml"
#line 40 "..\..\..\LoginPage.xaml"
this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
#line default
@ -162,7 +163,7 @@ namespace XGL {
case 5:
this.btnloginout = ((System.Windows.Controls.Button)(target));
#line 40 "..\..\..\LoginPage.xaml"
#line 41 "..\..\..\LoginPage.xaml"
this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
#line default
@ -172,7 +173,7 @@ namespace XGL {
this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
return;
case 7:
this.dldh = ((LoadingIndicators.WPF.LoadingIndicator)(target));
this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
return;
case 8:
this.zzdl = ((System.Windows.Controls.Label)(target));

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A734146014090369F7C815DBE3432D497FFFDCD44CD3EDB950E7A73238C9FB39"
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A734146014090369F7C815DBE3432D497FFFDCD44CD3EDB950E7A73238C9FB39"
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0F630FE34B7BD37C2CEDBD08637C86F9F3DA587E00331C2922D20490DD20A7"
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C2D3123A650E8DBB1BAE4005F004874C2CC7F068FC45999660988B2520596F74"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0F630FE34B7BD37C2CEDBD08637C86F9F3DA587E00331C2922D20490DD20A7"
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C2D3123A650E8DBB1BAE4005F004874C2CC7F068FC45999660988B2520596F74"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Material.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B8840359D58CE383DAD96CB55AA9DF4F65609452F52BE399EF04E4C8118916AB"
#pragma checksum "..\..\..\..\Views\LanJu_Material.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8B389D0A45A21ADD24F64CDEE58A1F8058B88BF495C5EF4497FC12F03840792"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Material.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B8840359D58CE383DAD96CB55AA9DF4F65609452F52BE399EF04E4C8118916AB"
#pragma checksum "..\..\..\..\Views\LanJu_Material.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8B389D0A45A21ADD24F64CDEE58A1F8058B88BF495C5EF4497FC12F03840792"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4769597D71A43AFB7F82CC9C7EABE5D62204366E91E74E7E1CCA057583319EA4"
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "66CB1BC447836676E7929B60CAF1921F4955A78BDAD9D0442EE7AA2556D4FFB2"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -50,7 +50,15 @@ namespace XGL.Views {
#line hidden
#line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 146 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnComplete;
#line default
#line hidden
#line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnPause;
@ -58,7 +66,7 @@ namespace XGL.Views {
#line hidden
#line 229 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRecover;
@ -66,7 +74,15 @@ namespace XGL.Views {
#line hidden
#line 311 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
#line default
#line hidden
#line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
@ -74,7 +90,7 @@ namespace XGL.Views {
#line hidden
#line 444 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 470 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
@ -82,7 +98,7 @@ namespace XGL.Views {
#line hidden
#line 452 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 478 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window2;
@ -129,76 +145,94 @@ namespace XGL.Views {
#line hidden
return;
case 2:
this.btnPause = ((System.Windows.Controls.Button)(target));
this.btnComplete = ((System.Windows.Controls.Button)(target));
#line 209 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
#line 152 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click);
#line default
#line hidden
return;
case 3:
this.btnRecover = ((System.Windows.Controls.Button)(target));
this.btnPause = ((System.Windows.Controls.Button)(target));
#line 235 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
#line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
#line default
#line hidden
return;
case 4:
this.btnRecover = ((System.Windows.Controls.Button)(target));
#line 256 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
#line default
#line hidden
return;
case 5:
#line 277 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
return;
case 6:
#line 299 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default
#line hidden
return;
case 7:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 317 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line default
#line hidden
return;
case 8:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 371 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
#line hidden
return;
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 384 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line 338 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
#line hidden
return;
case 10:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
#line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
#line hidden
return;
case 11:
#line 410 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line default
#line hidden
return;
case 12:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
return;
case 13:
this.Window2 = ((System.Windows.Controls.ContentControl)(target));
return;
}

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4769597D71A43AFB7F82CC9C7EABE5D62204366E91E74E7E1CCA057583319EA4"
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "66CB1BC447836676E7929B60CAF1921F4955A78BDAD9D0442EE7AA2556D4FFB2"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -50,7 +50,15 @@ namespace XGL.Views {
#line hidden
#line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 146 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnComplete;
#line default
#line hidden
#line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnPause;
@ -58,7 +66,7 @@ namespace XGL.Views {
#line hidden
#line 229 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRecover;
@ -66,7 +74,15 @@ namespace XGL.Views {
#line hidden
#line 311 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
#line default
#line hidden
#line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
@ -74,7 +90,7 @@ namespace XGL.Views {
#line hidden
#line 444 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 470 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
@ -82,7 +98,7 @@ namespace XGL.Views {
#line hidden
#line 452 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 478 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window2;
@ -129,76 +145,94 @@ namespace XGL.Views {
#line hidden
return;
case 2:
this.btnPause = ((System.Windows.Controls.Button)(target));
this.btnComplete = ((System.Windows.Controls.Button)(target));
#line 209 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
#line 152 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click);
#line default
#line hidden
return;
case 3:
this.btnRecover = ((System.Windows.Controls.Button)(target));
this.btnPause = ((System.Windows.Controls.Button)(target));
#line 235 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
#line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
#line default
#line hidden
return;
case 4:
this.btnRecover = ((System.Windows.Controls.Button)(target));
#line 256 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
#line default
#line hidden
return;
case 5:
#line 277 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
#line hidden
return;
case 6:
#line 299 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default
#line hidden
return;
case 7:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 317 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line default
#line hidden
return;
case 8:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 371 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
#line hidden
return;
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 384 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line 338 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
#line hidden
return;
case 10:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
#line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
#line hidden
return;
case 11:
#line 410 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Complete_Click);
#line default
#line hidden
return;
case 12:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
return;
case 13:
this.Window2 = ((System.Windows.Controls.ContentControl)(target));
return;
}

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77CABBF885A9D1381971FDBA7D4DDF6E19DF188E7735A376E7D1A27836120D92"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DCC592BAB4424C33E32AD56372B2F872F5BE74F8861224F7381EB353482ECC3C"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save