1

LN
Commit 2d691a7e 由 LN 编写于 2019-12-13 11:00:00 +0800
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
source/AssemblyLineClient/FrmDischargeLine.cs
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
source/DeviceLibrary/LineConfig/Config_Line.csv
source/DeviceLibrary/assemblyLine/DischargeLine.cs
source/LoadCVSLibrary/storeConfig/config/DischargeLine_Config.cs
--- a/source/AssemblyLineClient/FrmDischargeLine.Designer.cs
查看文件 @2d691a7
+++ b/source/AssemblyLineClient/FrmDischargeLine.Designer.cs
查看文件 @2d691a7
@@ -60,6 +60,7 @@
            this.lblInstoreList = new System.Windows.Forms.Label();
            this.panel1 = new System.Windows.Forms.Panel();
            this.lblName = new System.Windows.Forms.Label();
+            this.btnScan = new System.Windows.Forms.Button();
            this.groupBox1.SuspendLayout();
            this.groupBox4.SuspendLayout();
            this.groupBox3.SuspendLayout();
@@ -370,7 +371,7 @@
            // 
            this.chbDebug.AutoSize = true;
            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(683, 20);
+            this.chbDebug.Location = new System.Drawing.Point(764, 20);
            this.chbDebug.Name = "chbDebug";
            this.chbDebug.Size = new System.Drawing.Size(84, 24);
            this.chbDebug.TabIndex = 247;
@@ -398,7 +399,7 @@
            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblStoreStatus.Location = new System.Drawing.Point(788, 22);
+            this.lblStoreStatus.Location = new System.Drawing.Point(869, 22);
            this.lblStoreStatus.Name = "lblStoreStatus";
            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
            this.lblStoreStatus.TabIndex = 245;
@@ -450,12 +451,13 @@
            this.btnOutStore.BackColor = System.Drawing.Color.White;
            this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOutStore.Location = new System.Drawing.Point(535, 12);
+            this.btnOutStore.Location = new System.Drawing.Point(648, 11);
            this.btnOutStore.Name = "btnOutStore";
            this.btnOutStore.Size = new System.Drawing.Size(110, 40);
            this.btnOutStore.TabIndex = 101;
            this.btnOutStore.Text = "出料测试";
            this.btnOutStore.UseVisualStyleBackColor = false;
+            this.btnOutStore.Visible = false;
            this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
            // 
            // tabControl1
@@ -606,6 +608,7 @@
            // 
            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.Controls.Add(this.btnScan);
            this.panel1.Controls.Add(this.lblName);
            this.panel1.Controls.Add(this.chbDebug);
            this.panel1.Controls.Add(this.lblStoreStatus);
@@ -629,6 +632,19 @@
            this.lblName.TabIndex = 248;
            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
+            // btnScan
+            // 
+            this.btnScan.BackColor = System.Drawing.Color.White;
+            this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnScan.Location = new System.Drawing.Point(534, 11);
+            this.btnScan.Name = "btnScan";
+            this.btnScan.Size = new System.Drawing.Size(110, 40);
+            this.btnScan.TabIndex = 249;
+            this.btnScan.Text = "扫码测试";
+            this.btnScan.UseVisualStyleBackColor = false;
+            this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
+            // 
            // FrmDischargeLine
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -706,6 +722,7 @@
        private System.Windows.Forms.Button btnlineStop;
        private System.Windows.Forms.ComboBox cmbLineType;
        private System.Windows.Forms.Label lblLineInfo;
+        private System.Windows.Forms.Button btnScan;
    }
 }
--- a/source/AssemblyLineClient/FrmDischargeLine.cs
查看文件 @2d691a7
+++ b/source/AssemblyLineClient/FrmDischargeLine.cs
查看文件 @2d691a7
@@ -379,6 +379,23 @@ namespace OnlineStore.AssemblyLine
        {
            equipBean.StopLineRun();
        }
+        private void btnScan_Click(object sender, EventArgs e)
+        {
+            List<string> LastCodeList = CodeManager.CameraScan(equipBean.Config.GetCameraList());
+            string msg = "";
+            if (LastCodeList.Count > 0)
+            {
+                foreach (string str in LastCodeList)
+                {
+                    msg = str + "\r\n";
+                }
+            }
+            LogUtil.info(equipBean.Name + "扫码测试结果：" + msg);
+            MessageBox.Show(equipBean.Name + "扫码测试结果：" + msg);
+        }
    }
 }

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
查看文件 @2d691a7
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
查看文件 @2d691a7
@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
 PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
 PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
 PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
-PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1500,,,,,
+PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1000,,,,,
 PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
 ,,,,,,,,,
 AXIS,0,轴一移栽上下轴,UpDown_Axis,2,COM5,0,,,

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
查看文件 @2d691a7
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
查看文件 @2d691a7
@@ -8,9 +8,9 @@ PRO,0,上料流水线入口AGV小车站号名称,AgvInName,D3,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D4,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,3,COM5,0,,,
-PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,23400000,,,,,
+PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,23175588,,,,,
 PRO,0,提升上料轴下降位置P2,BatchAxisP2,0,,,,,
-PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,20930000,,,,,
+PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,20720919,,,,,
 PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,1500,,,,,
 PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
 PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
 PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
 PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
 PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
-PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1500,,,,,
+PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1000,,,,,
 PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
 ,,,,,,,,,
 AXIS,0,轴一移栽上下轴,UpDown_Axis,4,COM5,0,,,

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
查看文件 @2d691a7
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
查看文件 @2d691a7
 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D77519112),,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,对应的横移模块,SidesWayNum,2,,,,,
@@ -25,7 +25,7 @@ PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
 AXIS,0,轴一移栽上下轴,UpDown_Axis,6,COM5,0,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
 PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=90000,,,,,
-PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,268294,,,,,
+PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,277000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
 PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,,,,

--- a/source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
查看文件 @2d691a7
+++ b/source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
查看文件 @2d691a7
 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,对应的横移模块,SidesWayNum,3,,,,,
@@ -24,7 +24,7 @@ PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
 ,,,,,,,,,
 AXIS,0,轴一移栽上下轴,UpDown_Axis,8,COM5,0,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
-PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=158000,,,,,
+PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=155000,,,,,
 PRO,0,移栽上下轴P3放料位置,UpDownAxisP3,310000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,

--- a/source/DeviceLibrary/LineConfig/Config_Line.csv
查看文件 @2d691a7
+++ b/source/DeviceLibrary/LineConfig/Config_Line.csv
查看文件 @2d691a7
@@ -55,14 +55,14 @@ PRO,0,出料移栽1-托盘-RFID-IP,PRO_RFIP_201,192.168.210.119,,,,,
 PRO,0,出料移栽2-托盘-RFID-IP,PRO_RFIP_202,192.168.210.122,,,,,
 PRO,0,出料移栽3-托盘-RFID-IP,PRO_RFIP_203,192.168.210.127,,,,,
 PRO,0,出料移栽4-托盘-RFID-IP,PRO_RFIP_204,192.168.210.130,,,,,
-,0,入料流水线1-托盘-RFID-IP,PRO_RFIP_101,192.168.210.101,,,,,
+PRO,0,入料流水线1-托盘-RFID-IP,PRO_RFIP_101,192.168.210.101,,,,,
 PRO,0,入料流水线2-托盘-RFID-IP,PRO_RFIP_102,192.168.210.110,,,,,
 PRO,0,入料流水线3-托盘-RFID-IP,PRO_RFIP_103,192.168.210.116,,,,,
-,0,入料流水线4-托盘-RFID-IP,PRO_RFIP_104,192.168.210.117,,,,,
+PRO,0,入料流水线4-托盘-RFID-IP,PRO_RFIP_104,192.168.210.117,,,,,
-PRO,0,入料流水线1-上料模块-RFID-IP,PRO_RFIP_101-1,192.168.210.102,,,,,
+,0,入料流水线1-上料模块-RFID-IP,PRO_RFIP_101-1,192.168.210.102,,,,,
 PRO,0,入料流水线2-上料模块-RFID-IP,PRO_RFIP_102-1,192.168.210.109,,,,,
 PRO,0,入料流水线3-上料模块-RFID-IP,PRO_RFIP_103-1,192.168.210.115,,,,,
-PRO,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,,
+,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,,
 ,,,,,,,,,
 PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,,
 PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,,  

--- a/source/DeviceLibrary/assemblyLine/DischargeLine.cs
查看文件 @2d691a7
+++ b/source/DeviceLibrary/assemblyLine/DischargeLine.cs
查看文件 @2d691a7
@@ -47,8 +47,9 @@ namespace OnlineStore.DeviceLibrary
            SecondMoveInfo.EndMove();
            lineStatus = LineStatus.StoreOnline; 
            runStatus = LineRunStatus.HomeMoving;
-            LogInfo("开始原点返回：  (重置灯状态，定位气缸下降  )开始");
+            LogInfo("开始原点返回：  (重置灯状态，关闭所有皮带线，定位气缸下降  )开始");
            MoveInfo.NewMove(LineMoveType.ReturnHome);
