From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 125 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 23 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index a61d089..cd64688 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -31,6 +31,9 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
{
@@ -70,7 +73,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -160,14 +163,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
@@ -224,15 +228,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>();
@@ -240,6 +249,65 @@
{
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()),
@@ -255,6 +323,7 @@
FupAllow = row["FupAllow"].ToString(),
FdownAllow = row["FdownAllow"].ToString(),
});
+ }
}
var _obj = new MesQmCheckitem
{
@@ -305,7 +374,7 @@
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
- "a.create_date", "asc", "", _sbSqlWhere.ToString());
+ "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -322,6 +391,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -339,7 +409,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid)
@@ -384,6 +453,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -431,7 +501,6 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
var _obj = new
{
guid = rowGuid,
@@ -447,28 +516,39 @@
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
-
#region 浠ヤ笅涓虹绉嶄笅鎷�
private void _setIno()
{
- txt_ItemId.EditChanged += (s, e) =>
+ this.txt_fSubsidiary.EditChanged += (s, e) =>
{
- txt_itemModel.Text = this.txt_ItemId.GetModel();
- txt_itemNo.Text = this.txt_ItemId.GetCode();
+ string _orgId = txt_fSubsidiary.GetId();
+ if (string.IsNullOrEmpty(_orgId))
+ return;
+ txt_itemId.getSuppler(_orgId);
+ //txt_gg.Text ="";
+ //txt_itemNo.Text = "";
};
-
+ 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();
+ };
_getListJyxm();
_getListJygj();
_getListJybz();
@@ -709,6 +789,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3