From aa8f2ab61f7c87640de7817b77758c78e9c45792 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 15 三月 2025 10:54:01 +0800
Subject: [PATCH] 样品检验
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 8183fc8..1894c76 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -18,7 +18,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
-
public Frm_MesQmCheckitemDt()
{
InitializeComponent();
@@ -31,6 +30,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
{
@@ -136,7 +136,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -196,7 +196,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gridView2);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
@@ -212,11 +212,11 @@
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gridView2);
- UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
xtraTabPageCopy.PageEnabled = false;
}
-
+
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -233,6 +233,7 @@
return;
}
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -293,7 +294,8 @@
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 {
+ else
+ {
MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
return;
}
@@ -312,12 +314,12 @@
SampleSizeNo = row["SampleSizeNo"].ToString(),
FcheckTool = row["FcheckTool"].ToString(),
FcheckLevel = row["FcheckLevel"].ToString(),
- Fstand = row["Fstand"].ToString(),
+ Fstand = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["Fstand"].ToString()),
FacLevel = row["FacLevel"].ToString(),
FspecRequ = row["FspecRequ"].ToString(),
Memo = row["memo"].ToString(),
- FupAllow = row["FupAllow"].ToString(),
- FdownAllow = row["FdownAllow"].ToString(),
+ FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
+ FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
});
}
}
@@ -346,7 +348,7 @@
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gridView2);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
}
}
catch (Exception ex)
@@ -360,7 +362,7 @@
}
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -380,17 +382,18 @@
UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
+ gcMain1.DataSource = null;
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns();
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -433,17 +436,14 @@
{
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- var gvList =
- new List<GridView>();
+ var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(panel1.Controls, dy,
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy,
isEdit, gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -514,10 +514,14 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue>0?"1":"0");
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
+ else {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
}
}
catch (Exception ex)
--
Gitblit v1.9.3