From d06507ffdbad5db95156e114d5e8a0f89672529a Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期二, 02 二月 2021 08:43:07 +0800
Subject: [PATCH] MES上传数据checkTime参数更改为DateTime类型
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
index 2eba9b1..4d1cb18 100644
--- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
+++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
@@ -89,17 +89,41 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="CtrlMotionCardRunBase.cs">
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="CtrlMotionCardRunBase.Designer.cs">
- <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.Designer.cs">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="CtrlPLCRunBase.Designer.cs">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.Designer.cs">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -112,12 +136,24 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="CtrlMotionCardRunBase.resx">
- <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisOperation.resx">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardIOStatus.resx">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\FrmMotionCardOperationBase.resx">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardRunBase.resx">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
--
Gitblit v1.8.0