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

添加成品、打卡等功能

Browse Source
20260122
zhaoaomin 2 years ago
parent dafa4c5927
commit 9c96b4f7e9
441 changed files with 35665 additions and 607 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -5,3 +5,5 @@ shangjian/CommonFunc/obj/
shangjian/CommonFunc/bin/
shangjian/XGL.Data/obj/
shangjian/XGL.Data/bin/
shangjian/XGLFinishPro/obj/
shangjian/XGLFinishPro/bin/

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.

4
shangjian/AutoUpdate/bin/Debug/AutoUpdate.application
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>IfQ2LLDWJC73HvMngEFjpyEOT7eiZ99iYdurmK8S2RA=</dsig:DigestValue>
<dsig:DigestValue>kCr1fh10+EtMBHGFNQ8qK4lr256zI+0Jrd2pZnBY0uI=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

Binary file not shown.

2
shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
Unescape Escape View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>c7WQpMXek3r/jb4SdOtNd1qocYw496LLF05iMXjF3aU=</dsig:DigestValue>
<dsig:DigestValue>qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

Binary file not shown.

BIN
shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe
View File

Binary file not shown.

4
shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>IfQ2LLDWJC73HvMngEFjpyEOT7eiZ99iYdurmK8S2RA=</dsig:DigestValue>
<dsig:DigestValue>kCr1fh10+EtMBHGFNQ8qK4lr256zI+0Jrd2pZnBY0uI=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

Binary file not shown.

2
shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
eea3ff7a82b036285dd19ec3ef2dc8d3e7eddf67
f67dc885e7551d573c533635607a154a9fcfd039

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

Binary file not shown.

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

Binary file not shown.

2
shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest
Unescape Escape View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>c7WQpMXek3r/jb4SdOtNd1qocYw496LLF05iMXjF3aU=</dsig:DigestValue>
<dsig:DigestValue>qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

Binary file not shown.

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

Binary file not shown.

26
shangjian/BL.sln
Unescape Escape View File

