From adc3fd8af6ff791cd3f924890419cd0cba385f51 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:48:34 +0800
Subject: [PATCH] 调整审核的文字提示
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index cb731d4..54ea4a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -21,6 +21,10 @@
private readonly string _webServiceName = "MesQmCheckitemManager/";
public string strType = "";//iqc type
public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
+ private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftFcheckLevel = "2.涓�鑸楠屾按骞�(II)";//榛樿妫�楠屾按骞�
+ private string dftFacLevel = "2.50---(AQL_0_250)";//榛樿鎺ユ敹姘村钩
public Jyxm(string _strType)
{
InitializeComponent();
@@ -42,24 +46,25 @@
toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
//绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
- if (strType == "iqc")
+ if (strType == QcSeason.iqc.ToString())
dfValue = 5;
+ if (strType == QcSeason.fqc.ToString())
+ dfValue = 999;
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
- if (strType != "ipqc宸℃")
+ if (strType != QcSeason.ipqc宸℃.ToString())
{
gvMx1.Columns["stationName"].Visible = false;
- }
- //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
- if (strType != "ipqc棣栨")
- {
- gvMx1.Columns["isRzxx"].Visible = false;
}
//鏂拌鍒濆鍊�
this.gvMx1.InitNewRow += (s, e) =>
{
- this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
int newIndex = gvMx1.DataRowCount + 1;
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeName", dftSsampleSizeName);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeNo", dftSsampleSizeNo);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "facLevel", dftFacLevel);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "fcheckLevel", dftFcheckLevel);
};
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
@@ -311,7 +316,7 @@
}
if (string.IsNullOrEmpty(row["ypsl"].ToString()))
{
- MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Fstand = row["Fstand"].ToString();
@@ -383,9 +388,9 @@
JsonConvert.SerializeObject(_obj));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
var gridViews = new List<GridView>();
@@ -394,10 +399,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
catch (Exception ex)
@@ -450,7 +457,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -464,7 +471,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -504,12 +511,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -534,13 +541,14 @@
case 2:
strMsg = "鎵瑰噯";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -581,7 +589,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -637,7 +645,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -663,7 +671,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -684,7 +692,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -708,7 +716,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -731,6 +739,9 @@
,"1.50---(AQL_0_150)"
,"2.00---(AQL_0_200)"
,"2.50---(AQL_0_250)"
+ ,"4.00---(AQL_0_400)"
+ ,"6.50---(AQL_0_650)"
+ ,"10.00---(AQL_1_000)"
});
}
/// <summary>
--
Gitblit v1.9.3