出库流程修改

source/AssemblyLineClient/FrmProvidingEquip.Designer.cs

@@ -630,6 +630,7 @@
             this.btnSave.TabIndex = 310;
             this.btnSave.TabIndex = 310;
             this.btnSave.Text = "保存位置";
             this.btnSave.Text = "保存位置";
             this.btnSave.UseVisualStyleBackColor = false;
             this.btnSave.UseVisualStyleBackColor = false;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
             // 
             // txtP1
             // txtP1
             // 
             // 

source/AssemblyLineClient/FrmProvidingEquip.cs

@@ -401,6 +401,21 @@ namespace OnlineStore.AssemblyLine
             btnP2.Text = size + "寸移栽位置P2 :";
             btnP2.Text = size + "寸移栽位置P2 :";
             btnP3.Text = size + "寸料出料皮带线位置P3 :";
             btnP3.Text = size + "寸料出料皮带线位置P3 :";
         }
         }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            int p1Position = FormUtil.GetIntValue(txtP1);
+            equipBean.Config.UpDownAxisP1 = p1Position;
+
+            int size = 0;
+            try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
+            int sizePosition = FormUtil.GetIntValue(txtP2);
+            int sizeBoxP = FormUtil.GetIntValue(txtP3);
+            equipBean.Config.UpdateUpdownP2(size, sizePosition);
+            equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
+            LineManager.SaveProvidingEquipConfig(equipBean.Config);
+            MessageBox.Show("保存成功！");
+        }
     }
     }
 
 
 }
 }

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -28,6 +28,11 @@ namespace OnlineStore.DeviceLibrary
                 bool result = LineManager.Line.DLineStartOut(Config.DLineEquipNum, Config.DLineLineNum);
                 bool result = LineManager.Line.DLineStartOut(Config.DLineEquipNum, Config.DLineLineNum);
                 wait.IsEnd = result;
                 wait.IsEnd = result;
             }
             }
+            //else if (wait.WaitType.Equals(WaitEnum.W009_BoxCanInstore))
+            //{
+            //    int storeId = checkWaitInfo.MoveParam.GetStoreId();
+            //    wait.IsEnd = LineServer.BoxCanReviceTray(storeId);
+            //}
             return false;
             return false;
         }
         }
         private Stopwatch trayCheckWait = new Stopwatch();
         private Stopwatch trayCheckWait = new Stopwatch();
@@ -274,10 +279,10 @@ namespace OnlineStore.DeviceLibrary
                 lineStatus = LineStatus.OutStoreExecute;
                 lineStatus = LineStatus.OutStoreExecute;
                 MoveInfo.MoveParam = param;
                 MoveInfo.MoveParam = param;
                 MoveInfo.NewMove(LineMoveType.OutStore);
                 MoveInfo.NewMove(LineMoveType.OutStore);
-                LogInfo("出料【" + posId + "】处理（移栽）：(PO_01_UpDownCylinderDown,上下气缸1下降）");
-                MoveInfo.NextMoveStep(LineMoveStep.PO_01_UpDownCylinderDown);
+                LogInfo("出料【" + posId + "】处理（移栽）：(PO_00_BeforeAfterAfter, 前后气缸后退）");
+                MoveInfo.NextMoveStep(LineMoveStep.PO_00_BeforeAfterAfter);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                UpdownDownP2Move(param.PlateH);
+                CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
                 return true;
                 return true;
             }
             }
             else
             else
@@ -302,7 +307,14 @@ namespace OnlineStore.DeviceLibrary
                 return;
                 return;
             }
             }
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
-            if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_UpDownCylinderDown))
+            if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_00_BeforeAfterAfter))
+            {
+                MoveInfo.NextMoveStep(LineMoveStep.PO_01_UpDownCylinderDown);
+                LogInfo(" " + MoveInfo.SLog + " : 上下气缸1下降）");
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+                UpdownDownP2Move(MoveInfo.MoveParam.PlateH);
+            }
+         else    if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_UpDownCylinderDown))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.PO_02_UpDownCylinderDownWait);
                 MoveInfo.NextMoveStep(LineMoveStep.PO_02_UpDownCylinderDownWait);
                 OutLog("出库 " + MoveInfo.SLog + " : 上下气缸1下降后等待0.3秒再夹紧");
                 OutLog("出库 " + MoveInfo.SLog + " : 上下气缸1下降后等待0.3秒再夹紧");
@@ -328,7 +340,7 @@ namespace OnlineStore.DeviceLibrary
                 int num = MoveInfo.MoveParam.TrayNumber;
                 int num = MoveInfo.MoveParam.TrayNumber;
                 MoveInfo.NextMoveStep(LineMoveStep.PO_05_WaitBox);
                 MoveInfo.NextMoveStep(LineMoveStep.PO_05_WaitBox);
                 LogInfo("出料PO_05_WaitBox【" + posId + "】处理（等待可以移栽） 更新盘号【" + num + "】为空盘");
                 LogInfo("出料PO_05_WaitBox【" + posId + "】处理（等待可以移栽） 更新盘号【" + num + "】为空盘");
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitBoxCanReviceTray());
+               // MoveInfo.WaitList.Add(WaitResultInfo.WaitProvidingEquipCanOut());
                 TrayManager.UpdateTrayInfo(num);
                 TrayManager.UpdateTrayInfo(num);
 
 
                 //阻挡气缸移动
                 //阻挡气缸移动

source/DeviceLibrary/model/StoreStep.cs

@@ -888,6 +888,10 @@ namespace OnlineStore.DeviceLibrary
 
 
         #region 出料装置移栽出料，20000开始
         #region 出料装置移栽出料，20000开始
         /// <summary>
         /// <summary>
+        /// 前后气缸后退
+        /// </summary>
+        PO_00_BeforeAfterAfter = 20000,
+        /// <summary>
         /// 上下气缸下降
         /// 上下气缸下降
         /// </summary>
         /// </summary>
         PO_01_UpDownCylinderDown = 20001,
         PO_01_UpDownCylinderDown = 20001,