Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit edf7e3d0 由 刘韬
选项

temp

1 个父辈 e29c8c38
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 188 行增加 和 1 行删除
source/ACSingleStore/AutoInOutStore.csproj
......@@ -113,6 +113,12 @@
<Compile Include="userControl\AxisMoveControl.Designer.cs">
<DependentUpon>AxisMoveControl.cs</DependentUpon>
</Compile>
<Compile Include="userControl\uc_boxdebug.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="userControl\uc_boxdebug.Designer.cs">
<DependentUpon>uc_boxdebug.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="FrmAxisDebug.resx">
<DependentUpon>FrmAxisDebug.cs</DependentUpon>
</EmbeddedResource>
......@@ -155,6 +161,9 @@
<EmbeddedResource Include="userControl\AxisMoveControl.resx">
<DependentUpon>AxisMoveControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="userControl\uc_boxdebug.resx">
<DependentUpon>uc_boxdebug.cs</DependentUpon>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -116,6 +116,8 @@
this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.tabPage_Pos = new System.Windows.Forms.TabPage();
this.uc_boxdebug1 = new OnlineStore.ACSingleStore.useControl.uc_boxdebug();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -181,6 +183,7 @@
((System.ComponentModel.ISupportInitialize)(this.picPPoint)).BeginInit();
this.groupBox7.SuspendLayout();
this.groupInout.SuspendLayout();
this.tabPage_Pos.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
......@@ -558,6 +561,7 @@
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage_Pos);
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(4, 33);
this.tabControl1.Name = "tabControl1";
......@@ -1417,6 +1421,26 @@
this.btnUpDownP4.UseVisualStyleBackColor = true;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
//
// tabPage_Pos
//
this.tabPage_Pos.Controls.Add(this.uc_boxdebug1);
this.tabPage_Pos.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage_Pos.Location = new System.Drawing.Point(4, 30);
this.tabPage_Pos.Name = "tabPage_Pos";
this.tabPage_Pos.Padding = new System.Windows.Forms.Padding(3);
this.tabPage_Pos.Size = new System.Drawing.Size(1320, 659);
this.tabPage_Pos.TabIndex = 6;
this.tabPage_Pos.Text = "库位调试";
this.tabPage_Pos.UseVisualStyleBackColor = true;
//
// uc_boxdebug1
//
this.uc_boxdebug1.Location = new System.Drawing.Point(6, 7);
this.uc_boxdebug1.Margin = new System.Windows.Forms.Padding(5);
this.uc_boxdebug1.Name = "uc_boxdebug1";
this.uc_boxdebug1.Size = new System.Drawing.Size(868, 521);
this.uc_boxdebug1.TabIndex = 0;
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -1834,6 +1858,7 @@
this.groupBox7.PerformLayout();
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.tabPage_Pos.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
......@@ -1992,6 +2017,8 @@
private System.Windows.Forms.PictureBox picAxis4;
private System.Windows.Forms.CheckBox chbDebug;
private AutoCountClient.AxisMoveControl axisMoveControl1;
private System.Windows.Forms.TabPage tabPage_Pos;
private ACSingleStore.useControl.uc_boxdebug uc_boxdebug1;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -50,7 +50,7 @@ namespace OnlineStore.AutoInOutStore
return;
}
uc_boxdebug1.Init(store);
AutoStorePosition Position = null;
if (store.PositionNumList.Count > 0)
{
......
source/ACSingleStore/ResourceCulture.cs
......@@ -591,5 +591,28 @@ namespace OnlineStore.AutoInOutStore
public static string StartCycle = "StartCycle";
public static string StopCycle = "StopCycle";
public class MyMessage
{
public static DialogResult Show(string msg, params object[] param)
{
string showMsg = ResourceCulture.GetString(msg, msg, param);
string showTitle = ResourceCulture.GetString("提示");
return MessageBox.Show(showMsg, showTitle);
}
public static DialogResult Show(string msg, string title, MessageBoxButtons but, params object[] param)
{
string showMsg = ResourceCulture.GetString(msg, msg, param);
string showTitle = ResourceCulture.GetString(title, title);
return MessageBox.Show(showMsg, showTitle, but);
}
public static DialogResult ShowIcon(string msg, string title, MessageBoxButtons but, MessageBoxIcon icon, params object[] param)
{
string showMsg = ResourceCulture.GetString(msg, msg, param);
string showTitle = ResourceCulture.GetString(title, title);
return MessageBox.Show(showMsg, showTitle, but, icon);
}
}
}
}
source/ACSingleStore/userControl/uc_boxdebug.resx 0 → 100644
<?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>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -35,6 +35,10 @@ namespace OnlineStore.DeviceLibrary
#endregion
/// <summary>
/// PosId, InOut,isSuccess
/// </summary>
public event Action<string, StoreMoveType, bool> InOutEndProcessEvent;
#region 出入库参数
private int CurrInOutCount = 0;
......
source/DeviceLibrary/acSingleStore/StoreManager.cs
......@@ -88,6 +88,7 @@ namespace OnlineStore.DeviceLibrary
Config = (AUTO_SA_Config)storeConfig;
Store = new AC_SA_BoxBean(Config);
Store.CID = CID;
LogUtil.info(LOGGER, "加载料仓完成！");
return Store;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!