@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoUpdate", "AutoUpdate\Au
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFupdate", "WPFupdate\WPFupdate.csproj", "{703CDC32-203A-4B71-8B3E-306A48AB3F8B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XGLFinishPro", "XGLFinishPro\XGLFinishPro.csproj", "{9EF5B36A-859B-4445-9F7C-B6D796898AD6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -305,6 +307,30 @@ Global
{703CDC32-203A-4B71-8B3E-306A48AB3F8B}.Release|x64.Build.0 = Release|Any CPU
{703CDC32-203A-4B71-8B3E-306A48AB3F8B}.Release|x86.ActiveCfg = Release|Any CPU
{703CDC32-203A-4B71-8B3E-306A48AB3F8B}.Release|x86.Build.0 = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|ARM.Build.0 = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|ARM64.Build.0 = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|Mixed Platforms.Build.0 = Debug|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|x64.ActiveCfg = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|x64.Build.0 = Debug|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|x86.ActiveCfg = Debug|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Debug|x86.Build.0 = Debug|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|Any CPU.Build.0 = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|ARM.ActiveCfg = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|ARM.Build.0 = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|ARM64.ActiveCfg = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|ARM64.Build.0 = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|Mixed Platforms.ActiveCfg = Release|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|Mixed Platforms.Build.0 = Release|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|x64.ActiveCfg = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|x64.Build.0 = Release|Any CPU
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.Release|x86.ActiveCfg = Release|x86
{9EF5B36A-859B-4445-9F7C-B6D796898AD6}.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/bin/Debug/XGL.Thrift.dll
View File

Binary file not shown.

BIN
shangjian/CentralControl/bin/Debug/XGL.Thrift.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.

15
shangjian/CommonFunc/CommonFunc.csproj
Unescape Escape View File

@ -11,6 +11,7 @@
<AssemblyName>CommonFunc</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -156,6 +157,12 @@
<Compile Include="snap7.net.cs" />
<Compile Include="SqlServerDbHelper.cs" />
<Compile Include="Tools\CustomMessageBox.cs" />
<Compile Include="Tools\PauseOrderWin.xaml.cs">
<DependentUpon>PauseOrderWin.xaml</DependentUpon>
</Compile>
<Compile Include="Tools\PauseRecoverWin.xaml.cs">
<DependentUpon>PauseRecoverWin.xaml</DependentUpon>
</Compile>
<Compile Include="Tools\PlcHelper.cs" />
<Compile Include="Tools\RestHelper.cs" />
<Compile Include="Tools\Utils.cs" />
@ -180,6 +187,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Tools\PauseOrderWin.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Tools\PauseRecoverWin.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\alert.png">

6
shangjian/CommonFunc/HMessageBox.xaml
Unescape Escape View File

@ -38,13 +38,13 @@
<!--Button Margin(坐上右下)-->
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" >
<Button Content="确 定" Background="#216DD3" BorderBrush="Transparent" x:Name="OkButton" Width="80" Height="28" Click="OkButton_Click" Margin="10,0,15,0" IsDefault="True"
<Button Content="确 定" Background="#216DD3" BorderBrush="Transparent" x:Name="OkButton" Width="80" Height="28" Click="OkButton_Click" Margin="10,0,0,0" IsDefault="True"
/>
<Button Content="是" Background="#216DD3" BorderBrush="Transparent" x:Name="YesButton" Width="80" Height="28" Click="YesButton_Click" Margin="10,0,15,0"
<Button Content="是" Background="#216DD3" BorderBrush="Transparent" x:Name="YesButton" Width="80" Height="28" Click="YesButton_Click" Margin="10,0,0,0"
/>
<Button Content="否" Background="#D7D7D7" Foreground="Black" BorderBrush="Transparent" BorderThickness="0.5" x:Name="NoButton" Width="80" Height="28" Click="NoButton_Click" Margin="10,0,15,0"
/>
<Button Content="取消" Background="#D7D7D7" Foreground="Black" BorderBrush="Transparent" BorderThickness="0.5" x:Name="CancelButton" Width="80" Height="28" Click="CancelButton_Click" Margin="10,0,15,0"
<Button Content="取消" Background="#D7D7D7" Foreground="Black" BorderBrush="Transparent" BorderThickness="0.5" x:Name="CancelButton" Width="80" Height="28" Click="CancelButton_Click" Margin="10,0,25,0"
/>
</StackPanel>
</Grid>

16
shangjian/CommonFunc/LoginUserInfo.cs
Unescape Escape View File

@ -41,6 +41,22 @@ namespace CommonFunc
/// 版本
/// </summary>
public static string Version { get; set; }
/// <summary>
/// 工作日
/// </summary>
public static string WorkDate { get; set; }
/// <summary>
/// 班次开始工作时间
/// </summary>
public static string Start_Time { get; set; }
/// <summary>
/// 版本
/// </summary>
public static string End_Time { get; set; }
}
public class vsionclass
{

44
shangjian/CommonFunc/Tools/PauseOrderWin.xaml
Unescape Escape View File

@ -0,0 +1,44 @@
<Window x:Class="CommonFunc.Tools.PauseOrderWin"
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"
mc:Ignorable="d"
Title="CheckUserWin" Height="350" Width="600" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded">
<Grid>
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="AliceBlue"></GradientStop>
<GradientStop Color="#FF2281D1" Offset="1"></GradientStop>
<GradientStop Color="AliceBlue" Offset="0.5"></GradientStop>
</LinearGradientBrush>
</Grid.Background>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Label x:Name="lbTitle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Content="暂停/恢复工单"></Label>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
<Label Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="类 型："></Label>
<ComboBox x:Name="txtType" Width="260" Height="50" SelectionChanged="txtType_SelectionChanged" VerticalContentAlignment="Center">
<ComboBoxItem>设备</ComboBoxItem>
<ComboBoxItem>质量</ComboBoxItem>
<ComboBoxItem>生产</ComboBoxItem>
<ComboBoxItem>其它</ComboBoxItem>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2">
<Label x:Name="lbUser" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="备 注："></Label>
<TextBox x:Name="txtRemark" Width="260" Height="50" TextChanged="txtUserID_TextChanged" VerticalContentAlignment="Center"></TextBox>
</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="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>

62
shangjian/CommonFunc/Tools/PauseOrderWin.xaml.cs
Unescape Escape View File

@ -0,0 +1,62 @@
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;
namespace CommonFunc.Tools
{
/// <summary>
/// CheckUserWin.xaml 的交互逻辑
/// </summary>
public partial class PauseOrderWin : Window
{
public string remark;
public string type;
public PauseOrderWin()
{
InitializeComponent();
}
private void btnCancel_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void btnOK_Click(object sender, RoutedEventArgs e)
{
remark = txtRemark.Text;
type = txtType.Text;
this.DialogResult = true;
}
private void txtUserID_TextChanged(object sender, TextChangedEventArgs e)
{
this.tbMsg.Content = "";
}
private void pw_PasswordChanged(object sender, RoutedEventArgs e)
{
tbMsg.Content = "";
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
}
private void txtType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
this.tbMsg.Content = "";
}
}
}

44
shangjian/CommonFunc/Tools/PauseRecoverWin.xaml
Unescape Escape View File

@ -0,0 +1,44 @@
<Window x:Class="CommonFunc.Tools.PauseRecoverWin"
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"
mc:Ignorable="d"
Title="CheckUserWin" Height="350" Width="600" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded">
<Grid>
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="AliceBlue"></GradientStop>
<GradientStop Color="#FF2281D1" Offset="1"></GradientStop>
<GradientStop Color="AliceBlue" Offset="0.5"></GradientStop>
</LinearGradientBrush>
</Grid.Background>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Label x:Name="lbTitle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Content="暂停/恢复工单"></Label>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="1">
<Label Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="类 型："></Label>
<ComboBox x:Name="txtType" Width="260" Height="50" SelectionChanged="txtType_SelectionChanged" VerticalContentAlignment="Center">
<ComboBoxItem>设备</ComboBoxItem>
<ComboBoxItem>质量</ComboBoxItem>
<ComboBoxItem>生产</ComboBoxItem>
<ComboBoxItem>其它</ComboBoxItem>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2">
<Label x:Name="lbUser" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Content="备 注："></Label>
<TextBox x:Name="txtRemark" Width="260" Height="50" TextChanged="txtRemark_TextChanged" VerticalContentAlignment="Center"></TextBox>
</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="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>

66
shangjian/CommonFunc/Tools/PauseRecoverWin.xaml.cs
Unescape Escape View File

@ -0,0 +1,66 @@
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;
namespace CommonFunc.Tools
{
/// <summary>
/// PauseRecoverWin.xaml 的交互逻辑
/// </summary>
public partial class PauseRecoverWin : Window
{
public string remark;
public string type;
public PauseRecoverWin()
{
InitializeComponent();
}
private void btnCancel_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void btnOK_Click(object sender, RoutedEventArgs e)
{
remark = txtRemark.Text;
type = txtType.Text;
this.DialogResult = true;
}
private void txtUserID_TextChanged(object sender, TextChangedEventArgs e)
{
this.tbMsg.Content = "";
}
private void pw_PasswordChanged(object sender, RoutedEventArgs e)
{
tbMsg.Content = "";
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
}
private void txtRemark_TextChanged(object sender, TextChangedEventArgs e)
{
this.tbMsg.Content = "";
}
private void txtType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
this.tbMsg.Content = "";
}
}
}

