~tjx/GsMesClient.git

			@@ -16,7 +16,6 @@
			{
			public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
			{
			int _currentHandle5 = 0;
			string _webServiceName = "MesQaItemsDetect01Manager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			public Frm_MesQaItemsDetect01()
			@@ -40,7 +39,7 @@
			});
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			getModel(value, "0");
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			@@ -62,13 +61,14 @@
			/// <exception cref="NotImplementedException"></exception>
			private void BtnIpt_Click(object sender, EventArgs e)
			{
			Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim() );
			bool bl = btnLoad.Enabled;
			Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(),bl);
			frm.ShowDialog();
			}

			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			@@ -108,7 +108,7 @@
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			getModel(lbGuid.Text.Trim());
			getModel(lbGuid.Text.Trim(), "0");
			}
			else
			{
			@@ -128,7 +128,6 @@
			private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
			{
			int intHandle = this.gvMx1.FocusedRowHandle;
			this._currentHandle5 = intHandle;
			if (intHandle < 0)
			{
			ToolBox.MsgHelper.Warning("提示：请选择检验项目！");
			@@ -160,7 +159,7 @@
			{
			inOrderGuid1 = UtilityHelper.ToGuid(lbGuid.Text.Trim()), ////这是检验单guid
			inOrderGuid5 = guid5,//这是抽样的guid
			inP1 = _strCmd,//这是9，有可能是19，或者0k-19,或者ng-19
			inP1 = _strCmd,//或者0k-19,或者ng-19
			};
			try
			{
			@@ -170,7 +169,7 @@
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			getModel(lbGuid.Text.Trim());
			getModel(lbGuid.Text.Trim(), guid5);
			}
			else
			{
			@@ -204,7 +203,7 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -253,7 +252,7 @@
			return;
			if (txt_fcheckResu.Text.Trim() == "不合格")
			{
			if (string.IsNullOrEmpty(txt_remarks.Text.Trim()) )
			if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
			{
			MsgHelper.Warning("单据为不合格时，请填写备注说明！");
			return;
			@@ -274,7 +273,7 @@
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(lbGuid.Text.Trim(), "0");
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			@@ -308,7 +307,7 @@
			private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim());
			getModel(lbGuid.Text.Trim(), "0");
			else
			{
			//_filterList.Clear();
			@@ -340,7 +339,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(rowGuid);
			getModel(rowGuid, "0");
			}
			else
			{
			@@ -348,6 +347,7 @@
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			this.setEable(true);
			}
			}

			@@ -375,12 +375,16 @@
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			lbGuid.Text = _rtn.rtnData;
			toolBarMenu1.isSetBtn = true;
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
			this.setEable(false);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -397,7 +401,7 @@
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			_sbSqlWhere += " and isnull(fsubmit,0)=0";
			// _sbSqlWhere += " and isnull(fsubmit,0)=0";
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -413,7 +417,7 @@
			{
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			@@ -433,7 +437,7 @@
			}

			}
			private void getModel(string strGuid)
			private void getModel(string strGuid, string guid5)
			{
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			@@ -458,6 +462,7 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			setEable(isEdit);
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list5"])
			@@ -467,18 +472,21 @@
			DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
			if (dt.Rows.Count > 0)
			{
			gcMx1.DataSource = null;
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			gvMx1.FocusedRowHandle = _currentHandle5;
			ucUpFile1.parentGuid = lbGuid.Text.Trim();
			var row = gvMx1.GetDataRow(_currentHandle5);
			if (row != null)
			if (guid5.Length > 10)
			{
			var rowGuid = row["guid"].ToString();
			getList12(rowGuid);
			int rowHandle = 0;
			rowHandle = gvMx1.LocateByValue(1, gvMx1.Columns["guid"], guid5);
			if (rowHandle < 0)
			rowHandle = 0;
			gvMx1.FocusedRowHandle = rowHandle + 1;
			}
			// MessageBox.Show(rowHandle.ToString() + "**" + guid5);
			}
			else
			{
			@@ -495,7 +503,6 @@

			}


			/// <summary>
			/// 选项卡切换
			/// </summary>
			@@ -503,7 +510,7 @@
			/// <param name="e"></param>
			private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
			{
			if (e.Page.Name == "xtraTabPage3")
			if (e.Page.Name == "tabMxPage2")
			{
			getFileList();
			}
			@@ -587,6 +594,11 @@
			}
			}

			/// <summary>
			/// 删除附件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx4.FocusedRowHandle;
			@@ -616,6 +628,11 @@
			}
			}

			/// <summary>
			/// 浏览附件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx4.FocusedRowHandle;
			@@ -637,7 +654,11 @@

			}
			}

			/// <summary>
			/// 下载附件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx4.FocusedRowHandle;
			@@ -672,5 +693,12 @@
			}
			}
			}

			private void setEable(bool bl) {

			txtJianYan.ReadOnly = !bl;
			btnLoad.Enabled = bl;
			btnIpt.Text = ( bl==true?"录入样本":"查看样本");
			}
			}
			}