From 6d93b7c3b31dbc550d5957da6fe85043278b542c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 20 八月 2025 16:02:57 +0800
Subject: [PATCH] 增加成品检验报告和导出功能
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index a23cc49..d9c7793 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -32,6 +32,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -403,6 +404,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 +441,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 +474,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();
@@ -505,7 +524,7 @@
}
//褰撲笉鍚堟牸鏃剁殑妫�鏌�
string _txt_fngHandle = txt_fngHandle.Text.Trim();
- string _txt_fmrmode = txt_fmrmode.SelectedText.Trim();
+ string _txt_fmrmode = txt_fmrmode.Text.Trim();
string _txt_fzrId = txt_fzrId.GetId();
string _txt_workNo = txt_workNo.Text.Trim();
string _txt_zrType = txt_zrType.Text.Trim();
@@ -699,7 +718,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -796,7 +815,6 @@
if (e.Page.Name == "tabMxPage2")
{
ucChouJianList1.getList14();
-
}
if (e.Page.Name == "tabMxPage3")
{
@@ -851,7 +869,6 @@
btnLoad.Enabled = bl;
ucChouJianList1.IsReadOnly(!bl);
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
-
}
/// <summary>
@@ -905,6 +922,37 @@
frm.ShowDialog();
}
+ //鐢熶骇鎶ュ憡
+ private void ToolBarMenu1_btnBaoGaoClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetBaoGao", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鐢熸垚鎴愬姛");
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 妫�楠屽拰鍙嶆楠�
@@ -944,7 +992,7 @@
return;
}
string _txt_fngHandle = txt_fngHandle.Text.Trim();
- string _txt_fmrmode = txt_fmrmode.SelectedText.Trim();
+ string _txt_fmrmode = txt_fmrmode.Text.Trim();
string _txt_fzrId = txt_fzrId.GetId();
string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
--
Gitblit v1.9.3