From aa77240aba2a41a9a653f6400ed1ff54310f92d4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 13:03:31 +0800
Subject: [PATCH] 字典
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 8 +--
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs | 88 +++++++++++++++++++++++++------------------
2 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index 2c871d0..d57dee4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -41,7 +41,7 @@
{
strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, "澧炲姞瀛愰」", strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -52,7 +52,7 @@
{
string strGuid = "";
string strUpGuid = "";
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, "澧炲姞椤圭洰", strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -97,15 +97,13 @@
this.toolStripMenuItemEdt.Click += (s, ee) =>
{
string strGuid = "";
- string strTitle = "";
string strUpGuid = "";
if (tlMenu.FocusedNode != null)
{
strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
- strTitle = tlMenu.FocusedNode.GetValue("defectName").ToString();
strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strTitle, strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
index 49fed12..8e18dd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -3,7 +3,6 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
using System.Data;
@@ -11,46 +10,36 @@
{
public partial class Frm_MesDefectCodeShow : DevExpress.XtraEditors.XtraForm
{
- string lbGuid = "";
- string strTitle = "";
+ string strGuid = "";
string strUpGuid = "";
string _webServiceName = "MesDefectCodeManager/";
- public Frm_MesDefectCodeShow(string _lbGuid, string _strTitle, string _strUpGuid)
+ public Frm_MesDefectCodeShow(string _strGuid, string _strUpGuid)
{
InitializeComponent();
getSelect();
- this.lbGuid = _lbGuid;
- this.strTitle = _strTitle;
+ this.strGuid = _strGuid;
this.strUpGuid = _strUpGuid;
- if (string.IsNullOrEmpty(lbGuid))
- {
- this.Text = strTitle;
+
+ //杩欐槸鏇存柊
+ if (!string.IsNullOrEmpty(this.strGuid)) {
+ getMode(strGuid);
+ this.Text = "鏇存柊銆�" + txt_defectName.Text + "銆�";
+ txt_sType.Enabled = false;
+ return;
}
- else
+ //杩欐槸澧炲姞瀛愰」
+ if (!string.IsNullOrEmpty(strUpGuid))
{
- this.Text = "鏇存柊銆�" + strTitle + "銆�";
- var _obj = new
- {
- guid = lbGuid,//涓诲缓
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- dynamic dy = _rtn.rtnData;
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true);
- txt_sType.Enabled = false;
- }
- else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ getMode(strUpGuid);
+ this.Text = "澧炲姞銆�" + txt_defectName.Text + "銆戠殑瀛愰」鐩�";
+ txt_sType.Enabled = false;
+ txt_defectCode.Text = "";
+ txt_defectName.Text = "";
+ return;
}
+
+ this.Text = "澧炲姞鏂伴」";
+
}
private void btnQuery_Click(object sender, EventArgs e)
@@ -75,11 +64,11 @@
}
var _obj = new MesDefectCode()
{
- Guid = UtilityHelper.ToGuid(lbGuid.Trim()),
+ Guid = UtilityHelper.ToGuid(strGuid.Trim()),
DefectCode = txt_defectCode.Text.Trim(),
SType = txt_sType.Text.Trim(),
DefectName = txt_defectName.Text.Trim(),
- Pid= UtilityHelper.ToGuid(strUpGuid.Trim()),
+ Pid = UtilityHelper.ToGuid(strUpGuid.Trim()),
};
try
{
@@ -108,12 +97,12 @@
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
- private void getSelect() {
+ private void getSelect()
+ {
var _obj = new
{
-
+
};
var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectCategory", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
@@ -125,5 +114,30 @@
txt_sType.Properties.Items.Add(dr["typeMemo"].ToString());
}
}
+
+ private void getMode(string strGuid)
+ {
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true);
+
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3