From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 83cda47..8b8ac2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -403,6 +403,14 @@
this.ucUpFileList1.pGuid = "";
this.ucChouJianList1.pGuid = "";
this.setEable(false);
+
+ //澧炲姞鐨勬椂鍊欑姝�2025-08-14 beg
+ this.txt_msg.Enabled = false;
+ this.txt_fngHandle.Enabled = false;
+ this.txt_zrType.Enabled = false;
+ this.txt_fzrId.Enabled = false;
+ this.txt_fmrmode.Enabled = false;
+ //澧炲姞鐨勬椂鍊欑姝�2025-08-14 end
}
/// <summary>
/// 淇敼浜嬩欢
@@ -432,6 +440,16 @@
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
this.setEable(true);
}
+
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_lotNo.Enabled = false;
+ txt_kbList.Enabled = false;
+ //txt_fPurchaserId.IsReadly = true;
+ this.txt_msg.Enabled = true;
+ this.txt_fngHandle.Enabled = true;
+ this.txt_zrType.Enabled = true;
+ this.txt_fzrId.Enabled = true;
+ this.txt_fmrmode.Enabled = true;
}
/// <summary>
@@ -455,7 +473,7 @@
string _txt_lotNo1 = txt_lotNo1.Text.Trim();//閫佹鎵瑰彿
string _txt_lotNo = txt_lotNo.Text.Trim();//鐢熶骇宸ュ崟
string _kbList = txt_kbList.Text.Trim();
- if (txt_djType.SelectedIndex <= 0)
+ if (txt_djType.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
txt_djType.Focus();
@@ -699,7 +717,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -796,7 +814,6 @@
if (e.Page.Name == "tabMxPage2")
{
ucChouJianList1.getList14();
-
}
if (e.Page.Name == "tabMxPage3")
{
@@ -851,7 +868,6 @@
btnLoad.Enabled = bl;
ucChouJianList1.IsReadOnly(!bl);
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
-
}
/// <summary>
--
Gitblit v1.9.3