1

source/Common/util/HttpHelper.cs

@@ -102,7 +102,7 @@ namespace OnlineStore.Common
             }
             catch (Exception e)
             {
-                LogUtil.error(  "POST ERROR:" + e.StackTrace, 1);
+                LogUtil.error(  "POST ERROR:" + e.ToString(), 1);
             }
             if (!result.Contains("null") && result.Length != 0)
             {

source/DeviceLibrary/RFID/RFIDManager.cs

@@ -51,7 +51,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 //LogUtil.error("ReadRFID["+ip+"]出错：" + ex.ToString());
             }
-            return new RFIDData(-1, -1);
+            return new RFIDData(0, 0);
         }
 
 
@@ -73,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// RFID类型，区分是料架还是托盘，托盘E=69,包装料料架A=65，料串=B
         /// </summary>
-        public char RFType = 'A'; 
+        public char RFType = 'X'; 
         public int Num = 0;
 
         public RFIDData(int num, int t)

source/DeviceLibrary/bean/StoreStep.cs

@@ -65,145 +65,6 @@ namespace OnlineStore.DeviceLibrary
  
         #endregion
          
-
-        #region VMI流水线内部出库步骤
-        /// <summary>
-        ///VMI流水线出库，，定位气缸下降
-        /// </summary>
-        SO_01_LocationCylinderDown=101,
-        /// <summary>
-        ///VMI流水线出库：叉子先运动到P1
-        /// </summary>
-        SO_02_DeviceBack = 102,
-
-        /// <summary>
-        ///  VMI流水线出库，，所有轴运行到库位，  轴4（ 压紧） 至P3(压紧前点) ,轴1（ 转盘） 至P2（ 库位点）,轴2(上下） 至P5(库位出库前点） 
-        /// </summary>
-        SO_03_ToBagPosition = 103,
-        /// <summary>
-        ///  VMI流水线出库，，叉子进入库位中，  轴3（ 叉子） 至P3(库位取放料点）
-        /// </summary>
-        SO_04_DeviceToBag = 104,
-
-        /// <summary>
-        ///VMI流水线出库，， 库位的物品放入叉子上，轴2（ 上下） 至P6（ 库位出料缓冲点），轴4（ 压紧） 至P2(压紧点)
-        /// </summary>
-        SO_05_BagWareToDevice = 105,
-
-        /// <summary>
-        ///VMI流水线出库，，叉子从 库位返回，轴3（ 叉子） 至P1（ 待机点）
-        /// </summary>
-        SO_06_BagDeviceBack = 106,
-
-        /// <summary>
-        /// VMI流水线出库，定位气缸伸出（有压紧轴的不需要此步骤），，定位气缸伸出   Y103-1/PCI5O1-83)   Y103-2/PCI5O1-90)   Y103-3/PCI5O1-95)   伸出到位
-        /// </summary>
-        SO_07_LocationCylinder_Up = 107,
-
-        /// <summary>
-        /// VMI流水线出库，，所有设备运行到门，，轴1（ 转盘） 至P1（ 待机点）轴2（ 上下） 至P2（ 进料口出料前点）
-        /// </summary>
-        SO_08_ToDoorPosition = 108,
-
-        /// <summary>
-        /// VMI流水线出库，定位气缸退回（有压紧轴的不需要此步骤），，定位气缸退回(Y104-1/PCI5O1-84)  (Y104-2/PCI5O1-91)   (Y104-2/PCI5O1-96)   退回到位
-        /// </summary>
-        SO_09_LocationCylinder_Down = 109,
-        /// <summary>
-        /// 等待门口无料盘
-        /// </summary>
-        SO_091_WaitNoTray=115,
-
-        /// <summary>
-        /// VMI流水线出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
-        /// /// </summary>
-        SO_10_DeviceToDoor = 110,
-        /// <summary>
-        /// VMI流水线出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
-        /// </summary>
-        SO_11_DevicePutWare = 111,
-        /// <summary>
-        /// VMI流水线出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
-        /// </summary>
-        SO_12_DeviceOutFromDoor = 112,
-
-        /// <summary>
-        /// VMI流水线出库，，升降轴返回，，  轴2至P1（ 待机点）
-        /// </summary>
-        SO_13_GoBack = 113,
-        /// <summary>
-        /// 等待拿走物品
-        /// </summary>
-        SO_14_WaitTake=114,
-
-        #endregion
-
-        #region VMI流水线内部入库步骤
-        /// <summary>
-        /// 入库检测
-        /// </summary>
-        SI_00_TrayCheck=200,
-        /// <summary>
-        /// 入库，。定位气缸下降
-        /// </summary>
-        SI_01_LocationCylinderDown=201,
-        /// <summary>
-        /// 入库。。进出轴（叉子）先返回P1
-        /// </summary>
-        SI_02_InOutAxisHome = 202,
-        /// <summary>
-        /// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
-        /// </summary>
-        SI_03_ReturnHome = 203,
-        /// <summary>
-        /// 入库。。压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点)
-        /// </summary>
-        SI_04_CompressWare = 204,
-        /// <summary>
-        /// 入库。。叉子进入入料口，轴3（ 叉子） 至P2（ 进料口取料点）
-        /// </summary>
-        SI_05_DeviceToDoor = 205,
-        /// <summary>
-        /// 入库。。把物品放入叉子上，轴2（ 上下） 至P7（ 进料口取料缓冲点）,压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P2(压紧点)
-        /// </summary>
-        SI_06_DoorWarToDevice = 206,
-         
-        /// <summary>
-        /// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点）
-        /// </summary>
-        SI_07_DeviceBackFromDoor = 207,
-        /// <summary>
-        /// 入库。。，定位气缸伸出 (有压紧轴的不需要此步骤) 
-        /// </summary>
-        SI_08_LocationCylinder_Up = 208,
-        /// <summary>
-        /// 入库。。移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
-        /// </summary>
-        SI_09_MoveToBag = 209,
-        /// <summary>
-        /// 入库。。定位气缸退回 （有压紧轴的不需要此步骤）
-        /// </summary>
-        SI_10_LocationCylinder_Down = 210,
-        /// <summary>
-        /// 入库。。叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）
-        /// </summary>
-        SI_11_DeviceToBag = 211,
-        /// <summary>
-        /// 入库。。放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）
-        /// </summary>
-        SI_12_PutWareToBag = 212,
-        /// <summary>
-        /// 入库。。叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
-        /// </summary>
-        SI_13_DeviceBackFromBag = 213,
-        /// <summary>
-        /// 入库。。返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
-        /// </summary>
-        SI_14_GoBack = 214,
-
-        #endregion
-
-    
     }
 
     public enum AlarmType

