From 1210460a95ba58f219d38e545dcaf9e21383d18f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 十二月 2024 14:12:50 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 319 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 272 insertions(+), 47 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index cfebf8c..a13659d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -1,13 +1,15 @@
using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -26,23 +28,75 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "");
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
+ }
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_sampleSizeNo, gridView1);
+ try
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
{
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ getPageList(1);
}
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
{
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle 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);
- };
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_sampleSizeNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_sampleSizeNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -63,7 +117,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -72,7 +126,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.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();
}
@@ -84,9 +141,8 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
-
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -105,7 +161,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -123,7 +179,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -140,8 +196,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>
/// 淇敼浜嬩欢
@@ -151,7 +218,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -168,10 +235,14 @@
{
UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ txt_createDate.Text = DateTime.Now.ToString("G");
+ txt_fversion.Text = "1";
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -187,10 +258,89 @@
txt_sampleSizeNo.Focus();
return;
}
- var _obj = new
- {
- guid = lbGuid.Text.Trim(),//涓诲缓
+ if (string.IsNullOrEmpty(txt_sampleSizeName.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏍囧噯鍚嶇О涓嶈兘涓虹┖锛�");
+ txt_sampleSizeName.Focus();
+ return;
+ }
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx2.CloseEditor();
+ gvMx2.UpdateCurrentRow();
+ var qmaql2 = new List<MesQmAql2>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ qmaql2.Add(new MesQmAql2
+ {
+ Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+ LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
+ LotTo = Convert.ToInt32(row["LotTo"].ToString()),
+ FlevelS1 = row["FlevelS1"].ToString(),
+ FlevelS2 = row["FlevelS2"].ToString(),
+ FlevelS3 = row["FlevelS3"].ToString(),
+ FlevelS4 = row["FlevelS4"].ToString(),
+ FlevelI = row["FlevelI"].ToString(),
+ FlevelIi = row["FlevelIi"].ToString(),
+ FlevelIii = row["FlevelIii"].ToString(),
+ Memo = row["Memo"].ToString()
+ });
+ }
+ var qmaql3 = new List<MesQmAql3>();
+ for (var i = 0; i < gvMx2.DataRowCount; i++)
+ {
+ var row = gvMx2.GetDataRow(i);
+ if (row != null)
+ qmaql3.Add(new MesQmAql3
+ {
+ Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+ FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
+ SampleSizeWord = row["SampleSizeWord"].ToString(),
+ Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
+ Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
+ Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
+ Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
+ Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
+ Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
+ Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
+ Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
+ Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
+ Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
+ Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
+ Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
+ Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
+ Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
+ Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
+ Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
+ Memo = row["Memo"].ToString()
+ });
+ }
+ if (qmaql2.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (qmaql3.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ return;
+ }
+ var _obj = new MesQmAql1
+ {
+ Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+ SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
+ SampleSizeName = txt_sampleSizeName.Text.Trim(),
+ Memo = txt_memo.Text.Trim(),
+ CreateDate = DateTime.Now,
+ FtwoChecked = false,
+ Isenabled = false,
+ FoneChecked = false,
+ Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
+ MesQmAql2s = qmaql2,
+ MesQmAql3s = qmaql3
};
try
{
@@ -201,7 +351,10 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<GridView> gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
}
}
catch (Exception ex)
@@ -215,14 +368,10 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -232,14 +381,18 @@
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ 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.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -282,7 +435,6 @@
{
array.Add(a);
}
-
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
@@ -294,12 +446,10 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
foreach (var a in _job["rtnData"]["mesQmAql3s"])
{
mesQmAql3s.Add(a);
}
-
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(mesQmAql3s.ToString());
if (dt1.Rows.Count > 0)
{
@@ -311,8 +461,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
-
-
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -323,5 +471,82 @@
}
}
+ 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);
+ }
+ }
+ }
+
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gvMx2.CloseEditor();
+ gvMx2.UpdateCurrentRow();
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.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 + "DeleteModelMx2",
+ 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);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3