From 6b7f640c7952a3948b896d4c585d416f546788a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 17 七月 2025 08:17:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 129 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3ffbf41..b2d18c1 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
+ 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();
@@ -40,22 +43,32 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ 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 != "ipqc宸℃")
+ if (strType == QcSeason.fqc.ToString())
+ dfValue = 999;
+ //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
+ if (strType != QcSeason.ipqc宸℃.ToString())
{
gvMx1.Columns["stationName"].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);
@@ -82,7 +95,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();
};
}
@@ -248,7 +261,7 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _ItemId = txt_itemId.GetId();
+ string _ItemId = txt_itemId.EditValue.ToString().Trim();
if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -303,12 +316,16 @@
}
if (string.IsNullOrEmpty(row["ypsl"].ToString()))
{
- MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Fstand = row["Fstand"].ToString();
string _FupAllow = row["FupAllow"].ToString();
string _FdownAllow = row["FdownAllow"].ToString();
+ string _isRzxxTxt = row["isRzxx"].ToString();
+ bool _isRzxx = false;
+ if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
+ _isRzxx = true;
//鍋囧涓変釜閮戒负绌洪�氳繃
if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
{
@@ -349,6 +366,8 @@
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,
});
}
}
@@ -369,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>();
@@ -380,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)
@@ -436,10 +457,13 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -447,7 +471,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -464,12 +488,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);
@@ -480,6 +502,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -488,12 +511,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -524,7 +547,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -565,26 +588,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();
@@ -592,7 +623,9 @@
_getListJssp();
_getListJysp();
_getListStation();
+ _getListGroup();
}
+
/// <summary>
/// 璇诲彇妫�楠岄」鐩�
/// </summary>
@@ -611,7 +644,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -637,10 +670,8 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
-
}
/// <summary>
/// 璇诲彇妫�楠屽伐鍏�
@@ -660,7 +691,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -680,13 +711,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>
@@ -726,7 +755,22 @@
,"7.鐗规畩妫�楠屾按骞�(S4)"
});
}
-
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListGroup()
+ {
+ rptGroup.Items.AddRange(new string[] {
+ "澶栬"
+ ,"棰滆壊"
+ ,"灏哄"
+ , "鍏抽敭閮ㄤ欢涓�鑷存��"
+ , "鍝佹按娴嬭瘯"
+ ,"鍒剁儹鎬ц兘"
+ ,"杩涙按鍘嬪姏"
+ ,"鐢垫皵鎬ц兘"
+ });
+ }
/// <summary>
/// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
/// </summary>
@@ -748,6 +792,11 @@
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
}
}
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
--
Gitblit v1.9.3