~tjx/GsMesClient.git

			@@ -142,8 +142,8 @@
			return;
			txt_fstockid.getSuppler(orgId, _ucCk);
			txt_inventoryOrg.SetIdOrCode(orgId);
			txt_salesDept.getSuppler(orgId,_ucBm);
			txt_returnCustomer.getSuppler(orgId,_ucKh);
			txt_salesDept.getSuppler(orgId, _ucBm);
			txt_returnCustomer.getSuppler(orgId, _ucKh);
			};
			//销售部门
			txt_salesDept.EditChanged += (s, e) =>
			@@ -151,7 +151,7 @@
			var dptId = txt_salesDept.GetId();
			if (string.IsNullOrEmpty(dptId))
			return;
			txt_saleDeptName.Text=(txt_salesDept.GetName());
			txt_saleDeptName.Text = (txt_salesDept.GetName());
			};
			//选择需要的明细
			btnSelect.Click += (s, e) =>
			@@ -168,39 +168,92 @@
			}
			if (txt_fHasLinkRad.SelectedIndex == 0)
			{
			var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			//有源单之销售出库单
			if (txt_fHasLinkSource.SelectedIndex == 0)
			{
			try
			var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			_webServiceName + "SelectFormTo",
			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++)
			try
			{
			_oldTable.ImportRow(sourceRows[i]);
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["guid"] = dym.guid;
			_row["deliveDetailGuid"] = dym.deliveDetailGuid;//送货明细guid
			_row["itemId"] = dym.itemId;
			_row["itemNo"] = dym.itemNo; //物料编号,
			_row["itemName"] = dym.itemName; //物料名称,
			_row["itemModel"] = dym.itemModel;//规格型号,
			_row["xxDw"] = dym.xxDw;
			_row["salesQuantity"] = dym.salesQuantity;
			_row["isFreeChk"] = dym.isFreeChk;
			_row["fhQuantity"] = dym.fhQuantity;
			gvMx1.UpdateCurrentRow();
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch (Exception ex)
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			return;
			}
			//有源单之销售单
			else
			{
			var frm = new Frm_SalesReturnNoticeSelect2(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			return;
			try
			{
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["guid"] = dym.guid;
			_row["deliveDetailGuid"] = dym.deliveDetailGuid;//送货明细guid
			_row["itemId"] = dym.itemId;
			_row["itemNo"] = dym.itemNo; //物料编号,
			_row["itemName"] = dym.itemName; //物料名称,
			_row["itemModel"] = dym.itemModel;//规格型号,
			_row["xxDw"] = dym.xxDw;
			_row["salesQuantity"] = dym.salesQuantity;
			_row["isFreeChk"] = dym.isFreeChk;
			_row["fhQuantity"] = dym.fhQuantity;
			gvMx1.UpdateCurrentRow();
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			return;
			}
			}
			if (txt_fHasLinkRad.SelectedIndex == 1)
			{
			@@ -222,7 +275,7 @@
			_row["itemModel"] = dym.itemModel;//规格型号,
			_row["xxDw"] = dym.xxDw;
			_row["salesQuantity"] = dym.salesQuantity;
			_row["isFreeChk"]=dym.isFreeChk;
			_row["isFreeChk"] = dym.isFreeChk;
			_row["fhQuantity"] = dym.fhQuantity;
			gvMx1.UpdateCurrentRow();
			_Table.Rows.Add(_row);
			@@ -252,7 +305,7 @@
			setSrm();
			};
			}


			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			@@ -403,6 +456,7 @@
			txt_salesOrg.IsReadly = true;
			txt_inventoryOrg.IsReadly = true;
			txt_fHasLinkRad.ReadOnly = true;
			txt_fHasLinkSource.ReadOnly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -472,16 +526,14 @@
			return;
			}
			//这无源类型的检验beg
			if (_FIsLink == 1)
			if (_FIsLink == 1)
			{

			if (string.IsNullOrEmpty(_inventoryOrg))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择存组织！");
			txt_inventoryOrg.Focus();
			return;
			}

			if (string.IsNullOrEmpty(_salesDept))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择部门！");
			@@ -495,7 +547,8 @@
			djlx = _djlx,//单据类型
			inRemark = _FNote.Trim(),//备注
			ckId = _ckId,
			FIsLink = txt_fHasLinkRad.SelectedIndex,
			fIsLink = txt_fHasLinkRad.SelectedIndex,
			fHasLinkSource = txt_fHasLinkSource.Text.Trim(),
			//下面是无源的
			salesOrg = _salesOrg,
			inventoryOrg = _inventoryOrg,
			@@ -592,7 +645,11 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and xs.FID in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -787,7 +844,7 @@
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}


			/// <summary>
			/// 移出明细
			/// </summary>
			@@ -801,7 +858,7 @@
			if (e.Button.Index == 0)
			{
			var dr = gvMx1.GetDataRow(rowhandle);
			var mxGuid = dr["id"].ToString();
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			if (string.IsNullOrEmpty(mxGuid))
			@@ -872,13 +929,13 @@
			{
			layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			}
			else
			{
			layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;


			layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			}
			}
			}