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

优化成型机界面

Browse Source
master
zhaoaomin 2 years ago
parent fb40384450
commit accfac0f5b
82 changed files with 388 additions and 272 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

BIN
shangjian/.vs/BL/v17/HierarchyCache.v1.txt
View File

Binary file not shown.

6
shangjian/AutoUpdate/AutoUpdate.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AutoUpdate</RootNamespace>
<AssemblyName>AutoUpdate</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
@ -40,6 +40,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -49,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>B79830EB53749E3CA010339FCCAE937893ABE790</ManifestCertificateThumbprint>

6
shangjian/AutoUpdate/Properties/Resources.Designer.cs generated
Unescape Escape View File

@ -19,7 +19,7 @@ namespace AutoUpdate.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -47,8 +47,8 @@ namespace AutoUpdate.Properties {
}
/// <summary>
/// 使用此强类型资源类，为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {

4
shangjian/AutoUpdate/Properties/Settings.Designer.cs generated
Unescape Escape View File

@ -12,7 +12,7 @@ namespace AutoUpdate.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -26,7 +26,7 @@ namespace AutoUpdate.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
[global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WebService/AutoUpdate.asmx")]
[global::System.Configuration.DefaultSettingValueAttribute("http://192.168.0.66/WebService/AutoUpdate.asmx")]
public string AutoUpdate_autoUpdateVersion_WebService {
get {
return ((string)(this["AutoUpdate_autoUpdateVersion_WebService"]));

20
shangjian/AutoUpdate/Web References/autoUpdateVersion/Reference.cs
Unescape Escape View File

@ -14,16 +14,16 @@
#pragma warning disable 1591
namespace AutoUpdate.autoUpdateVersion {
using System;
using System.Web.Services;
using System.Diagnostics;
using System.Web.Services.Protocols;
using System;
using System.Xml.Serialization;
using System.ComponentModel;
using System.Web.Services.Protocols;
using System.Web.Services;
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Web.Services.WebServiceBindingAttribute(Name="AutoUpdateSoap", Namespace="http://tempuri.org/")]
@ -39,7 +39,7 @@ namespace AutoUpdate.autoUpdateVersion {
/// <remarks/>
public AutoUpdate() {
this.Url = global::AutoUpdate.Properties.Settings.Default.AutoUpdate_autoUpdateVersion_WebService;
this.Url = "http://localhost:800/WebService/AutoUpdate.asmx";
if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
this.UseDefaultCredentials = true;
this.useDefaultCredentialsSetExplicitly = false;
@ -184,11 +184,11 @@ namespace AutoUpdate.autoUpdateVersion {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
public delegate void ZipFileCompletedEventHandler(object sender, ZipFileCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ZipFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -210,15 +210,15 @@ namespace AutoUpdate.autoUpdateVersion {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
public delegate void deleteFileCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
public delegate void getFileVersionCompletedEventHandler(object sender, getFileVersionCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.2046.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class getFileVersionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

2
shangjian/AutoUpdate/app.config
Unescape Escape View File

@ -19,4 +19,4 @@
<appSettings>
<add key="FileNm" value="XGL.exe"/>
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

4
shangjian/AutoUpdate/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
Unescape Escape View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

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

Binary file not shown.

BIN
shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
shangjian/AutoUpdate/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.

BIN
shangjian/AutoUpdate/obj/x86/Debug/TempPE/Web References.autoUpdateVersion.Reference.cs.dll
View File

Binary file not shown.

26
shangjian/BL.sln
Unescape Escape View File

@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanJuControl", "LanJuContro
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanJuLib", "LanJuLib\LanJuLib.csproj", "{215B04E3-57B4-40B2-BA23-532DCEA86E1F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoUpdate", "AutoUpdate\AutoUpdate.csproj", "{341AD485-E4A2-4A2C-9E93-9D4E360D692C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -253,6 +255,30 @@ Global
{215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x64.Build.0 = Release|Any CPU
{215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x86.ActiveCfg = Release|Any CPU
{215B04E3-57B4-40B2-BA23-532DCEA86E1F}.Release|x86.Build.0 = Release|Any CPU
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Any CPU.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Any CPU.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM64.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|ARM64.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|Mixed Platforms.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x64.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x64.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x86.ActiveCfg = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Debug|x86.Build.0 = Debug|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Any CPU.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Any CPU.Build.0 = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM.Build.0 = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM64.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|ARM64.Build.0 = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Mixed Platforms.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|Mixed Platforms.Build.0 = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x64.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x64.Build.0 = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x86.ActiveCfg = Release|x86
{341AD485-E4A2-4A2C-9E93-9D4E360D692C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

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

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/CommonFunc.dll
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
View File

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll
View File

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/LanJuLib/bin/Debug/CommonFunc.dll
View File

Binary file not shown.

BIN
shangjian/LanJuLib/bin/Debug/CommonFunc.pdb
View File

Binary file not shown.

BIN
shangjian/LanJuLib/bin/Debug/XGL.Models.dll
View File

Binary file not shown.

BIN
shangjian/LanJuLib/bin/Debug/XGL.Models.pdb
View File

Binary file not shown.

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

Binary file not shown.

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

@ -19,12 +19,13 @@ namespace XGL.Data.DBService
/// <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,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
string sql = $@"SELECT DISTINCT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num,
isnull(plan_time,'1900-01-01 08:00:00') as plan_time,ord.status ,ord.route_code,ord.attr1,COUNT(*) OVER () AS totalCount
FROM pro_order_workorder ord
left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id
LEFT JOIN mes_material_transfer_result res on ord.workorder_id = res.OrderCode
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'; ";
where equipmentCode = '{devicecode}' and CONVERT(VARCHAR(10), res.update_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120); ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@ -61,9 +62,13 @@ where equipmentCode = '{devicecode}' and rfid_status = '1'; ";
/// <returns></returns>
public DataTable GetInOutHistoryList(string devicecode)
{
string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],isnull([beout],'1900-00-00') as [beout],ord.status,product_date,ord.create_time,create_by FROM [dbo].[mes_material_transfer_result] res
string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.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,plan_time ,res.update_time
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_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id
LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
where equipmentCode = '{devicecode}' and res.OrderCode is not null ORDER BY plan_time desc; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@ -82,9 +87,16 @@ where equipmentCode = '{devicecode}'; ";
public DataTable GetCompleteHistoryList(string devicecode)
{
//taskcode=1,当前机台完成，ord.status = 'w3'当前工单完成
string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res
// string sql = $@"SELECT workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-00-00') as [begin],beout,ord.status,product_date,ord.create_time FROM [dbo].[mes_material_transfer_result] res
//LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
//where res.taskcode = '1' and equipmentCode = '{devicecode}'; ";
string sql = $@"SELECT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.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,plan_time ,res.update_time
FROM [dbo].[mes_material_transfer_result] res
LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id
where res.taskcode = '1' and equipmentCode = '{devicecode}'; ";
left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id
LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
where res.taskcode = '0' and equipmentCode = 'C6' and res.OrderCode is not null ORDER BY plan_time; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs
Unescape Escape View File

@ -18,6 +18,8 @@ namespace XGL.Models.Model.FoamingMac
public int car_num { get; set; }
public DateTime? begin { get; set; }
public DateTime? beout { get; set; }
public DateTime? plan_time { get; set; }
public string update_time { get; set; }
public string status { get; set; }
public string product_date { get; set; }
@ -28,5 +30,7 @@ namespace XGL.Models.Model.FoamingMac
public string work_batch_code { get; set; }
public string taskcode { get; set; }
public string rfid { get; set; }
public string totalCount { get; set; }
}
}

BIN
shangjian/XGL.Model/bin/Debug/XGL.Models.dll
View File

Binary file not shown.

BIN
shangjian/XGL.Model/bin/Debug/XGL.Models.pdb
View File

Binary file not shown.

BIN
shangjian/XGL.Model/obj/Debug/XGL.Models.dll
View File

Binary file not shown.

BIN
shangjian/XGL.Model/obj/Debug/XGL.Models.pdb
View File

Binary file not shown.

15
shangjian/XGL/Views/LanJu_Complete.xaml
Unescape Escape View File

@ -4,10 +4,20 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:XGL.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:convert="clr-namespace:XGL.Tools"
Width="1920"
Height="330"
mc:Ignorable="d" Loaded="UserControl_Loaded">
<UserControl.Resources>
<Style x:Key="CustomCellStyle" TargetType="DataGridCell">
<Setter Property="Foreground" Value="Black" />
<Setter Property="TextBlock.TextAlignment" Value="Center" />
<Setter Property="TextBlock.FontSize" Value="22" />
</Style>
<convert:MyValueConverter x:Key="MyConverter"/>
<convert:OrderInOutConverter x:Key="TaskCodeConverter"/>
<convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
</UserControl.Resources>
<Viewbox Stretch="Fill">
<Canvas
Width="1920"
@ -24,7 +34,10 @@
Width="1870"
Height="220"
Margin="0"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Center"
LoadingRow="datagrid1_LoadingRow"
HeadersVisibility="Column"
VerticalAlignment="Top"
AutoGenerateColumns="False">
<DataGrid.ColumnHeaderStyle>

9
shangjian/XGL/Views/LanJu_Complete.xaml.cs
Unescape Escape View File

@ -57,8 +57,8 @@ namespace XGL.Views
order.product_code = i["product_code"].ToString();
order.car_num = Convert.ToInt32(i["car_num"].ToString());
order.product_date = i["product_date"].ToString();
order.create_by = i["create_by"].ToString();
order.product_date = i["update_time"].ToString();
//order.create_by = i["create_by"].ToString();
orderList.Add(order);
@ -70,5 +70,10 @@ namespace XGL.Views
LogHelper.instance.log.Error("获取完成记录信息时发生异常：" + ex.Message);
}
}
private void datagrid1_LoadingRow(object sender, DataGridRowEventArgs e)
{
e.Row.Header = (e.Row.GetIndex() + 1).ToString();
}
}
}

31
shangjian/XGL/Views/LanJu_InOut.xaml
Unescape Escape View File

@ -4,9 +4,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:XGL.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:convert="clr-namespace:XGL.Tools"
Width="1920"
Height="330"
MinHeight="330"
mc:Ignorable="d" Loaded="UserControl_Loaded">
<UserControl.Resources>
<Style x:Key="CustomCellStyle" TargetType="DataGridCell">
@ -14,22 +14,25 @@
<Setter Property="TextBlock.TextAlignment" Value="Center" />
<Setter Property="TextBlock.FontSize" Value="22" />
</Style>
<convert:MyValueConverter x:Key="MyConverter"/>
<convert:OrderInOutConverter x:Key="TaskCodeConverter"/>
<convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
</UserControl.Resources>
<Viewbox Stretch="Fill">
<Canvas
Width="1920"
Height="330"
MinHeight="330"
Background="#F2F3F5">
<Grid
Width="1920"
Height="330"
Height="350"
Margin="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<DataGrid
x:Name="dgInOutRecord"
Width="1870"
Height="220"
MinHeight="330"
Margin="0"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Center"
@ -49,7 +52,7 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="50" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn Header=" 序号" Width="70" 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>
@ -57,11 +60,23 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn Width="250" Header="操作" />-->
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<!--<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="*" Header="工单/SFC" Binding="{Binding workorder_code}"/>
<DataGridTextColumn Width="250" Header="工单数量" Binding="{Binding car_num}"/>
<DataGridTextColumn Width="250" Header="人员" Binding="{Binding create_by}"/>
<DataGridTextColumn Width="250" Header="人员" Binding="{Binding create_by}"/>-->
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
<DataGridTextColumn Width="300" 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="80" Header="数量" Binding="{Binding car_num}" />
<DataGridTextColumn Width="250" Header="完成时间" Binding="{Binding update_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="60" Header="状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
</DataGridTextColumn>
<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />
<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>
</DataGrid.Columns>
</DataGrid>
</Grid>

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

@ -56,9 +56,15 @@ namespace XGL.Views
order.begin = Convert.ToDateTime(i["begin"].ToString());
//order.beout = Convert.ToDateTime(i["beout"].ToString());
order.product_code = i["product_code"].ToString();
order.product_name = i["product_name"].ToString();
order.car_num = Convert.ToInt32(i["car_num"].ToString());
order.product_date = i["product_date"].ToString();
order.create_by = i["create_by"].ToString();
order.product_date = i["plan_time"].ToString();
order.update_time = i["update_time"].ToString();
order.status = i["status"].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);

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

@ -138,7 +138,7 @@
</Button.Content>
</Button>
</StackPanel>
<StackPanel
<!--<StackPanel
Grid.Row="0"
Grid.Column="6"
Height="90" Visibility="Visible">
@ -158,7 +158,7 @@
Text="完成" />
</Button.Content>
</Button>
</StackPanel>
</StackPanel>-->
<StackPanel
Grid.Row="0"
Grid.Column="2"
@ -334,7 +334,8 @@
Grid.ColumnSpan="9"
MinWidth="1000"
MinHeight="340"
Margin="20,20"
MaxHeight="400"
Margin="20,0,0,5"
LoadingRow="dgWorkOrderInfo_LoadingRow"
HeadersVisibility="Column"
CellStyle="{StaticResource CustomCellStyle}"
@ -360,11 +361,11 @@
</DataGridTemplateColumn>
<DataGridTextColumn Width="250" Header="工单/SFC" Binding="{Binding workorder_id}" Visibility="Collapsed"/>
<DataGridTextColumn Width="300" Header="工单/SFC" Binding="{Binding workorder_code}" />
<DataGridTextColumn Width="120" Header="RFID" Binding="{Binding rfid}"/>
<!--<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="50" Header="数量" Binding="{Binding car_num}" />
<DataGridTextColumn Width="250" Header="开始时间" Binding="{Binding begin, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="100" Header="数量" Binding="{Binding car_num}" />
<DataGridTextColumn Width="250" Header="计划时间" Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="60" Header="状态" Binding="{Binding status,Converter={StaticResource MyConverter}}" >
<!--<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
@ -372,9 +373,11 @@
</Style>
</DataGridTextColumn.ElementStyle>-->
</DataGridTextColumn>
<DataGridTextColumn Width="70" Header="完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />
<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>
<DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
<DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />
<!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
<!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
</DataGrid.Columns>
</DataGrid>
@ -384,7 +387,7 @@
Grid.ColumnSpan="5"
Width="1000"
Height="69"
Margin="25,10,0,0"
Margin="25,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Orientation="Horizontal">
@ -401,7 +404,7 @@
FontSize="28"
Text="出入记录" />
</Button>
<Button
<!--<Button
Width="196"
Height="69"
HorizontalAlignment="Left"
@ -413,7 +416,7 @@
VerticalAlignment="Center"
FontSize="28"
Text="完成记录" />
</Button>
</Button>-->
<!--<Button
Width="196"
Height="69"
@ -457,30 +460,25 @@
<Grid
Grid.Row="3"
Grid.ColumnSpan="9"
MinHeight="330"
Margin="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="407*" />
<ColumnDefinition Width="1513*" />
</Grid.ColumnDefinitions>
VerticalAlignment="Top">
<ContentControl
x:Name="Window1"
Grid.ColumnSpan="2"
Width="1920"
Height="330" />
/>
</Grid>
<ContentControl
<!--<ContentControl
x:Name="Window2"
Grid.Row="0"
Grid.RowSpan="5"
Grid.Column="0"
Grid.ColumnSpan="9"
MinWidth="1000"
MinHeight="340"/>
MinHeight="340"/>-->
</Grid>
</UserControl>

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

@ -116,13 +116,11 @@ 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.plan_time = Convert.ToDateTime(i["plan_time"].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();
order.totalCount = i["totalCount"].ToString();
orderList.Add(order);
}

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

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

@ -1,2 +1,62 @@

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

11
shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09"
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC3C45B2997CE7CC01F6E19A4E0072D8F8E942927CECBE857517FB0182DEF4E0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using XGL.Tools;
using XGL.Views;
@ -42,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 23 "..\..\..\..\Views\LanJu_Complete.xaml"
#line 33 "..\..\..\..\Views\LanJu_Complete.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid datagrid1;
@ -89,6 +90,12 @@ namespace XGL.Views {
return;
case 2:
this.datagrid1 = ((System.Windows.Controls.DataGrid)(target));
#line 39 "..\..\..\..\Views\LanJu_Complete.xaml"
this.datagrid1.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.datagrid1_LoadingRow);
#line default
#line hidden
return;
}
this._contentLoaded = true;

11
shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABF34BE1429613802D6E785DDC9CA93825958E44ED1AA3C6450B8D631140FD09"
#pragma checksum "..\..\..\..\Views\LanJu_Complete.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC3C45B2997CE7CC01F6E19A4E0072D8F8E942927CECBE857517FB0182DEF4E0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using XGL.Tools;
using XGL.Views;
@ -42,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_Complete : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 23 "..\..\..\..\Views\LanJu_Complete.xaml"
#line 33 "..\..\..\..\Views\LanJu_Complete.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid datagrid1;
@ -89,6 +90,12 @@ namespace XGL.Views {
return;
case 2:
this.datagrid1 = ((System.Windows.Controls.DataGrid)(target));
#line 39 "..\..\..\..\Views\LanJu_Complete.xaml"
this.datagrid1.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.datagrid1_LoadingRow);
#line default
#line hidden
return;
}
this._contentLoaded = true;

7
shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793"
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using XGL.Tools;
using XGL.Views;
@ -42,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 30 "..\..\..\..\Views\LanJu_InOut.xaml"
#line 33 "..\..\..\..\Views\LanJu_InOut.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgInOutRecord;
@ -90,7 +91,7 @@ namespace XGL.Views {
case 2:
this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
#line 39 "..\..\..\..\Views\LanJu_InOut.xaml"
#line 42 "..\..\..\..\Views\LanJu_InOut.xaml"
this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
#line default

7
shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4F274FD442BEA87AD6398AACCB6772C9DC89D5D581D153BBB463B6CE5E33C793"
#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -30,6 +30,7 @@ using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using XGL.Tools;
using XGL.Views;
@ -42,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 30 "..\..\..\..\Views\LanJu_InOut.xaml"
#line 33 "..\..\..\..\Views\LanJu_InOut.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgInOutRecord;
@ -90,7 +91,7 @@ namespace XGL.Views {
case 2:
this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
#line 39 "..\..\..\..\Views\LanJu_InOut.xaml"
#line 42 "..\..\..\..\Views\LanJu_InOut.xaml"
this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
#line default

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

Binary file not shown.

58
shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
Unescape Escape View File

@ -1,4 +1,5 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649"
// Updated by XamlIntelliSenseFileGenerator 2023-10-8 18:44:15
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -33,26 +34,15 @@ using System.Windows.Shell;
using XGL.Tools;
namespace XGL.Views {
namespace XGL.Views
{
/// <summary>
/// LanJu_Operator
/// </summary>
public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 3 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal XGL.Views.LanJu_Operator UCOperator;
#line default
#line hidden
#line 146 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnComplete;
public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector
{
#line default
#line hidden
@ -90,21 +80,13 @@ namespace XGL.Views {
#line hidden
#line 470 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
#line default
#line hidden
#line 478 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window2;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
@ -112,8 +94,10 @@ namespace XGL.Views {
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
public void InitializeComponent()
{
if (_contentLoaded)
{
return;
}
_contentLoaded = true;
@ -132,7 +116,8 @@ namespace XGL.Views {
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
{
switch (connectionId)
{
case 1:
@ -207,7 +192,7 @@ namespace XGL.Views {
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 338 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
@ -215,29 +200,20 @@ namespace XGL.Views {
return;
case 10:
#line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 400 "..\..\..\..\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;
}
this._contentLoaded = true;
}
internal System.Windows.Controls.UserControl UCOperator;
}
}

27
shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2C64C56E58CC31DC49E67813003427D01103BFC94002361C33C47F7162FFE649"
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -90,21 +90,13 @@ namespace XGL.Views {
#line hidden
#line 470 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
#line default
#line hidden
#line 478 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window2;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
@ -207,7 +199,7 @@ namespace XGL.Views {
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 338 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
@ -215,26 +207,15 @@ namespace XGL.Views {
return;
case 10:
#line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 400 "..\..\..\..\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;
}
this._contentLoaded = true;
}

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@ -1,4 +1,4 @@
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs

FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;

Write Preview
Loading…
Cancel
Save