~tjx/GsMesClient.git

			@@ -4,8 +4,10 @@
			using System.Drawing;
			using System.Text;
			using System.Windows.Forms;
			using DevExpress.DataAccess.DataFederation;
			using DevExpress.XtraEditors;
			using DevExpress.XtraEditors.Controls;
			using DevExpress.XtraGrid.Views.Base.ViewInfo;
			using DevExpress.XtraGrid.Views.Grid;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			@@ -20,10 +22,13 @@
			{
			private List<FilterEntity> _filterList = new List<FilterEntity>();
			private readonly string _webServiceName = "MesInvItemArnManager/";

			public Frm_MesInvItemArn()
			{
			InitializeComponent();
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			this.gridView1.ColumnPanelRowHeight = 60;
			this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
			this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
			toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
			toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
			toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
			@@ -33,9 +38,9 @@
			toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
			toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
			getPageList(1, UtilityHelper.GetPageSize());
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			gridView1.CustomDrawRowIndicator += (s, e) =>
			{
			if (e.Info.IsRowIndicator && e.RowHandle >= 0)
			@@ -49,14 +54,18 @@
			e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
			e.Graphics.DrawString(str, f, Brushes.Gray, r);
			};
			ucLookSupplier1.EditChanged += (s, e) =>
			{
			var ddd = ucLookSupplier1.GetValue();
			// lbSupplierName.Text = ddd[1];
			};
			this.txt_depotsCode.KeyFile = "depotCode";
			this.txt_suppNo.KeyFile = "suppNo";
			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			{
			var frm = new SelectCgMx();
			if (string.IsNullOrEmpty(this.txt_suppNo.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商，才能选择来料明细！");
			return;
			}
			System.Text.StringBuilder sbWhere = new StringBuilder();
			var frm = new SelectCgMx(this.txt_suppNo.GetCode(), sbWhere.ToString());
			frm.UpdateParent += (ss, ee) =>
			{
			var lst = new List<string>();
			@@ -66,22 +75,28 @@
			"MesInvItemArnDetailManager/GetListPageByCgmxGuid",
			JsonConvert.SerializeObject(_obj));
			var dt = UtilityHelper.ReturnToList(strReturn);
			DataTable _newTable = dt.rtnData;
			DataTable _oldTable = (DataTable)gcMx1.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = dt.rtnData;
			gcMx1.DataSource = _oldTable;
			gcMx1.ForceInitialize();
			};
			frm.ShowDialog();
			};
			ucLookCk1.EditChanged += (s, e) =>
			{
			var ddd = ucLookCk1.GetValue();
			//lbCkName.Text = ddd[1];
			};
			}

			private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
			private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
			{
			throw new NotImplementedException();
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}

			/// <summary>
			@@ -264,49 +279,49 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			var _ckCode = ucLookCk1.GetValue()[2]; //仓库编号 depots_code
			var _gysCode = ucLookSupplier1.GetValue()[2]; //供应商编号
			if (string.IsNullOrEmpty(_ckCode))
			{
			MsgHelper.Warning("请选择仓库！");
			ucLookCk1.Focus();
			return;
			}

			var _ckCode = txt_depotsCode.GetCode(); //仓库编号 depots_code
			var _gysCode = txt_suppNo.GetCode(); //供应商编号
			if (string.IsNullOrEmpty(_gysCode))
			{
			MsgHelper.Warning("请选择供应商！");
			ucLookSupplier1.Focus();
			txt_suppNo.Focus();
			return;
			}

			if (string.IsNullOrEmpty(txt_paperBillNo.Text.Trim()))
			if (string.IsNullOrEmpty(_ckCode))
			{
			MsgHelper.Warning("请选择送货单号！");
			txt_paperBillNo.Focus();
			MsgHelper.Warning("请选择仓库！");
			txt_depotsCode.Focus();
			return;
			}

			var _obj = new MesInvItemArn();
			_obj.Guid = null; //到货单主键
			_obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //到货单主键
			_obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //送货单号;
			_obj.Remark = ""; //备注
			_obj.Remark = txt_remark.Text.Trim(); //备注
			_obj.SuppNo = _gysCode; //供应商编号
			_obj.DepotsCode = _ckCode; //仓库编号 depots_code
			_obj.FType = 1; //0=采购，1=委外
			_obj.FType = txt_fType.Checked; //0=采购，1=委外
			_obj.UrgentFlag = txt_urgentFlag.Checked;//0=不急，1=急
			_obj.list = new List<MesInvItemArnDetail>();
			gvMx1.CloseEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
			return;
			}
			for (var i = 0; i < gvMx1.DataRowCount; i++)
			{
			var row = gvMx1.GetDataRow(i);
			if (row != null)
			{
			Guid? _guid = null;
			if (string.IsNullOrEmpty(row["guid"].ToString()))
			_guid = null;
			else
			_guid = Guid.Parse(row["guid"].ToString());
			Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			string _msl = row["quantity"].ToString();
			if (string.IsNullOrEmpty(_msl))
			{
			MsgHelper.ShowError("数量不能为空！");
			return;
			}
			_obj.list.Add(new MesInvItemArnDetail
			{
			Guid = _guid,
			@@ -440,6 +455,11 @@
			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);