新建分支 SISO-ACSingleStore-202007

source/ACSingleStore/FrmBase.cs

@@ -44,7 +44,7 @@ namespace OnlineStore.ACSingleStore
             }
             }
             return str;
             return str;
         }
         }
-        internal static string GetCodeNum(string codeName = "RC-SISO-ACSingleStore")
+        internal static string GetCodeNum(string codeName = "SISO-ACSingleStore-202007")
         {
         {
             byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
             byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
             string result = "";
             string result = "";

source/ACSingleStore/FrmStoreBox.cs

@@ -197,6 +197,7 @@ namespace OnlineStore.ACSingleStore
             //ReadPosistion();
             //ReadPosistion();
             if (store.storeRunStatus > StoreRunStatus.Wait)
             if (store.storeRunStatus > StoreRunStatus.Wait)
             {
             {
+                btnHul.Visible = store.NeedShowBtn();
                 if (启动ToolStripMenuItem.Enabled.Equals(true))
                 if (启动ToolStripMenuItem.Enabled.Equals(true))
                 {
                 {
                     StoreOpenStatus(true);
                     StoreOpenStatus(true);
@@ -267,6 +268,7 @@ namespace OnlineStore.ACSingleStore
             }
             }
             else
             else
             {
             {
+                btnHul.Visible = false;
                 lblThisSta.Text = WaitStart;
                 lblThisSta.Text = WaitStart;
                 //lblWarnMsg.Text = "";
                 //lblWarnMsg.Text = "";
                 btnStartAuTo.Text = StartAuto;
                 btnStartAuTo.Text = StartAuto;
@@ -1225,6 +1227,11 @@ namespace OnlineStore.ACSingleStore
             IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
             IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
         }
         }
 
 
-
+        private void btnHul_Click(object sender, EventArgs e)
+        {
+            LogUtil.info("用户点击：" + btnHul.Text);
+           bool result= store.BtnNextPro();
+            btnHul.Visible = store.NeedShowBtn();
+        }
     }
     }
 }
 }

source/ACSingleStore/resource/ResourceMap.csv

@@ -429,3 +429,5 @@ FrmIOStatus_label14_Text,地址:,Address:
 FrmStoreBox_groupBox2_Text,料仓操作,SMD BOX operation
 FrmStoreBox_groupBox2_Text,料仓操作,SMD BOX operation
 FrmStoreBox_btnUpDownP1_Text,升降轴吸盘下方取料点P1:,l-axis picking P1:
 FrmStoreBox_btnUpDownP1_Text,升降轴吸盘下方取料点P1:,l-axis picking P1:
 FrmPositionTool_label8_Text,速度：,Speed：
 FrmPositionTool_label8_Text,速度：,Speed：
+FrmStoreBox_btnOpenAutoInOut_Text,开启自动出入库,Open automatic inbound and outbound
+FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection signal