From 5bf6668fc8a570f64498888b8d923911485180b3 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 11 八月 2025 17:43:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 90 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index cb731d4..57b9eda 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -20,7 +20,11 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
public string strType = "";//iqc type
- public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
+ public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒欑湅涓嬮潰
+ 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,40 @@
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;
+ gvMx1.Columns["funit"].Visible = true;
+ gvMx1.Columns["funit"].VisibleIndex = 13;
+ gvMx1.Columns["fcheckType"].Visible = false;
+ }
+ if (strType == QcSeason.fqc.ToString())
+ {
+ dfValue = 0;
+ gvMx1.Columns["ypsl"].Visible = false;
+ }
+ if (strType == QcSeason.ipqc棣栨.ToString())
+ {
+ dfValue = 0;
+ gvMx1.Columns["ypsl"].Visible = false;
+
+ }
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
- if (strType != "ipqc宸℃")
+ if (strType != QcSeason.ipqc宸℃.ToString())
{
gvMx1.Columns["stationName"].Visible = false;
- }
- //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
- if (strType != "ipqc棣栨")
- {
- gvMx1.Columns["isRzxx"].Visible = false;
+ gvMx1.Columns["fcheckType"].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();
@@ -231,6 +251,8 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_itemId.Enabled = false;
}
/// <summary>
@@ -311,7 +333,7 @@
}
if (string.IsNullOrEmpty(row["ypsl"].ToString()))
{
- MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Fstand = row["Fstand"].ToString();
@@ -363,6 +385,7 @@
stationName = row["stationName"].ToString(),
FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
+ Funit = row["funit"].ToString(),
});
}
}
@@ -383,9 +406,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 +417,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 +475,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -464,7 +489,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -504,12 +529,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -534,13 +559,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 + "鍚楋紵"))
@@ -568,6 +594,7 @@
}
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -577,11 +604,12 @@
Form parentForm = this.FindForm();
UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
}
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -637,7 +665,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -663,7 +691,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -684,7 +712,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -708,7 +736,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -731,6 +759,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>
@@ -817,12 +848,17 @@
_webServiceName + "DeleteModelMx",
JsonConvert.SerializeObject(lst));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3