3
shangjian/CommonFunc/Tools/Utils.cs
Unescape Escape View File

@ -34,6 +34,9 @@ namespace CommonFunc.Tools
string serverIp = builder.DataSource.Split(',')[0];
return serverIp;
}
public static DateTime lastActivityTime = DateTime.Now;
public static bool isAnyBodyPerating = false;
/// <summary>
/// 根据日期查询周天
/// </summary>

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.

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

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

2
shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
cfb04e75b94c39ee4374f63be8ad6b6fac4e7180
480f634d4a501bb2823c222d358be062c929427a

218
shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -1,167 +1,11 @@
D:\项目\特冰\特冰2\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\特冰\特冰2\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\特冰\特冰2\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\特冰\特冰2\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\特冰\特冰2\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NLog.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\特冰\特冰2\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NLog.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\天津波轮\波轮\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\天津波轮\波轮\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\天津波轮\波轮\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\天津波轮\波轮\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\天津波轮\波轮\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NLog.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\天津波轮\波轮 - 副本\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\天津波轮\波轮 - 副本\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\天津波轮\波轮 - 副本\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\天津波轮\波轮 - 副本\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\天津波轮\波轮 - 副本\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮 - 副本\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NLog.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\天津波轮\波轮上件\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\天津波轮\波轮上件\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\天津波轮\波轮上件\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\天津波轮\波轮上件\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\天津波轮\波轮上件\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮上件\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NLog.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\天津波轮\波轮上件101102\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\天津波轮\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\天津波轮\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\天津波轮\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\天津波轮\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\bin\x86\Debug\NLog.xml
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csprojAssemblyReference.cache
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\项目\天津波轮\波轮一期自动上件\波轮上件101102\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\bin\x86\Debug\NLog.xml
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\project\tianjinXGL\xgl\neitong\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.pdb
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.pdb
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.xml
F:\KHD\230620\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
F:\KHD\230620\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
F:\KHD\230620\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
F:\KHD\230620\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
F:\KHD\230620\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.dll
F:\KHD\230620\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.xml
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.pdb
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.pdb
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.xml
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.xml
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\WorkSpace\KHD\Project\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseOrderWin.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.cache
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.lref
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseOrderWin.baml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseRecoverWin.baml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\PauseRecoverWin.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\Config\log4net.config
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
@ -171,6 +15,7 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\G
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\log4net.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\Newtonsoft.Json.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
@ -191,54 +36,9 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\S
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\System.Memory.xml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\System.Numerics.Vectors.xml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\System.Runtime.CompilerServices.Unsafe.xml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.cache
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.lref
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.baml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.g.resources
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Config\log4net.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.pdb
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\BCrypt.Net-Next.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\log4net.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Newtonsoft.Json.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXmlFormats.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\QRCoder.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Buffers.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Memory.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Numerics.Vectors.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Runtime.CompilerServices.Unsafe.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.pdb
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\XGL.Models.dll.config
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\BCrypt.Net-Next.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Buffers.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Data.SqlClient.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Memory.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Numerics.Vectors.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\System.Runtime.CompilerServices.Unsafe.xml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.AssemblyReference.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.g.cs
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc_MarkupCompile.lref
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\HMessageBox.baml
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.g.resources
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CoreCompileInputs.cache
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb

