From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能,板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整

---
 src/Bro.UI.Config/MenuForms/FrmConfig.cs |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Bro.UI.Config/MenuForms/FrmConfig.cs b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
index b58f66c..053494c 100644
--- a/src/Bro.UI.Config/MenuForms/FrmConfig.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
@@ -53,15 +53,21 @@
 
         private void buttonCreateConfig_Click(object sender, EventArgs e)
         {
-            string pCode = Interaction.InputBox("璇疯緭鍏ヤ骇鍝佺紪鐮�", "浜у搧缂栫爜", "", 0, 0);
-            if (string.IsNullOrWhiteSpace(pCode))
+            ProductionCodeEditForm productionCodeEditForm = new ProductionCodeEditForm();
+            if (productionCodeEditForm.ShowDialog(this) == DialogResult.OK)
             {
-                MessageBox.Show("璇疯緭鍏ヤ骇鍝佺紪鐮侊紒");
-                return;
+                string pCode = productionCodeEditForm.PCode;
+                productionCodeEditForm.Dispose();
+                if (string.IsNullOrWhiteSpace(pCode))
+                {
+                    MessageBox.Show("璇疯緭鍏ヤ骇鍝佺紪鐮侊紒");
+                    return;
+                }
+                Process.CreateNewConfig(propGrid.SelectedObject as IProcessConfig, pCode);
+                MessageBox.Show("鍒涘缓鏂伴厤缃畬鎴�");
+                PubSubCenter.GetInstance().Publish(PubSubCenterMessageType.UpdateProductionCodes.ToString(), null, null);
+
             }
-            Process.CreateNewConfig(propGrid.SelectedObject as IProcessConfig, pCode);
-            MessageBox.Show("鍒涘缓鏂伴厤缃畬鎴�");
-            PubSubCenter.GetInstance().Publish(PubSubCenterMessageType.UpdateProductionCodes.ToString(), null, null);
         }
     }
 }

--
Gitblit v1.8.0