From d48678b5f13f51369a545d959e21ba81b551e45a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 十二月 2024 17:28:59 +0800
Subject: [PATCH] 精细化
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 158 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 98 insertions(+), 60 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 8745dca..4845ef9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -35,26 +33,18 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(
- gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45,
- e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
//鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
_setIno();
}
-
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -76,7 +66,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -86,9 +76,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- var frm =
- new ShowFilter(gridView1.Columns,
- _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -101,7 +92,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
/// 鎵瑰噯
@@ -120,7 +111,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -198,7 +189,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -215,8 +206,19 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -262,7 +264,7 @@
{
toolBarMenu1.isSetBtn = false;
string _ItemId = txt_ItemId.GetId()
-; if (string.IsNullOrEmpty(_ItemId))
+; if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
txt_ItemId.Focus();
@@ -286,7 +288,7 @@
Fstand = row["Fstand"].ToString(),
FacLevel = row["FacLevel"].ToString(),
FspecRequ = row["FspecRequ"].ToString(),
- Memo = row["memo"].ToString(),
+ Memo = row["memo"].ToString(),
FupAllow = row["FupAllow"].ToString(),
FdownAllow = row["FdownAllow"].ToString(),
});
@@ -295,10 +297,12 @@
var _obj = new MesQmCheckitem
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- ItemId= long.Parse( _ItemId),
+ ItemId = long.Parse(_ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
Isenabled = txt_isenabled.Checked,
+ Ftype = "1",
+ Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
list = lst
};
try
@@ -329,36 +333,35 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere =
- new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
-
- var pgq = new PageQueryModel(curPage, pageSize,
- "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
+ "a.create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn = UtilityHelper.HttpPost("",
- // _webServiceName + "GetListPageIQC", json);
_webServiceName + "GetListPage", json);
var dd =
UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
- var dt = dd.rtnData.list;
+ DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
- pageBar1.setTxt();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -369,6 +372,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -387,7 +391,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- // _webServiceName + "GetModelIQC",
+ // _webServiceName + "GetModelIQC",
_webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn =
@@ -486,7 +490,6 @@
private void _setIno()
{
- txt_ItemId.KeyFile = "id";
txt_ItemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_ItemId.GetModel();
@@ -570,6 +573,7 @@
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();
}
}
@@ -589,7 +593,7 @@
"0.010---(AQL_0_0010)"
, "0.015---(AQL_0_0015)"
, "0.025---(AQL_0_0025)"
- ,"0.04---(AQL_0_0040)"
+ ,"0.040---(AQL_0_0040)"
,"0.065---(AQL_0_0065)"
,"0.10---(AQL_0_010)"
,"0.15---(AQL_0_015)"
@@ -628,20 +632,54 @@
ComboBoxEdit comboBox = sender as ComboBoxEdit;
if (comboBox != null)
{
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
string _val = _itm.Value.ToString();
string _txt = _itm.Text.ToString();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
- GridView myView = (gcMx1.MainView as GridView);
- int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
- myView.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
- myView.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
}
}
-
-
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelMx",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
#endregion
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3