BIN
shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csprojAssemblyReference.cache
View File

Binary file not shown.

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

Binary file not shown.

6
shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache
Unescape Escape View File

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
12023204370
3601143984
2-1355062061
241494203934
261069671320
44-239516262
HMessageBox.xaml;
HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
False

10
shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache
Unescape Escape View File

@ -4,17 +4,17 @@
library
C#
.cs
E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\
CommonFunc
none
false
DEBUG;TRACE
12023204370
3601143984
2-1355062061
2582182177
44-170053996
HMessageBox.xaml;
27-342350437
44-239516262
HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
True

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

Binary file not shown.

BIN
shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml
View File

Binary file not shown.

2
shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs
Unescape Escape View File

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

2
shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs
Unescape Escape View File

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

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

Binary file not shown.

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

Binary file not shown.

2
shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
bc174b8fc67ac08f66a67e37a513d69b6869cfa6
51790d22c3b0468f4e446c933001b592c3e5c2c3

BIN
shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache
Unescape Escape View File

@ -4,12 +4,12 @@
winexe
C#
.cs
E:\workspace\LanJu\client\shangjian\LanJu\obj\Debug\
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\
LanJu
none
false
DEBUG;TRACE
E:\workspace\LanJu\client\shangjian\LanJu\App.xaml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\App.xaml
9-1725419280
131720844138

18
shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref
Unescape Escape View File

@ -1,12 +1,12 @@

FE:\workspace\LanJu\client\shangjian\LanJu\MainWindow.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Index.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Material.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\MainWindow.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Index.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Material.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
shangjian/LanJuControl/obj/Debug/LanJuControl.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.

268
shangjian/UpgradeLog.htm
Unescape Escape View File

