From da1667144a6160a2ea78e9c4b112272dea20cbec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:55:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index e1dd499..0210f25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -1,9 +1,12 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.Utils.MVVM.Services;
+using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -13,17 +16,33 @@
string _webServiceName = "MesQaItemsDetect01Manager/";
private string dt01Guid = "";
bool isEdit = false;
+ string strBhg = "脳";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_dt01Guid">MES_QA_ITEMS_DETECT_01琛℅Uidance</param>
+ /// <param name="_blEdit">鏄惁鍙紪杈�</param>
public Frm_MesQaItemsDetect01Input(string _dt01Guid, bool _blEdit)
{
InitializeComponent();
this.dt01Guid = _dt01Guid;
this.isEdit = _blEdit;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- getModel();
+ //缂栬緫浜嬩欢
gvMx1.CellValueChanged += GvMx1_CellValueChanged;
+ //鍙栨秷涓嶇鍚堟潯浠剁殑缂栬緫
gvMx1.ShowingEditor += GvMx1_ShowingEditor;
+ //绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍间笖鏀瑰彉棰滆壊
gvMx1.CustomDrawCell += GvMx1_CustomDrawCell;
+ getModel();
+
+ this.FormClosing += (s, e) =>
+ {
+ textEdit1.Focus();
+ };
}
+
+
/// <summary>
/// 鍒ゆ柇鍗曞厓鏍肩殑缂栬緫鎬�
@@ -38,6 +57,10 @@
return false;
if (_FieldName == "鏍锋湰鏁�")
return true;
+
+ if (_FieldName.Contains("jg"))
+ return false;
+
if (string.IsNullOrEmpty(_maxYbs))
return false;
string _seqYb = _FieldName.Replace("鏍锋湰", "");
@@ -46,25 +69,43 @@
return true;
}
+ /// <summary>
+ /// 绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void GvMx1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
{
+ // 鑾峰彇鍗曞厓鏍肩殑鍊�
string _maxYbs = (gvMx1.GetRowCellValue(e.RowHandle, "鏍锋湰鏁�").ToString());
bool _bl = ckCol(e.Column.FieldName, _maxYbs);
if (_bl)
{
- e.Appearance.BackColor = Color.Azure;
+ e.Appearance.BackColor = Color.LightBlue;
+ e.Appearance.ForeColor = Color.Blue;
e.Column.MinWidth = 50;
}
else
{
e.Appearance.BackColor = Color.LightGray;
}
-
e.Column.OptionsColumn.ReadOnly = !isEdit;
+ if (e.Column.Name.Contains("鏍锋湰") && e.Column.Name != "鏍锋湰鏁�")
+ {
+ object value = gvMx1.GetRowCellValue(e.RowHandle, e.Column + "jg");
+ if (value != null && value.ToString() == strBhg)
+ {
+ e.Appearance.BackColor = Color.Red;
+ e.Appearance.ForeColor = Color.White;
+ }
+ ;
+ }
}
private void GvMx1_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
+ if (e.Column.FieldName.Contains("jg"))
+ return;
try
{
// 鑾峰彇琛屽彞鏌�
@@ -104,11 +145,15 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError(_outMsg);
gvMx1.SetRowCellValue(rowHandle, dtCol, "");
}
+ else
+ {
+ //濡傛灉涓嶅悎鏍硷紝瀛樿繘鍘�
+ string _outFstand = _rtn.rtnData.outFstand;
+ gvMx1.SetRowCellValue(rowHandle, dtCol + "jg", _outFstand);
+ }
+ //濡傛灉鏄牱鏈暟锛岃閲嶆柊鍒锋柊
if (_strYbNo == "鏍锋湰鏁�")
getModel();
- //lbGuid.Text = _rtn.rtnData.outGuid;
- //txt_hNo.Text = _rtn.rtnData.outNo;
- //toolBarMenu1.isSetBtn = true;
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -126,7 +171,6 @@
bool _bl = ckCol(view.FocusedColumn.FieldName, _maxYbs);
if (!_bl)
e.Cancel = true;
-
}
private void getModel()
@@ -150,6 +194,14 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ // 闅愯棌涓嶅繀瑕佺殑鍒�,鍚屾椂鎶婁笉鍚堟牸鐨勫瓨杩涘幓
+ foreach (DataColumn col in dt.Columns)
+ {
+ if (col.ColumnName.Contains("jg"))
+ {
+ gvMx1.Columns[col.ColumnName].Visible = false;
+ }
+ }
gvMx1.Columns["guid"].Visible = false;
gvMx1.Columns["parentGuid"].Visible = false;
}
--
Gitblit v1.9.3