改造修改

source/DeviceLibrary/deviceLibrary/IO/IOManager.cs

@@ -41,8 +41,24 @@ namespace OnlineStore.DeviceLibrary
             ConfigIO configIo = GetDO(ioType, subType);
             ConfigIO configIo = GetDO(ioType, subType);
             if (configIo != null)
             if (configIo != null)
             {
             {
-                instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
-                Thread.Sleep(10);
+                //instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
+                //Thread.Sleep(20);
+                int tryCount = 1;
+                if (subType == 1)
+                {
+                    tryCount = 5;
+                }
+                while (!IOValue(ioType, subType).Equals(ioValue))
+                {
+                    instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
+                    Thread.Sleep(20);
+                    tryCount--;
+                    if (tryCount <= 0)
+                    {
+                        LogUtil.error("IO操作失败，未能设置到目标值[" + ioValue + "]，请检查设备连接或配置！[" + ioType + "][" + subType + "]");
+                        break;
+                    }
+                }
             }
             }
             else
             else
             {
             {

source/XLRStoreClient/inputForm/FrmInputEquip.cs

@@ -32,6 +32,11 @@ namespace OnlineStore.XLRStore
             Control.CheckForIllegalCrossThreadCalls = false;
             Control.CheckForIllegalCrossThreadCalls = false;
             InitializeComponent();
             InitializeComponent();
             LoadIOList();
             LoadIOList();
+            this.inputEquip.turnoverBoxes.ForEach(box =>
+            {
+                comboBox1.Items.Add(box.Name);
+            });
+            comboBox1.SelectedIndex = 0;
         }
         }
         protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
         protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
         protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
         protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
@@ -180,9 +185,9 @@ namespace OnlineStore.XLRStore
         {
         {
             this.Invoke(new Action(() =>
             this.Invoke(new Action(() =>
             {
             {
-                if(inputEquip.GetNGBoxState(out string state))
+                if (inputEquip.GetNGBoxState(out string state))
                 {
                 {
-                    lblNGState.BackColor =Color.White;
+                    lblNGState.BackColor = Color.White;
                 }
                 }
                 else
                 else
                 {
                 {
@@ -540,32 +545,6 @@ namespace OnlineStore.XLRStore
         }
         }
 
 
 
 
-        private void Shelf_StopUp_B_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void Shelf_StopDown_B_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void LineStart_B_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void LineBack_B_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void LineStop_B_Click(object sender, EventArgs e)
-        {
-
-        }
-
-
         private void btnSave_Click(object sender, EventArgs e)
         private void btnSave_Click(object sender, EventArgs e)
         {
         {
             StoreManager.SaveInputEquipConfig(inputEquip.Config);
             StoreManager.SaveInputEquipConfig(inputEquip.Config);
@@ -773,6 +752,91 @@ namespace OnlineStore.XLRStore
         {
         {
             inputEquip.ClearNGBoxCnt();
             inputEquip.ClearNGBoxCnt();
         }
         }
+
+        private void groupDO_Enter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button10_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.TranverseUp();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+        TurnoverBox turnoverBox;
+        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(comboBox1.SelectedIndex>=0)
+            {
+                turnoverBox = inputEquip.turnoverBoxes[comboBox1.SelectedIndex];
+                LogUtil.info(inputEquip.BatchMove.Name + "选择：" + turnoverBox?.Name);
+            }
+
+        }
+
+        private void btnTranverRun_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.TranverseRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void btnTranverBackRun_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.TranverseBackRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void btnTranverDown_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.TranverseDown();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button13_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.Transition_RollerRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button14_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.Transition_RollerBackRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button15_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.Transition_RollerStopRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button10_Click_1(object sender, EventArgs e)
+        {
+            turnoverBox?.Transition_RollerStopRun();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button11_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.StopUp();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
+
+        private void button12_Click(object sender, EventArgs e)
+        {
+            turnoverBox?.StopDown();
+            var btn = sender as Button;
+            LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
+        }
     }
     }
 
 
 }
 }