From 878aad490fc15b11d63fb4fa7ab7ada260f66310 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 09 八月 2025 10:03:59 +0800
Subject: [PATCH] iqc称重
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index 34e2189..1aebbbc 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -72,6 +72,9 @@
if (strType == QcSeason.閿�鍞��璐у叆搴撴.ToString())
rptName = "rpt_Xsth";
else
+ if (strType == QcSeason.濮斿閫�鏂欏叆搴撴.ToString())
+ rptName = "rpt_wwtl";
+ else
if (strType == QcSeason.瓒呮湡妫�.ToString())
{
rptName = "";
@@ -118,32 +121,36 @@
string rowGuid = txt_aboutGuid.Text.Trim();
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, strType);
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
- {
- string rptParameter = rptName + "{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ if (strAction == "print") {
+ try
{
- rpt.ShowDialog();
+ string rptParameter = rptName + "{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
//鑷姩璁＄畻鎵撳嵃閲�
@@ -425,11 +432,14 @@
{
toolBarMenu1.isSetBtn = false;
string rkckid = txt_rkCkId.GetId();
- if (string.IsNullOrEmpty(rkckid))
+ if (strType != QcSeason.瓒呮湡妫�.ToString())
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
- txt_rkCkId.Focus();
- return;
+ if (string.IsNullOrEmpty(rkckid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
+ txt_rkCkId.Focus();
+ return;
+ }
}
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
--
Gitblit v1.9.3