~tjx/GsMesClient.git

			@@ -2,6 +2,8 @@
			using DevExpress.XtraGrid.Views.Grid.ViewInfo;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			using MES.Service.Modes;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System;
			@@ -26,6 +28,8 @@
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
			this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
			getPageList(1, UtilityHelper.GetPageSize());
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			@@ -42,6 +46,45 @@
			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);
			};
			//选择需要的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商，才能选择来料明细！");
			return;
			}
			var frm = new SelectCgOutMx(this.txt_suppId.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			_webServiceName + "GetListPageByThmxGuid",
			JsonConvert.SerializeObject(_obj));
			var dt = UtilityHelper.ReturnToList(strReturn);
			DataTable _newTable = dt.rtnData;
			DataTable _oldTable = (DataTable)gcMx2.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = _oldTable;
			gcMx2.ForceInitialize();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			}

			@@ -86,7 +129,34 @@
			_filterList = e.FilterList;
			getPageList(1, pageBar1.RowsCount);
			}
			/// <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_itemOutNo, 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_itemOutNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}
			/// <summary>
			/// 取消事件
			/// </summary>
			@@ -105,7 +175,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_itemOutNo, gridView1, "itemOutNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			@@ -153,7 +223,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_itemOutNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			@@ -172,8 +242,10 @@
			lbGuid.Text = "";
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			}
			/// <summary>
			/// 保存事件
			@@ -183,31 +255,76 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			//if (string.IsNullOrEmpty(txt_account.Text.Trim()))
			var _ckId = txt_depotId.GetId(); //仓库编号 depots_code
			var _gysId = txt_suppId.GetId(); //供应商编号
			if (string.IsNullOrEmpty(_gysId))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("登录账号不能为空！");
			// txt_account.Focus();
			MsgHelper.Warning("请选择供应商！");
			txt_suppId.Focus();
			return;
			}
			var _obj = new

			if (string.IsNullOrEmpty(_ckId))
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			MsgHelper.Warning("请选择仓库！");
			txt_depotId.Focus();
			return;
			}
			var _obj = new MesInvItemOuts()
			{
			Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键
			Remark = txt_remark.Text.Trim(), //备注
			SuppId = int.Parse( _gysId), //供应商
			DepotId = int.Parse(_ckId),//仓库
			FType = txt_fType.Checked==true?1:0, //0=采购，1=委外
			Fmrmode = txt_fmrmode.Text,//退料方式
			Reason = txt_reason.Text,//退料方式
			MesInvItemOutItemsList = new List<MesInvItemOutItems>(),
			};
			gvMx2.CloseEditor();
			gvMx2.UpdateCurrentRow();
			if (gvMx2.DataRowCount <= 0)
			{
			MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
			return;
			}
			for (var i = 0; i < gvMx2.DataRowCount; i++)
			{
			var row = gvMx2.GetDataRow(i);
			if (row != null)
			{
			Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			string _msl = row["quantity"].ToString();
			if (string.IsNullOrEmpty(_msl))
			{
			MsgHelper.ShowError("申请数量不能为空！");
			return;
			}
			_obj.MesInvItemOutItemsList.Add(new MesInvItemOutItems
			{
			Guid = _guid,
			AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),//
			Quantity = decimal.Parse(row["quantity"].ToString())
			});
			}
			}
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "EditModel",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			lbGuid.Text = _rtn.rtnData;
			toolBarMenu1.isSetBtn = true;
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
			}
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}

			@@ -239,7 +356,6 @@
			pageBar1.TotalPages = dddd;
			pageBar1.RecordCount = dd.rtnData.total;//记录总数
			pageBar1.CurrentPage = curPage;//当前页
			pageBar1.RowsCount = pageSize;//每页显示
			pageBar1.setTxt();
			}
			else
			@@ -274,10 +390,11 @@
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			foreach (var a in _job["rtnData"]["mesInvItemOutCDetailsList"])
			{
			array.Add(a);
			}
			@@ -292,6 +409,23 @@
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}

			JArray array1 = new JArray();
			foreach (var a in _job["rtnData"]["mesInvItemOutItemsList"])
			{
			array1.Add(a);
			}
			DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
			if (dt1.Rows.Count > 0)
			{
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt1;
			gcMx2.ForceInitialize();
			}
			else
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			}
			}
			else
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			@@ -302,5 +436,41 @@
			}
			}

			private void repositoryItemButtonEdit1_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))
			{
			gvMx2.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);
			}
			}
			}
			}
			}