+            StopLineRun();
            StartReset(); 
            if (  isDebug)
            {
@@ -63,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
        public override bool Reset()
        { 
            StopMove();
-            LogInfo("开始重置： （重置灯状态，定位气缸下降  ）开始；");
+            LogInfo("开始重置： （重置灯状态，关闭所有皮带线，定位气缸下降  ）开始；");
            runStatus = LineRunStatus.Reset;
            MoveInfo.NewMove(LineMoveType.Reset);
            StartReset();
@@ -77,6 +78,12 @@ namespace OnlineStore.DeviceLibrary
            CylinderMove(MoveInfo, IO_Type.SeparateDevice_Up, IO_Type.SeparateDevice_Down);
            IOMove(IO_Type.DLine_RunStatus, IO_VALUE.HIGH);
            IOMove(IO_Type.DLine_RunAlarm, IO_VALUE.LOW);
+            CheckAndMove(IO_Type.DLine_Run1, IO_VALUE.LOW);
+            CheckAndMove(IO_Type.DLine_Run2, IO_VALUE.LOW);
+            CheckAndMove(IO_Type.DLine_Run3, IO_VALUE.LOW);
+            CheckAndMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
            if (IsDebug)
            {
                mainTimer.Start();
@@ -190,6 +197,20 @@ namespace OnlineStore.DeviceLibrary
            if (runStatus.Equals(LineRunStatus.Runing) && NoAlarm())
            {
+                //判断皮带线3出口是否有料
+                if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.HIGH))
+                {
+                    //开始扫码然后送出料盘
+                    //1.扫码，
+                    //2.从服务器获取尺寸
+                    //3.顶升或下降定位气缸
+                    //皮带线3转动，分料皮带转动，
+                    //等待料盘到达工位。
+                }
+                //皮带线3出口无料
+                else if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false))
+                {
                    //判断是否需要入库  
                    if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false))
                    {
@@ -199,14 +220,16 @@ namespace OnlineStore.DeviceLibrary
                            StartLineRun(IO_Type.DLine_Run3, IO_Type.Location_Check3);
                        }
                    }
-                if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && MoveInfo.MoveType.Equals(LineMoveType.None))
+                }
+                else if (IOValue(IO_Type.EntryPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && MoveInfo.MoveType.Equals(LineMoveType.None))
                {
                    if ((IOValue(IO_Type.ExitPosition_Check1).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.ExitPosition_Check1).Equals(IO_VALUE.HIGH)))
                    {
                        StartLineRun(IO_Type.DLine_Run1, IO_Type.Location_Check1);
                    }
                }
-                if (IOValue(IO_Type.MiddlePosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && SecondMoveInfo.MoveType.Equals(LineMoveType.None))
+                else if (IOValue(IO_Type.MiddlePosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && SecondMoveInfo.MoveType.Equals(LineMoveType.None))
                {
                    if ((IOValue(IO_Type.ExitPosition_Check2).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.ExitPosition_Check2).Equals(IO_VALUE.HIGH)))
                    {

--- a/source/LoadCVSLibrary/storeConfig/config/DischargeLine_Config.cs
查看文件 @2d691a7
+++ b/source/LoadCVSLibrary/storeConfig/config/DischargeLine_Config.cs
查看文件 @2d691a7
@@ -18,22 +18,38 @@ namespace OnlineStore.LoadCSVLibrary
        public DischargeLine_Config(int id, string cid, string type, string filepath)
            : base(id, cid, LoadCSVLibrary.DeviceType.DischargeLine, filepath)
        { 
        } 
        /// <summary>
        /// 设备是否处于调试状态（1=调试，0=正常）
        /// </summary>
        [ConfigProAttribute("IsDebug")]
        public int IsDebug { get; set; } 
        /// <summary>
        /// PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
        /// </summary>
        [ConfigProAttribute("CameraNameList")]
        public string CameraNameList { get; set; }
+        private List<string> CameraList = null;
+        public List<string> GetCameraList()
+        {
+            if (CameraList == null)
+            {
+                CameraList = new List<string>();
+                string[] arrayList = CameraNameList.Split('#');
+                foreach (string str in arrayList)
+                {
+                    string camera = str.Trim();
+                    if (string.IsNullOrEmpty(camera).Equals(false))
+                    {
+                        CameraList.Add(camera);
+                    }
+                }
+            }
+            return CameraList;
+        }
    }
 }