~tjx/GsMesClient.git

			@@ -2,13 +2,11 @@
			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.Threading.Tasks;
			using System.Windows.Forms;

			namespace Gs.DevApp.DevFrm.QC
			@@ -20,38 +18,61 @@
			public Frm_MesQmAql1()
			{
			InitializeComponent();
			object[] _objAry = { "A",
			"B",
			"C",
			"D",
			"E",
			"F",
			"G",
			"H",
			"I",
			"J",
			"K",
			"L",
			"M",
			"N",
			"O",
			"P",
			"Q",
			"R",
			"S",
			"T"};
			this.repositoryItemComboBox1.Items.AddRange(_objAry);
			this.repositoryItemComboBox2.Items.AddRange(_objAry);
			this.repositoryItemComboBox3.Items.AddRange(_objAry);
			this.repositoryItemComboBox4.Items.AddRange(_objAry);
			this.repositoryItemComboBox5.Items.AddRange(_objAry);
			this.repositoryItemComboBox6.Items.AddRange(_objAry);
			this.repositoryItemComboBox7.Items.AddRange(_objAry);
			this.repositoryItemComboBox8.Items.AddRange(_objAry);
			this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
			this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
			this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			}, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}

			/// <summary>
			/// 批准
			/// </summary>
			@@ -61,16 +82,25 @@
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_sampleSizeNo, gridView1);
			lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			getPageList(this.pageBar1.CurrentPage);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			gridView1.SetFocusedRowCellValue("ftwoChecked", true);
			gridView1.SetFocusedRowCellValue("isenabled", true);
			gridView1.SetFocusedRowCellValue("ftwoCheckor", "已批准");
			gridView1.SetFocusedRowCellValue("ftwoCheckdate", DateTime.Now.ToString());
			}
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			@@ -98,7 +128,7 @@
			{
			_toolCk(1);
			}


			/// <summary>
			/// 分页事件
			/// </summary>
			@@ -108,30 +138,7 @@
			{
			getPageList(curPage);
			}
			/// <summary>
			/// 查询事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
			{
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			/// <summary>
			/// 查询回调
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
			{
			_filterList = e.FilterList;
			getPageList(1);
			}

			/// <summary>
			/// 取消事件
			/// </summary>
			@@ -150,7 +157,7 @@
			private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			@@ -222,11 +229,12 @@
			{
			getModel(rowGuid);
			}
			else {
			else
			{
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gridViews);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
			}
			}
			/// <summary>
			@@ -241,8 +249,8 @@
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			txt_createDate.Text = DateTime.Now.ToString("G");
			txt_fversion.Text = "1";
			@@ -269,8 +277,10 @@
			return;
			}
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx2.CloseEditor();
			gvMx2.PostEditor();
			gvMx2.UpdateCurrentRow();
			try
			{
			@@ -279,6 +289,17 @@
			{
			var row = gvMx1.GetDataRow(i);
			if (row != null)
			{
			if (string.IsNullOrEmpty(row["LotFrom"].ToString()))
			{
			MsgHelper.ShowError("批量开始不能为空！");
			return;
			}
			if (string.IsNullOrEmpty(row["LotTo"].ToString()))
			{
			MsgHelper.ShowError("批量结束不能为空！");
			return;
			}
			qmaql2.Add(new MesQmAql2
			{
			Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
			@@ -293,12 +314,24 @@
			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)
			{
			if (string.IsNullOrEmpty(row["FsampleSizeWord"].ToString()))
			{
			MsgHelper.ShowError("样本大小不能为空！");
			return;
			}
			if (string.IsNullOrEmpty(row["SampleSizeWord"].ToString()))
			{
			MsgHelper.ShowError("样本字码不能为空！");
			return;
			}
			qmaql3.Add(new MesQmAql3
			{
			Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
			@@ -322,6 +355,7 @@
			Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
			Memo = row["Memo"].ToString()
			});
			}
			}
			if (qmaql2.Count <= 0)
			{
			@@ -359,7 +393,9 @@
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -372,7 +408,7 @@

			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}


			}

			/// <summary>
			@@ -392,16 +428,15 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gcMain1.BindingContext = new BindingContext();
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			pageBar1.RecordCount = dd.rtnData.total;//总记录数
			@@ -441,7 +476,7 @@
			List<GridView> gvList = new List<GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			JArray mesQmAql3s = new JArray();
			@@ -455,6 +490,7 @@
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			//gvMx1.BestFitColumns();
			}
			else
			{
			@@ -470,6 +506,7 @@
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt1;
			gcMx2.ForceInitialize();
			// gvMx2.BestFitColumns();
			}
			else
			{
			@@ -485,9 +522,15 @@
			}
			}

			/// <summary>
			/// 删除字码
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			var rowhandle = gvMx1.FocusedRowHandle;
			if (rowhandle < 0)
			@@ -523,7 +566,11 @@
			}
			}
			}

			/// <summary>
			/// 删除方案
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gvMx2.CloseEditor();
			@@ -605,9 +652,12 @@
			if (_rtn.rtnCode > 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)