From f5570a2f60dc9b9c201dcc8b227510a89bf69042 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 七月 2025 11:29:32 +0800
Subject: [PATCH] 工序增加是否追溯码
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index cd41086..3e0ca04 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -14,7 +14,7 @@
{
public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm
{
- string _strTag= "N:涓嶅悎鏍�";
+ string _strTag = "N:涓嶅悎鏍�";
string _webServiceName = "FqcManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_FqcDetect01()
@@ -28,7 +28,7 @@
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -295,12 +295,12 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
- ///鎻愪氦妫�楠屼簨浠�
+ ///瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -611,7 +611,7 @@
txt_msg.Focus();
return;
}
-
+
if (txt_fngHandle.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("褰撲笉鍚堟牸鏃讹紝璇烽�夋嫨澶勭疆缁撴灉锛�");
@@ -924,7 +924,7 @@
/// <param name="curPage"></param>
private void getRptDefectLevel()
{
- string _where = " and 1=1 and s_type='缂洪櫡绛夌骇'";
+ string _where = " and 1=1 and a.s_type='缂洪櫡绛夌骇' and a.pid<>'00000000-0000-0000-0000-000000000000'";
var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
var json = JsonConvert.SerializeObject(pgq);
try
@@ -952,7 +952,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='FQC缂洪櫡鎻忚堪'");
+ UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
--
Gitblit v1.9.3