暂停运动时界面未显示勾选

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -240,6 +240,7 @@ namespace OnlineStore.AssemblyLine
         {
         {
             chbDebug.Checked = equipBean.IsDebug;
             chbDebug.Checked = equipBean.IsDebug;
 
 
+            chbMoveStop.Checked = equipBean.MoveStop;
             axisMoveControl1.LoadData(equipBean, new AxisBean[] { equipBean.UpdownAxis, equipBean.BatchAxis });
             axisMoveControl1.LoadData(equipBean, new AxisBean[] { equipBean.UpdownAxis, equipBean.BatchAxis });
 
 
             cmbSizeList.Items.Clear();
             cmbSizeList.Items.Clear();

source/AssemblyLineClient/FrmHYEquip.cs

@@ -51,7 +51,7 @@ namespace OnlineStore.AssemblyLine
             }
             }
             LoadDP2();
             LoadDP2();
             chbDebug.Checked = equipBean.IsDebug;
             chbDebug.Checked = equipBean.IsDebug;
-
+            chbMoveStop.Checked = equipBean.MoveStop;
             lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus);
             lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus);
             lblThisSta.Text = equipBean.WarnMsg;
             lblThisSta.Text = equipBean.WarnMsg;
             lblName.Text = equipBean.Name;
             lblName.Text = equipBean.Name;

source/AssemblyLineClient/FrmMoveEquip.cs

@@ -52,6 +52,7 @@ namespace OnlineStore.AssemblyLine
             {
             {
                 cmbSizeList.Items.Add(heigth);
                 cmbSizeList.Items.Add(heigth);
             }
             }
+            chbMoveStop.Checked = equipBean.MoveStop;
             cmbSizeList.SelectedIndex = 0;
             cmbSizeList.SelectedIndex = 0;
             lblStoreStatus.Text = KTK_Store.GetRunStr( equipBean.runStatus);
             lblStoreStatus.Text = KTK_Store.GetRunStr( equipBean.runStatus);
             lblThisSta.Text = equipBean.WarnMsg;
             lblThisSta.Text = equipBean.WarnMsg;

source/AssemblyLineClient/记录.txt

@@ -4,7 +4,7 @@
 3.入库时需要判断托盘的库位号和入库任务的库位号一致。
 3.入库时需要判断托盘的库位号和入库任务的库位号一致。
 4.横移模块出口加延迟。
 4.横移模块出口加延迟。
 
 
-
+5.入料使用维护数据高度。
 
 
 
 
 
 

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -476,6 +476,13 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.MoveParam = LastPosParam.Clone();
                     MoveInfo.MoveParam = LastPosParam.Clone();
                     MoveInfo.NextMoveStep(LineMoveStep.FI_32_WaitTray);
                     MoveInfo.NextMoveStep(LineMoveStep.FI_32_WaitTray);
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
+
+                    if ((!LastPosParam.PlateH.Equals(LastHeight)) || (!LastPosParam.PlateW.Equals(LastWidth)))
+                    {
+                        InLog(" " + MoveInfo.SLog + " 原有料盘尺寸：【" + LastWidth + "X" + LastHeight + "】更改为服务器返回尺寸【" + LastPosParam.PlateW + "X" + LastPosParam.PlateH + "】   ");
+                        LastWidth = LastPosParam.PlateW;
+                        LastHeight = LastPosParam.PlateH;
+                    }
                     if (LastResult.Equals(98))
                     if (LastResult.Equals(98))
                     {
                     {
                         InLog(" " + MoveInfo.SLog + " 出库料，开始拦截空托盘   "); 
                         InLog(" " + MoveInfo.SLog + " 出库料，开始拦截空托盘   ");