From e55375b7e21c648b08257312e88a9848996d82b7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 16:48:43 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 147 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 53 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3a34c9e..bff9872 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,10 +18,13 @@
public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
- string _ucItem = "";//鐗╂枡
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();
@@ -43,28 +46,44 @@
toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
//绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
- if (strType == "iqc")
- dfValue = 5;
+ 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();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -91,7 +110,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
return;
}
- JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
+ JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
frm.ShowDialog();
};
}
@@ -257,14 +276,7 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _orgId = txt_fSubsidiary.GetId();
- if (string.IsNullOrEmpty(_orgId))
- {
- MsgHelper.Warning("璇烽�夋嫨浣跨敤缁勭粐锛�");
- txt_fSubsidiary.Focus();
- return;
- }
- string _ItemId = txt_itemId.GetId();
+ string _ItemId = txt_itemId.EditValue.ToString().Trim();
if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -319,7 +331,7 @@
}
if (string.IsNullOrEmpty(row["ypsl"].ToString()))
{
- MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Fstand = row["Fstand"].ToString();
@@ -369,7 +381,9 @@
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
stationName = row["stationName"].ToString(),
+ FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
+ Funit = row["funit"].ToString(),
});
}
}
@@ -390,9 +404,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>();
@@ -401,10 +415,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)
@@ -457,7 +473,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -471,7 +487,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -488,12 +504,10 @@
if (_rtn.rtnCode > 0)
{
var dy = _rtn.rtnData;
- _ucItem = dy.itemId;
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
- _ucItem = "";
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -504,6 +518,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -512,12 +527,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -542,13 +557,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 + "鍚楋紵"))
@@ -589,26 +605,34 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
#region 浠ヤ笅涓虹绉嶄笅鎷�
private void _setIno()
{
- this.txt_fSubsidiary.EditChanged += (s, e) =>
+ txt_itemId.Click += (s, e) =>
{
- string _orgId = txt_fSubsidiary.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
- txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
- };
- txt_itemId.EditChanged += (s, e) =>
- {
- if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
- txt_gg.Text = this.txt_itemId.GetModel();
- if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
- txt_itemNo.Text = this.txt_itemId.GetCode();
+ var frm = new JyxmShow(this.strType);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ txt_itemId.Text = lst[0].itemId;
+ txt_gg.Text = lst[0].itemModel;
+ txt_mc.Text = lst[0].itemName;
+ txt_itemNo.Text = lst[0].itemNo;
+ txt_fSubsidiary.Text = lst[0].fSubsidiary;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
_getListJyxm();
_getListJygj();
@@ -616,7 +640,9 @@
_getListJssp();
_getListJysp();
_getListStation();
+ _getListGroup();
}
+
/// <summary>
/// 璇诲彇妫�楠岄」鐩�
/// </summary>
@@ -635,7 +661,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -661,7 +687,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -682,7 +708,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -702,13 +728,11 @@
foreach (DataRow dr in dt.Rows)
{
rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
- //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
- //string ddddd = dr["SampleSizeName"].ToString();
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -731,6 +755,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>
@@ -748,7 +775,22 @@
,"7.鐗规畩妫�楠屾按骞�(S4)"
});
}
-
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListGroup()
+ {
+ rptGroup.Items.AddRange(new string[] {
+ "澶栬"
+ ,"棰滆壊"
+ ,"灏哄"
+ , "鍏抽敭閮ㄤ欢涓�鑷存��"
+ , "鍝佹按娴嬭瘯"
+ ,"鍒剁儹鎬ц兘"
+ ,"杩涙按鍘嬪姏"
+ ,"鐢垫皵鎬ц兘"
+ });
+ }
/// <summary>
/// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
/// </summary>
@@ -812,6 +854,5 @@
}
}
#endregion
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3