~tjx/GsMesClient.git

			@@ -38,7 +38,8 @@
			toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			txt_ftype.Text = strType;
			if (strType == "iqc")
			dfValue = 5;
			this.gvMx1.InitNewRow += (s, e) =>
			@@ -64,29 +65,17 @@
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			_setIno();
			btnSelect.Click += (s, e) =>
			btnCopy.Click += (s, e) =>
			{
			var frm = new SelectCheckDt("jyxm");
			frm.UpdateParent += (ss, ee) =>
			if ((lbGuid.Text.Trim().Length < 10))
			{
			var lst = ee.DynamicList;
			var json = JsonConvert.SerializeObject(lst);
			DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
			DataTable _oldTable = (DataTable)gridControl2.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gridControl2.BindingContext = new BindingContext();
			gridControl2.DataSource = _oldTable;
			gridControl2.ForceInitialize();
			};
			Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先保存当前信息！");
			return;
			}
			JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
			frm.ShowDialog();
			};
			btnSave.Click += BtnSave_Click;
			}


			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			@@ -135,14 +124,16 @@
			_filterList = e.FilterList;
			getPageList(1);
			}

			/// <summary>
			/// 批准
			/// 反审核
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
			{
			_toolCk(2);
			_toolCk(0);
			}

			/// <summary>
			@@ -220,7 +211,6 @@
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gridView2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			}
			@@ -236,10 +226,8 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			var gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gridView2);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			xtraTabPageCopy.PageEnabled = false;
			}

			/// <summary>
			@@ -360,7 +348,7 @@
			Memo = txt_memo.Text.Trim(),
			ItemNo = txt_itemNo.Text.Trim(),
			Ftype = this.strType,
			Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
			Fversion = 0,
			list = lst
			};
			try
			@@ -377,7 +365,6 @@
			toolBarMenu1.isSetBtn = true;
			var gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gridView2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			@@ -400,7 +387,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			_sbSqlWhere += " and b.guid is not null";
			_sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
			var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
			@@ -423,7 +410,6 @@
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);

			}
			else
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			@@ -453,7 +439,6 @@
			MsgHelper.Warning("请先选择你要操作的行！");
			return;
			}
			xtraTabPageCopy.PageEnabled = !isEdit;
			var _obj = new
			{
			guid = strGuid //主建
			@@ -488,7 +473,6 @@
			{
			UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}
			UtilityHelper.SetDefaultTable(gridControl2, gridView2);
			}
			else
			{
			@@ -512,6 +496,9 @@
			{
			case -1:
			strMsg = "删除";
			break;
			case 0:
			strMsg = "反审核";
			break;
			case 1:
			strMsg = "审核";
			@@ -541,23 +528,28 @@
			_webServiceName + "EditModelSubmit",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());

			if (_inFieldValue < 0 && _rtn.rtnCode > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 0)
			{
			getPageList(this.pageBar1.CurrentPage);
			}
			else
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
			}
			if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
			{
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			Form parentForm = this.FindForm();
			UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue > 0 ? "1" : "0");
			}
			else
			{
			//注意，这里和其它页面有点不一样
			getPageList(this.pageBar1.CurrentPage);
			int rowHandle = gridView1.LocateByValue("guid", rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			Form parentForm = this.FindForm();
			UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
			}
			MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
			}
			catch (Exception ex)
			{
			@@ -755,74 +747,5 @@
			}
			}
			#endregion
			/// <summary>
			/// 删除复制项
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gridView2.CloseEditor();
			gridView2.UpdateCurrentRow();
			var rowhandle = gridView2.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gridView2.GetDataRow(rowhandle);
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			gridView2.DeleteRow(rowhandle);
			return;
			}
			}
			/// <summary>
			/// 提交物料复制
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void BtnSave_Click(object sender, EventArgs e)
			{
			int _rows = gridView2.RowCount;
			if (_rows <= 0)
			{
			MsgHelper.ShowInformation("请选择你需要复制的物料！");
			return;
			}

			if (!MsgHelper.AskQuestion("你选择了" + _rows.ToString() + "条数据，确定保存吗？"))
			return;
			System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
			for (var i = 0; i < gridView2.DataRowCount; i++)
			{
			var row = gridView2.GetDataRow(i);
			if (_sbGuids.Length > 0)
			_sbGuids.Append(",");
			Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			_sbGuids.Append(_guid.ToString());
			}
			var _obj = new
			{
			sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
			itemGuids = _sbGuids.ToString(),
			iqcType = this.strType,
			ypsl = this.dfValue
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			UtilityHelper.SetDefaultTable(gridControl2, gridView2);
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			}
			}