@ -0,0 +1,268 @@
<!DOCTYPE html>
<!-- saved from url=(0014)about:internet -->
<html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
迁移报告
</title><style>
/* Body style, for the entire document */
body
{
background: #F3F3F4;
color: #1E1E1F;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
padding: 0;
margin: 0;
}
/* Header1 style, used for the main title */
h1
{
padding: 10px 0px 10px 10px;
font-size: 21pt;
background-color: #E2E2E2;
border-bottom: 1px #C1C1C2 solid;
color: #201F20;
margin: 0;
font-weight: normal;
}
/* Header2 style, used for "Overview" and other sections */
h2
{
font-size: 18pt;
font-weight: normal;
padding: 15px 0 5px 0;
margin: 0;
}
/* Header3 style, used for sub-sections, such as project name */
h3
{
font-weight: normal;
font-size: 15pt;
margin: 0;
padding: 15px 0 5px 0;
background-color: transparent;
}
/* Color all hyperlinks one color */
a
{
color: #1382CE;
}
/* Table styles */
table
{
border-spacing: 0 0;
border-collapse: collapse;
font-size: 10pt;
}
table th
{
background: #E7E7E8;
text-align: left;
text-decoration: none;
font-weight: normal;
padding: 3px 6px 3px 6px;
}
table td
{
vertical-align: top;
padding: 3px 6px 5px 5px;
margin: 0px;
border: 1px solid #E7E7E8;
background: #F7F7F8;
}
/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
.localLink
{
color: #1E1E1F;
background: #EEEEED;
text-decoration: none;
}
.localLink:hover
{
color: #1382CE;
background: #FFFF99;
text-decoration: none;
}
/* Center text, used in the over views cells that contain message level counts */
.textCentered
{
text-align: center;
}
/* The message cells in message tables should take up all avaliable space */
.messageCell
{
width: 100%;
}
/* Padding around the content after the h1 */
#content
{
padding: 0px 12px 12px 12px;
}
/* The overview table expands to width, with a max width of 97% */
#overview table
{
width: auto;
max-width: 75%;
}
/* The messages tables are always 97% width */
#messages table
{
width: 97%;
}
/* All Icons */
.IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
{
min-width:18px;
min-height:18px;
background-repeat:no-repeat;
background-position:center;
}
/* Success icon encoded */
.IconSuccessEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
}
/* Information icon encoded */
.IconInfoEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
}
/* Warning icon encoded */
.IconWarningEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
}
/* Error icon encoded */
.IconErrorEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
}
</style><script type="text/javascript" language="javascript">
// Startup
// Hook up the the loaded event for the document/window, to linkify the document content
var startupFunction = function() { linkifyElement("messages"); };
if(window.attachEvent)
{
window.attachEvent('onload', startupFunction);
}
else if (window.addEventListener)
{
window.addEventListener('load', startupFunction, false);
}
else
{
document.addEventListener('load', startupFunction, false);
}
// Toggles the visibility of table rows with the specified name
function toggleTableRowsByName(name)
{
var allRows = document.getElementsByTagName('tr');
for (i=0; i < allRows.length; i++)
{
var currentName = allRows[i].getAttribute('name');
if(!!currentName && currentName.indexOf(name) == 0)
{
var isVisible = allRows[i].style.display == '';
isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
}
}
}
function scrollToFirstVisibleRow(name)
{
var allRows = document.getElementsByTagName('tr');
for (i=0; i < allRows.length; i++)
{
var currentName = allRows[i].getAttribute('name');
var isVisible = allRows[i].style.display == '';
if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
{
allRows[i].scrollIntoView(true);
return true;
}
}
return false;
}
// Linkifies the specified text content, replaces candidate links with html links
function linkify(text)
{
if(!text || 0 === text.length)
{
return text;
}
// Find http, https and ftp links and replace them with hyper links
var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
return text.replace(urlLink, '<a href="$&">$&</a>') ;
}
// Linkifies the specified element by ID
function linkifyElement(id)
{
var element = document.getElementById(id);
if(!!element)
{
element.innerHTML = linkify(element.innerHTML);
}
}
function ToggleMessageVisibility(projectName)
{
if(!projectName || 0 === projectName.length)
{
return;
}
toggleTableRowsByName("MessageRowClass" + projectName);
toggleTableRowsByName('MessageRowHeaderShow' + projectName);
toggleTableRowsByName('MessageRowHeaderHide' + projectName);
}
function ScrollToFirstVisibleMessage(projectName)
{
if(!projectName || 0 === projectName.length)
{
return;
}
// First try the 'Show messages' row
if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
{
// Failed to find a visible row for 'Show messages', try an actual message row
scrollToFirstVisibleRow('MessageRowClass' + projectName);
}
}
</script></head><body><h1 _locID="ConversionReport">
迁移报告 - </h1><div id="content"><h2 _locID="OverviewTitle">概述</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">项目</th><th _locID="PathTableHeader">路径</th><th _locID="ErrorsTableHeader">错误</th><th _locID="WarningsTableHeader">警告</th><th _locID="MessagesTableHeader">消息</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#XGL">XGL</a></strong></td><td>XGL\XGL.csproj</td><td class="textCentered"><a href="#XGLError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">解决方案和项目</h2><div id="messages"><a name="XGL" /><h3>XGL</h3><table><tr id="XGLHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="ErrorRowClassXGL"><td class="IconErrorEncoded"><a name="XGLError" /></td><td class="messageCell"><strong>XGL\XGL.csproj:
</strong><span>行 -1956049632 出错。应为“ENCODING”，却发现是“utf-8”。</span></td></tr></table></div></div></body></html>

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
47ffa676f6bdf3bae90defb59fba4f8fa246ddda
57f46a9d84fe0cf9b52d094f86f1528843920246

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

