Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 2ee1f3c2
由
LN
编写于
2019-10-11 15:45:27 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
02f9b237
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
208 行增加
和
3 行删除
source/AssemblyLineClient/AssemblyLineClient.csproj
source/AssemblyLineClient/FrmDischargeLine.cs
source/AssemblyLineClient/FrmEquipBase.Designer.cs
source/AssemblyLineClient/FrmEquipBase.cs
source/AssemblyLineClient/FrmEquipBase.resx
source/AssemblyLineClient/FrmEquipBaseForm.Designer.cs
source/AssemblyLineClient/FrmEquipBaseForm.cs
source/AssemblyLineClient/FrmEquipBaseForm.resx
source/AssemblyLineClient/FrmFeedingEquip.cs
source/AssemblyLineClient/FrmMoveEquip.cs
source/AssemblyLineClient/FrmProvidingEquip.cs
source/AssemblyLineClient/AssemblyLineClient.csproj
查看文件 @
2ee1f3c
...
@@ -96,6 +96,12 @@
...
@@ -96,6 +96,12 @@
<Compile Include="FrmEquipBase.Designer.cs">
<Compile Include="FrmEquipBase.Designer.cs">
<DependentUpon>FrmEquipBase.cs</DependentUpon>
<DependentUpon>FrmEquipBase.cs</DependentUpon>
</Compile>
</Compile>
<Compile Include="FrmEquipBaseForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmEquipBaseForm.Designer.cs">
<DependentUpon>FrmEquipBaseForm.cs</DependentUpon>
</Compile>
<Compile Include="FrmProvidingEquip.cs">
<Compile Include="FrmProvidingEquip.cs">
<SubType>Form</SubType>
<SubType>Form</SubType>
</Compile>
</Compile>
...
@@ -147,6 +153,12 @@
...
@@ -147,6 +153,12 @@
<EmbeddedResource Include="FrmDischargeLine.resx">
<EmbeddedResource Include="FrmDischargeLine.resx">
<DependentUpon>FrmDischargeLine.cs</DependentUpon>
<DependentUpon>FrmDischargeLine.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="FrmEquipBase.resx">
<DependentUpon>FrmEquipBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmEquipBaseForm.resx">
<DependentUpon>FrmEquipBaseForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmProvidingEquip.resx">
<EmbeddedResource Include="FrmProvidingEquip.resx">
<DependentUpon>FrmProvidingEquip.cs</DependentUpon>
<DependentUpon>FrmProvidingEquip.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
...
...
source/AssemblyLineClient/FrmDischargeLine.cs
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmEquipBase.Designer.cs
查看文件 @
2ee1f3c
...
@@ -28,10 +28,17 @@
...
@@ -28,10 +28,17 @@
/// </summary>
/// </summary>
private
void
InitializeComponent
()
private
void
InitializeComponent
()
{
{
this
.
components
=
new
System
.
ComponentModel
.
Container
();
this
.
SuspendLayout
();
//
// FrmEquipBase
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
800
,
450
);
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
1307
,
751
);
this
.
Name
=
"FrmEquipBase"
;
this
.
Text
=
"FrmEquipBase"
;
this
.
Text
=
"FrmEquipBase"
;
this
.
ResumeLayout
(
false
);
}
}
#
endregion
#
endregion
...
...
source/AssemblyLineClient/FrmEquipBase.cs
查看文件 @
2ee1f3c
using
System
;
using
OnlineStore.Common
;
using
OnlineStore.DeviceLibrary
;
using
OnlineStore.LoadCSVLibrary
;
using
System
;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
System.ComponentModel
;
using
System.ComponentModel
;
using
System.Data
;
using
System.Data
;
...
@@ -7,6 +10,7 @@ using System.Linq;
...
@@ -7,6 +10,7 @@ using System.Linq;
using
System.Text
;
using
System.Text
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
System.Windows.Forms
;
using
System.Windows.Forms
;
using
UserFromControl
;
namespace
OnlineStore.AssemblyLine
namespace
OnlineStore.AssemblyLine
{
{
...
@@ -16,5 +20,67 @@ namespace OnlineStore.AssemblyLine
...
@@ -16,5 +20,67 @@ namespace OnlineStore.AssemblyLine
{
{
InitializeComponent
();
InitializeComponent
();
}
}
protected
EquipBase
equipBase
=
null
;
protected
Dictionary
<
string
,
IOTextControl
>
DIControlList
=
new
Dictionary
<
string
,
IOTextControl
>();
protected
Dictionary
<
string
,
IOTextControl
>
DOControlList
=
new
Dictionary
<
string
,
IOTextControl
>();
protected
void
ReadIOList
()
{
foreach
(
string
key
in
DIControlList
.
Keys
)
{
IOTextControl
control
=
DIControlList
[
key
];
int
iov
=
(
int
)
IOManager
.
IOValue
(
key
,
equipBase
.
DeviceID
);
if
(
iov
!=
control
.
IOValue
)
{
control
.
IOValue
=
iov
;
control
.
ShowData
();
}
}
foreach
(
string
key
in
this
.
DOControlList
.
Keys
)
{
IOTextControl
control
=
DOControlList
[
key
];
int
iov
=
(
int
)
IOManager
.
DOValue
(
key
,
equipBase
.
DeviceID
);
if
(
iov
!=
control
.
IOValue
)
{
control
.
IOValue
=
iov
;
control
.
ShowData
();
}
}
}
protected
void
BtnMove
(
Button
btn
,
string
defaultText
,
string
targetText
,
string
ioHighType
)
{
LogUtil
.
info
(
"点击【"
+
btn
.
Text
+
"】 "
);
if
(
btn
.
Text
.
Equals
(
defaultText
))
{
equipBase
.
IOMove
(
ioHighType
,
IO_VALUE
.
HIGH
);
btn
.
Text
=
targetText
;
btn
.
BackColor
=
Color
.
Aqua
;
}
else
{
equipBase
.
IOMove
(
ioHighType
,
IO_VALUE
.
LOW
);
btn
.
Text
=
defaultText
;
btn
.
BackColor
=
Color
.
White
;
}
}
protected
void
BtnMove
(
Button
btn
,
string
defaultText
,
string
targetText
,
string
ioLowType
,
string
ioHighType
)
{
LogUtil
.
info
(
"点击【"
+
btn
.
Text
+
"】 "
);
if
(
btn
.
Text
.
Equals
(
defaultText
))
{
equipBase
.
CylinderMove
(
null
,
ioLowType
,
ioHighType
);
btn
.
Text
=
targetText
;
btn
.
BackColor
=
Color
.
Aqua
;
}
else
{
equipBase
.
CylinderMove
(
null
,
ioHighType
,
ioLowType
);
btn
.
Text
=
defaultText
;
btn
.
BackColor
=
Color
.
SkyBlue
;
}
}
}
}
}
}
source/AssemblyLineClient/FrmEquipBase.resx
0 → 100644
查看文件 @
2ee1f3c
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
\ No newline at end of file
source/AssemblyLineClient/FrmEquipBaseForm.Designer.cs
0 → 100644
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmEquipBaseForm.cs
0 → 100644
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmEquipBaseForm.resx
0 → 100644
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmFeedingEquip.cs
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmMoveEquip.cs
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmProvidingEquip.cs
查看文件 @
2ee1f3c
此文件的差异被折叠,
点击展开。
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论