From d7a44d991ee3bbc31fd20e702a490aad7d059b1b Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 06 二月 2025 16:32:50 +0800 Subject: [PATCH] 物料检验项目 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 92 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 78 insertions(+), 14 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index 0446616..6b39a5f 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -67,8 +67,6 @@ frm.ShowDialog(); }; btnSave.Click += BtnSave_Click; - - } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -227,15 +225,20 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; - string _ItemId = txt_ItemId.GetId(); + string _ItemId = txt_itemId.GetId(); if (string.IsNullOrEmpty(_ItemId)) { MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); - txt_ItemId.Focus(); + txt_itemId.Focus(); return; } gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); + if (gvMx1.DataRowCount <= 0) + { + MsgHelper.Warning("椤圭洰鏄庣粏涓嶈兘涓虹┖锛�"); + return; + } try { var lst = new List<MesQmCheckitemDt>(); @@ -243,11 +246,68 @@ { var row = gvMx1.GetDataRow(i); if (row != null) + { + if (string.IsNullOrEmpty(row["forder"].ToString())) + { + MsgHelper.ShowError("椤哄簭涓嶈兘涓虹┖锛�"); + return; + } + if (string.IsNullOrEmpty(row["FcheckItem"].ToString())) + { + MsgHelper.ShowError("妫�楠岄」鐩笉鑳戒负绌猴紒"); + return; + } + if (string.IsNullOrEmpty(row["FcheckTool"].ToString())) + { + MsgHelper.ShowError("妫�楠屽伐鍏蜂笉鑳戒负绌猴紒"); + return; + } + if (string.IsNullOrEmpty(row["SampleSizeNo"].ToString())) + { + MsgHelper.ShowError("妫�楠屾爣鍑嗕笉鑳戒负绌猴紒"); + return; + } + if (string.IsNullOrEmpty(row["FcheckLevel"].ToString())) + { + MsgHelper.ShowError("妫�楠屾按骞充笉鑳戒负绌猴紒"); + return; + } + if (string.IsNullOrEmpty(row["FacLevel"].ToString())) + { + MsgHelper.ShowError("鎺ュ彈姘村钩涓嶈兘涓虹┖锛�"); + return; + } + string _Fstand = row["Fstand"].ToString(); + string _FupAllow = row["FupAllow"].ToString(); + string _FdownAllow = row["FdownAllow"].ToString(); + //鍋囧涓変釜閮戒负绌洪�氳繃 + if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow)) + { + + } + else + { + if (!string.IsNullOrEmpty(_Fstand) && !string.IsNullOrEmpty(_FupAllow) && !string.IsNullOrEmpty(_FdownAllow)) + { + decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand); + decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow); + decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow); + if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { } + else { + MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒"); + return; + } + } + else + { + MsgHelper.ShowError("璇峰~鍐欐纭殑涓婇檺锛屾爣鍑嗗�硷紝涓嬮檺锛�"); + return; + } + } lst.Add(new MesQmCheckitemDt { Guid = UtilityHelper.ToGuid(row["guid"].ToString()), - // Forder = int.Parse(row["forder"].ToString()), - Forder = 0, + Forder = int.Parse(row["forder"].ToString()), FcheckItem = row["FcheckItem"].ToString(), SampleSizeNo = row["SampleSizeNo"].ToString(), FcheckTool = row["FcheckTool"].ToString(), @@ -259,6 +319,7 @@ FupAllow = row["FupAllow"].ToString(), FdownAllow = row["FdownAllow"].ToString(), }); + } } var _obj = new MesQmCheckitem { @@ -466,18 +527,21 @@ #region 浠ヤ笅涓虹绉嶄笅鎷� private void _setIno() { - this.txt_OrgName.EditChanged += (s, e) => { - string _orgId = txt_OrgName.GetId(); + this.txt_fSubsidiary.EditChanged += (s, e) => + { + string _orgId = txt_fSubsidiary.GetId(); if (string.IsNullOrEmpty(_orgId)) return; - txt_ItemId.getSuppler(_orgId); - txt_itemModel.Text =""; - txt_itemNo.Text = ""; + txt_itemId.getSuppler(_orgId); + //txt_gg.Text =""; + //txt_itemNo.Text = ""; }; - txt_ItemId.EditChanged += (s, e) => + txt_itemId.EditChanged += (s, e) => { - txt_itemModel.Text = this.txt_ItemId.GetModel(); - txt_itemNo.Text = this.txt_ItemId.GetCode(); + 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(); }; _getListJyxm(); _getListJygj(); -- Gitblit v1.9.3