Binary file not shown.

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

Binary file not shown.

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

@ -1,4 +1,5 @@
using CommonFunc.Tools;
using CommonFunc;
using CommonFunc.Tools;
using System;
using System.Collections.Generic;
using System.Data;
@ -19,47 +20,6 @@ namespace XGL.Data.DBService
/// <returns></returns>
public DataTable GetFormingMachineInfo(string devicecode,string workDate)
{
// 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,
// ord.shift_id
//FROM
// mes_material_transfer_result res
// LEFT JOIN pro_order_workorder ord ON res.OrderCode = ord.workorder_id
// LEFT JOIN pro_wet_material_plan_detail wet ON wet.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.create_time >= (
// SELECT
// CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_Start_Time ) AS Shift_Start_Time
// FROM
// base_shifts_t
// WHERE
// Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
// AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
// )
// AND rfid.create_time<= (
// SELECT
// CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_End_Time ) AS Shift_End_Time
// FROM
// base_shifts_t
// WHERE
// Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) )
// AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) )
// ) And ord.prod_line_code like '%{devicecode}%'
//ORDER BY
// ( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
string sql = $@"SELECT DISTINCT
ord.workorder_id,
ord.workorder_code,
@ -97,7 +57,20 @@ ORDER BY
public DataTable GetShiftList()
{
string sql = $@"select shift_id,Shift_Code,Shift_Desc,Shift_Start_Time,Shift_End_Time from base_shifts_t where del_flag ='0' ";
string sql = $@"select shift_id,shift_code,shift_desc,Shift_Start_Time,Shift_End_Time from base_shifts_t where del_flag ='0' ";
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;
}
public DataTable GetTeamList()
{
string sql = $@"SELECT team_id,team_code,team_desc FROM [dbo].[base_team_t] where del_flag ='0' ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
@ -217,19 +190,39 @@ where res.taskcode = '0' and equipmentCode = 'C6' and res.OrderCode is not null
}
/// <summary>
/// 更新工单
/// 更新工单状态
/// </summary>
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public bool UpdateWorkOrder(string orderCode,string status)
public bool UpdateWorkOrder(string orderCode,string status,string remark,string type,string deviceCode)
{
List<string> sqlList = new List<string>();
string logSql = "";
if (status.Equals("w2"))
{
logSql = $@"INSERT INTO [dbo].[mes_operation_log]
([id], [user_id], [user_name], [operation_type], [operation_time],
[operation_desc], [old_value], [new_value], [device_code],[remark],[order_code])
VALUES
('{CommonFunc.Common.GetUUID()}', '{LoginUser.UserId}', '{LoginUser.UserName}', '{type}', GetDate(),
'工单状态更新-暂停', 'w2', '{status}', '{deviceCode}','{remark}','{orderCode}');";
}
else
{
logSql = $@"INSERT INTO [dbo].[mes_operation_log]
([id], [user_id], [user_name], [operation_type], [operation_time],
[operation_desc], [old_value], [new_value], [device_code],[remark],[order_code])
VALUES
('{CommonFunc.Common.GetUUID()}', '{LoginUser.UserId}', '{LoginUser.UserName}', '{type}', GetDate(),
'工单状态更新-恢复', 'w4', '{status}', '{deviceCode}','{remark}','{orderCode}');";
}
string sql = $@"update pro_order_workorder set status = '{status}' where workorder_code = '{orderCode}'";
sqlList.Add(sql);
sqlList.Add(logSql);
bool issucc = Utils.netClientDBHelper.executeBatchSql(sqlList);
int issucc = Utils.netClientDBHelper.executeUpdate(sql);
return issucc > 0 ? true : false;
return issucc ;
}
/// <summary>
@ -240,8 +233,7 @@ where res.taskcode = '0' and equipmentCode = 'C6' and res.OrderCode is not null
/// <returns></returns>
public bool InsertData(FoamingMacModel formingModel)
{
string sql = $@"INSERT INTO [lanju_op_xiaolan_ds].[dbo].[mes_material_transfer_result] (
string sql = $@"INSERT INTO [mes_material_transfer_result] (
[id],
[begin],
[beout],
@ -281,5 +273,96 @@ VALUES
return issucc > 0 ? true : false;
}
/// <summary>
/// 报工
/// </summary>
/// <param name="bdt"></param>
/// <param name="edt"></param>
/// <returns></returns>
public bool ExecuteReportWork(DataRowView selectRow,string reportCode, string workTime, string userCount, string costCenter, string deviceCode)
{
List<string> sqlList = new List<string>();
string sql = $@"INSERT INTO [dbo].[mes_report_work]
([id], [report_type], [report_code], [workorder_code], [product_code], [product_name],
[spec], [unit], [quantity], [quantity_feedback], [quantity_qualified], [quantity_unqualified],
[user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status],
[remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code],
[attr1], [attr2], [attr3], [attr4], [create_by], [create_time],
[update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type],
[use_man], [work_center])
VALUES
('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}',
'{selectRow["product_spc"]}', '{selectRow["unit"]}', {selectRow["quantity_split"]}, {selectRow["quantity_split"]}, 0, 0,
'{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE',
'无', '{workTime}', '{deviceCode}', N'线体2', N'A01', '{selectRow["shift_id"]}',
NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',
'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '1', NULL, 'prod',
{userCount}, '{costCenter}');";
//赵啸林说不用上位机更新报工标识
//string updateOrderSql = $@"update pro_order_workorder set status = 'w3', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{selectRow["workorder_id"]}' ";
sqlList.Add(sql);
//sqlList.Add(updateOrderSql);
bool issucc = Utils.netClientDBHelper.executeBatchSql(sqlList);
return issucc;//> 0 ? true : false;
}
/// <summary>
/// 根据设备编码获取当前机台最新的吊满的RFID信息
/// </summary>
/// <param name="deviceCode"></param>
/// <returns></returns>
public DataTable GetRfidInfo(string deviceCode)
{
string sql = $@"select top 2 rfid.workorder_code, rfid, machine_code,order_num, rfid.create_time, rfid.update_by, rfid.update_time, work_batch_code, bind_status ,workorder.product_code
from pro_rfid_process_detail rfid
LEFT JOIN pro_order_workorder workorder on rfid.workorder_code = workorder.workorder_code
where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
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;
}
public DataTable GetNewRFID()
{
string sql = $@"select max(rfid) as rfid from mes_rfidandsfc_bind where CONVERT(VARCHAR(10), create_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)
{
return dtset.Tables[0];
}
return null;
}
public DataTable GetReportCode()
{
string getReportCodeSql = $@"select max(report_code) as report_code from mes_report_work where CONVERT(VARCHAR(10), create_time , 120) = CONVERT(VARCHAR(10),Getdate(), 120)";
DataSet dtset = Utils.netClientDBHelper.getDataSet(getReportCodeSql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
return dtset.Tables[0];
}
return null;
}
public string InterfaceUrl(string v)
{
string getReportCodeSql = $@"SELECT url FROM [dbo].[mes_interface_url] where url_type = 'reportWork' and del_flag = '0'";
DataSet dtset = Utils.netClientDBHelper.getDataSet(getReportCodeSql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
return dtset.Tables[0].Rows[0][0].ToString();
}
return "";
}
}
}

