From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:22:09 +0800
Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息，添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿
---
src/Bro.UI.Config/MenuForms/FrmConfig.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/Bro.UI.Config/MenuForms/FrmConfig.cs b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
index 16331d8..053494c 100644
--- a/src/Bro.UI.Config/MenuForms/FrmConfig.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
@@ -3,6 +3,8 @@
using System;
using Microsoft.VisualBasic;
using System.Windows.Forms;
+using Bro.Common.PubSub;
+using static Bro.Common.Helper.EnumHelper;
namespace Bro.UI.Config.MenuForms
{
@@ -51,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;
- }
- Process.CreateNewConfig(propGrid.SelectedObject as IProcessConfig, pCode);
+ 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);
- MessageBox.Show("鍒涘缓鏂伴厤缃畬鎴�");
+ }
}
}
}
--
Gitblit v1.8.0