From abac1dadf2ba8674a24bb0b91c75de5c7881df72 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 15:35:41 +0800
Subject: [PATCH] 同步为祈禧的代码
---
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 139 ++++++++++++++--------------------------------
1 files changed, 42 insertions(+), 97 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
index 9136842..ee98b78 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -17,166 +17,133 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
public string strType = "";//绫诲埆(鏅�氫俊鎭紝璁よ瘉淇℃伅)
- /// <summary>
- /// DefectCode绫荤殑鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="_strType">浼犲叆鐨勭被鍨嬪弬鏁帮紙濡�"QC鍩虹璧勬枡"锛岀敤浜庢爣璇嗘暟鎹被鍒級</param>
public DefectCode(string _strType)
{
- // 1. 鍒濆鍖栨帶浠跺竷灞�锛堣璁″櫒鑷姩鐢熸垚鐨勬柟娉曪紝璁剧疆鎺т欢浣嶇疆銆佸ぇ灏忕瓑锛�
InitializeComponent();
- // 灏嗕紶鍏ョ殑绫诲瀷鍙傛暟璧嬪�肩粰绫荤殑鎴愬憳鍙橀噺锛堝悗缁�昏緫涓娇鐢級
- strType = _strType;
-
- // 2. 缁戝畾宸ュ叿鏍忔寜閽簨浠讹紙鍔犺浇銆佹煡璇級
- // 缁戝畾"鍔犺浇"鎸夐挳鐐瑰嚮浜嬩欢锛氱偣鍑诲悗瑙﹀彂 ToolBarMenu1_btnLoadClick 鏂规硶
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- // 缁戝畾"鏌ヨ"鎸夐挳鐐瑰嚮浜嬩欢锛氱偣鍑诲悗瑙﹀彂 ToolBarMenu1_btnQueryClick 鏂规硶
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
-
- // 3. 閰嶇疆鏍戝舰鍒楄〃锛坱lMenu锛夌殑搴忓彿鍒楁牱寮�
- // 璁剧疆鏍戝舰鍒楄〃鐨�"搴忓彿鍒�"瀹藉害涓�50鍍忕礌
+ strType = _strType;
tlMenu.IndicatorWidth = 50;
- // 缁戝畾"鑷畾涔夌粯鍒跺簭鍙峰垪"浜嬩欢锛氳嚜瀹氫箟搴忓彿鏄剧ず閫昏緫
tlMenu.CustomDrawNodeIndicator += (s, ee) =>
{
- // 鍒ゆ柇褰撳墠缁樺埗鐨勬槸"搴忓彿鍒�"
if (ee.IsNodeIndicator)
{
- // 鑾峰彇褰撳墠鑺傜偣鍦ㄥ彲瑙佸垪琛ㄤ腑鐨勭储寮曪紙浠�0寮�濮嬶級
var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
- // 搴忓彿鏄剧ず涓�"绱㈠紩+1"锛堜粠1寮�濮嬭鏁帮級
ee.Info.DisplayText = (index + 1).ToString();
}
};
-
-
- // 4. 鍒濆鍔犺浇绗竴椤垫暟鎹�
getPageList(1);
-
-
- // 5. 缁戝畾鏍戝舰鍒楄〃榧犳爣鐐瑰嚮浜嬩欢锛堝悗缁彲鍦� TlMenu_MouseDown 涓鐞嗙偣鍑婚�昏緫锛�
this.tlMenu.MouseDown += TlMenu_MouseDown;
-
-
- // 6. 缁戝畾"娣诲姞瀛愯妭鐐�"鑿滃崟鎸夐挳浜嬩欢锛堝彸閿彍鍗曟垨宸ュ叿鏍忔寜閽級
this.toolStripMenuItemAdd.Click += (s, ee) =>
{
- // 鍒濆鍖栬妭鐐笽D锛堟柊澧炶妭鐐规殏鏈敓鎴怚D锛屼负绌猴級
string strGuid = "";
- // 鐖惰妭鐐笽D锛氬鏋滈�変腑浜嗘煇涓妭鐐癸紝鍒欎互璇ヨ妭鐐逛负鐖惰妭鐐癸紱鍚﹀垯鐖惰妭鐐逛负绌猴紙椤剁骇鑺傜偣锛�
string strUpGuid = "";
if (tlMenu.FocusedNode != null)
{
- // 鑾峰彇閫変腑鑺傜偣鐨�"guid"瀛楁鍊硷紝浣滀负鏂拌妭鐐圭殑鐖禝D
strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
}
-
- // 鎵撳紑鏂板鑺傜偣鐨勫脊绐楋紙鍙傛暟锛氳妭鐐笽D銆佺埗鑺傜偣ID銆佹暟鎹被鍨嬶級
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
- // 缁戝畾寮圭獥鐨�"鏇存柊鐖舵帶浠�"浜嬩欢锛氬脊绐楀叧闂悗鍒锋柊褰撳墠椤甸潰鏁版嵁
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid,strType);
frm.UpdateParent += (s2, ee2) =>
{
- getPageList(1); // 閲嶆柊鍔犺浇绗竴椤垫暟鎹�
+ getPageList(1);
+ // 渚嬪锛岄�氳繃ID鏌ユ壘鑺傜偣锛�
+ TreeListNode node = tlMenu.FindNodeByKeyID(strUpGuid);
+ if (node != null)
+ {
+ node.Expanded = true; // 灞曞紑鑺傜偣
+ tlMenu.MakeNodeVisible(node); // 纭繚鍙
+ }
};
- // 浠ユā鎬佺獥鍙ｆ樉绀哄脊绐楋紙闃诲褰撳墠鐣岄潰锛岀洿鍒板脊绐楀叧闂級
frm.ShowDialog();
};
-
-
- // 7. 缁戝畾"娣诲姞鏍硅妭鐐�"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemRoot.Click += (s, ee) =>
{
- // 鏂板鏍硅妭鐐癸細鑺傜偣ID鍜岀埗鑺傜偣ID鍧囦负绌猴紙鏃犵埗鑺傜偣锛�
string strGuid = "";
string strUpGuid = "";
- // 鎵撳紑鏂板寮圭獥锛堟槑纭坊鍔犳牴鑺傜偣锛岀埗ID涓虹┖锛�
Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
- // 寮圭獥鍏抽棴鍚庡埛鏂版暟鎹�
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
};
frm.ShowDialog();
};
-
-
- // 8. 缁戝畾"鍒犻櫎鑺傜偣"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemDel.Click += (s, ee) =>
{
- // 鍒ゆ柇鏄惁閫変腑浜嗚妭鐐癸紙鏈�変腑鍒欐彁绀猴級
if (tlMenu.FocusedNode != null)
{
- // 鑾峰彇閫変腑鑺傜偣鐨処D鍜屽悕绉帮紙鐢ㄤ簬鍒犻櫎纭锛�
string rowGuid = "";
string rowName = "";
rowGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
rowName = tlMenu.FocusedNode.GetValue("defectName").ToString();
-
- // 鑺傜偣ID涓虹┖鏃舵彁绀猴紙寮傚父鎯呭喌澶勭悊锛�
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- // 寮瑰嚭纭妗嗭細鎻愮ず鐢ㄦ埛鏄惁鍒犻櫎閫変腑鐨勮妭鐐�
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return; // 鐢ㄦ埛鍙栨秷鍒犻櫎锛岀洿鎺ヨ繑鍥�
-
- // 鍑嗗鍒犻櫎鍙傛暟锛氬皢鑺傜偣ID瀛樺叆鍒楄〃锛堥�傞厤鎺ュ彛鍙傛暟鏍煎紡锛�
+ return;
List<dynamic> lst = new List<dynamic>();
lst.Add(rowGuid);
var _obj = lst;
-
try
{
- // 璋冪敤WebService鎺ュ彛鍒犻櫎鑺傜偣锛圥OST璇锋眰锛屼紶鍏ヨ妭鐐笽D鍒楄〃锛�
string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- // 瑙ｆ瀽鎺ュ彛杩斿洖缁撴灉
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
- // 鎺ュ彛杩斿洖鎴愬姛锛坮tnCode>0锛夛細浠庢爲褰㈠垪琛ㄤ腑绉婚櫎璇ヨ妭鐐�
if (_rtn.rtnCode > 0)
{
tlMenu.DeleteNode(tlMenu.FocusedNode);
}
- // 鎺ュ彛杩斿洖澶辫触锛氭彁绀洪敊璇俊鎭�
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
- // 鎹曡幏寮傚父锛堝缃戠粶閿欒銆佹帴鍙ｆ姤閿欙級骞舵彁绀�
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
};
-
-
- // 9. 缁戝畾"缂栬緫鑺傜偣"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemEdt.Click += (s, ee) =>
{
- // 鑺傜偣ID锛氶�変腑鑺傜偣鐨処D锛堢敤浜庡洖鏄炬暟鎹級
string strGuid = "";
- // 鐖惰妭鐐笽D锛氶�変腑鑺傜偣鐨勭埗ID锛堢紪杈戞椂淇濇寔鐖惰妭鐐逛笉鍙橈級
string strUpGuid = "";
if (tlMenu.FocusedNode != null)
{
strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
}
-
- // 鎵撳紑缂栬緫寮圭獥锛堝弬鏁帮細鑺傜偣ID銆佺埗鑺傜偣ID銆佹暟鎹被鍨嬶級
Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
- // 寮圭獥鍏抽棴鍚庡埛鏂板綋鍓嶉〉闈㈡暟鎹�
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
+ // 渚嬪锛岄�氳繃ID鏌ユ壘鑺傜偣锛�
+ TreeListNode node = tlMenu.FindNodeByKeyID(strGuid);
+ if (node !=null)
+ {
+ node.Expanded = true; // 灞曞紑鑺傜偣
+ tlMenu.MakeNodeVisible(node); // 纭繚鍙
+ }
};
frm.ShowDialog();
};
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
}
/// <summary>
/// 鍙抽敭寮瑰嚭鑿滃崟,濡傛灉鏄锛屽鍔犲瓙椤圭洰锛屽惁鍒欏鍔犱富椤�
@@ -210,32 +177,10 @@
toolStripMenuItemAdd.Visible = false;
toolStripMenuItemEdt.Visible = false;
toolStripMenuItemDel.Visible = false;
- toolStripMenuItemRoot.Visible = true;
+ toolStripMenuItemRoot.Visible = false;//2025/07//11鏀逛负涓嶅鍔犱富椤圭洰浜�
cms1.Show(tlMenu, e.Location);
}
}
- }
-
-
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- _filterList.Clear();
- getPageList(1);
}
/// <summary>
///
@@ -258,9 +203,9 @@
tlMenu.KeyFieldName = "guid";
tlMenu.ParentFieldName = "pid";
tlMenu.EndUpdate();
- //this.tlMenu.CollapseAll();
+ this.tlMenu.CollapseAll();
// this.tlMenu.ExpandAll();
- this.tlMenu.ExpandToLevel(0);
+ // this.tlMenu.ExpandToLevel(0);
}
catch (Exception ex)
{
--
Gitblit v1.9.3