3150
shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
View File

File diff suppressed because it is too large Load Diff

1
shangjian/XGL.Data/XGL.Data.csproj
Unescape Escape View File

@ -95,6 +95,7 @@
<Compile Include="common_auth_userroleDB.cs" />
<Compile Include="data_carmaterialDb.cs" />
<Compile Include="data_carproductDb.cs" />
<Compile Include="DBServiceFinishProd\FinishProdDBService.cs" />
<Compile Include="DBService\DBService.cs" />
<Compile Include="DBService\DringRoomService.cs" />
<Compile Include="DBService\FormingMachineService.cs" />

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
79f02adf94b81a462e2d021ffaeb806c569f29e2
71f6ce92ed5dcb89571c00831dde3abe158ec5db

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.

7
shangjian/XGL.Data/userDB.cs
Unescape Escape View File

@ -311,7 +311,7 @@ namespace XGL.Data
/// <param name="usercode"></param>
/// <param name="pwd"></param>
/// <returns></returns>
public bool Login(string usercode, string pwd)
public bool Login(string usercode, string pwd,string shiftID,string teamID,string workDate,string startTime,string endTime)
{
string sql = $"select * from sys_user WHERE user_name='{usercode}'";
DataTable dt = Utils.cloudDBHelper.getDataSet(sql).Tables[0];
@ -326,6 +326,11 @@ namespace XGL.Data
LoginUser.UserCode = info.user_name;
LoginUser.UserName = info.nick_name;
//待补充班组班次
LoginUser.ShiftCode = shiftID;
LoginUser.TeamCode = teamID;
LoginUser.WorkDate = workDate;
LoginUser.Start_Time = startTime;
LoginUser.End_Time = endTime;
}
return issuccess;//lst.Count > 0 ? true : false;
}