source/LoadCVSLibrary/LoadCSVLibrary.csproj

@@ -50,12 +50,12 @@
     <Compile Include="Config\ConfigItemBase.cs" />
     <Compile Include="Config\ConfigProAttribute.cs" />
     <Compile Include="Config\bean\VMLLineConfig.cs" />
-    <Compile Include="Config\bean\Store_IO_Type.cs" />
+    <Compile Include="Config\bean\IO_Type.cs" />
     <Compile Include="CSVAttribute.cs" />
     <Compile Include="Config\CSVConfigReader.cs" />
     <Compile Include="CSVReaderBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Config\bean\StoreConfig.cs" />
+    <Compile Include="Config\bean\RobotConfig.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj">

source/UserFromControl/IOStatusControl.Designer.cs

-namespace UserFromControl
-{
-    partial class IOStatusControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(0, 2);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "label1";
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 15);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(25, 25);
-            this.pictureBox1.TabIndex = 1;
-            this.pictureBox1.TabStop = false;
-            // 
-            // pictureBox2
-            // 
-            this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.pictureBox2.Location = new System.Drawing.Point(0, 15);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(25, 25);
-            this.pictureBox2.TabIndex = 2;
-            this.pictureBox2.TabStop = false;
-            // 
-            // IOStatusControl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.Controls.Add(this.pictureBox2);
-            this.Controls.Add(this.pictureBox1);
-            this.Controls.Add(this.label1);
-            this.Name = "IOStatusControl";
-            this.Size = new System.Drawing.Size(24, 39);
-            this.Load += new System.EventHandler(this.IOStatusControl_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.PictureBox pictureBox2;
-    }
-}

source/UserFromControl/IOStatusControl.cs

-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
- 
-using System.Windows.Forms;
-
-namespace UserFromControl
-{
-    public partial class IOStatusControl : UserControl
-    {
-      
-        public string IOName { get; set; }
-
-        public int   IOValue { get; set; }
-
-        public Boolean isCanClick { get; set; }
-        public IOStatusControl()
-        {
-            InitializeComponent();
-            if (ImageManager.IsInit==false)
-            {
-                ImageManager.Init();
-            }
-            this.pictureBox1.BackgroundImage = ImageManager.imgGrey;
-            this.pictureBox2.BackgroundImage = ImageManager.imgGreen;
-            pictureBox1.Visible = true;
-            pictureBox2.Visible = false;
-            isCanClick = false;
-        }
-
-        public void ShowData()
-        {
-            label1.Text = IOName;
-
-            if (label1.Text.Equals(""))
-            {
-                pictureBox1.Location = new Point(0, 0);
-                pictureBox2.Location = new Point(0, 0);
-            }
-            else
-            {
-                pictureBox1.Location = new Point(0, 15);
-                pictureBox2.Location = new Point(0, 15);
-            }
-            if (IOValue == 0)
-            {
-                pictureBox1.Visible = true;
-                pictureBox2.Visible = false;
-            }
-            else
-            {
-                pictureBox1.Visible = false;
-                pictureBox2.Visible = true;
-            }
-        }
-
-        private void IOStatusControl_Load(object sender, EventArgs e)
-        {
-            ShowData();
-        }
-    }
-}

source/UserFromControl/IOStatusControl.resx

-<?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

source/UserFromControl/UserFromControl.csproj

@@ -45,12 +45,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ImageManager.cs" />
-    <Compile Include="IOStatusControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="IOStatusControl.Designer.cs">
-      <DependentUpon>IOStatusControl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -66,9 +60,6 @@
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="IOStatusControl.resx">
-      <DependentUpon>IOStatusControl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>