9
shangjian/XGL.Model/Model/OrderPrepare/WcsSyncResult.cs
Unescape Escape View File

@ -8,12 +8,13 @@ namespace XGL.Models.Model.OrderPrepare
{
public class WcsSyncResult
{
public string reqCode { get; set; }
public int code { get; set; }
public string message { get; set; }
}
public class MesResult
{
public int code { get; set; }
public string msg { get; set; }
}
}

55
shangjian/XGL.Model/ShiftInfoModel.cs
Unescape Escape View File

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace XGL.Models
{
public class ShiftInfoModel
{
///<summary>
///id
///</summary>
public int shift_id { get; set; }
///<summary>
///carNo
///</summary>
public string shift_code { get; set; }
///<summary>
///materialNo
///</summary>
public string shift_desc { get; set; }
///<summary>
///materialNo
///</summary>
public string Shift_Start_Time { get; set; }
///<summary>
///materialNo
///</summary>
public string Shift_End_Time { get; set; }
}
public class TeamInfoModel
{
///<summary>
///id
///</summary>
public int team_id { get; set; }
///<summary>
///carNo
///</summary>
public string team_code { get; set; }
///<summary>
///materialNo
///</summary>
public string team_desc { get; set; }
}
}

2
shangjian/XGL.Model/XGL.Models.csproj
Unescape Escape View File

@ -95,6 +95,7 @@
<Compile Include="data_carproductModel.cs" />
<Compile Include="filedatasModel.cs" />
<Compile Include="Model\BaseEquipment.cs" />
<Compile Include="Model\BaseEquipmentAttached.cs" />
<Compile Include="Model\CarRealInfo.cs" />
<Compile Include="Model\CarMaterial.cs" />
<Compile Include="Model\CarProduct.cs" />
@ -123,6 +124,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="role.cs" />
<Compile Include="rolepermission.cs" />
<Compile Include="ShiftInfoModel.cs" />
<Compile Include="sysconfig_operatelogModel.cs" />
<Compile Include="sysnoticesModel.cs" />
<Compile Include="user.cs" />

6
shangjian/XGL.Model/XGL.Models.csproj.user
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>

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.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
d1055f6dba7da3fb6ce1b69e8b821137771bba54
0cc4d60a314f2e3943ed817c62d6179b8b14a6f2

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.

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

Write Preview
Loading…
Cancel
Save