~tjx/GsMesClient.git

			@@ -1,4 +1,5 @@
			using DevExpress.XtraEditors;
			using Gs.DevApp.DevFrm.Sales;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -59,22 +60,64 @@
			txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
			txt_shf.Text = txt_salesId.GetSalesShf();
			txt_shName.Text = txt_salesId.GetSalesShfName();
			System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
			var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
			var json = JsonConvert.SerializeObject(_obj);
			try
			};

			//选择需要的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_salesId.GetId()))
			{
			var strReturn = UtilityHelper.HttpPost("",
			"SalesManager/SelectFormMx", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择销售订单！");
			this.txt_salesId.Focus();
			return;
			}
			catch (Exception ex)
			var frm = new Frm_SalesDeliverSelect(this.txt_salesId.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			try
			{
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["salesDetailId"] = dym.salesDetailId;
			_row["billNo"] = dym.billNo;
			_row["itemNo"] = dym.itemNo;
			_row["itemName"] = dym.itemName;
			_row["itemModel"] = dym.itemModel;
			_row["dwXs"] = dym.dwXs;
			_row["dwJj"] = dym.dwJj;
			_row["jjSl"] = dym.jjSl;
			_row["deliveryDate"] = dym.deliveryDate;
			_row["xsSl"] = dym.xsSl;
			_row["isFree"] = dym.isFree;
			_row["hzlx"] = dym.hzlx;
			_row["hz"] = dym.hz;
			_row["xxbz"] = dym.xxbz;
			_row["fhsx"] = dym.fhsx;
			_row["fhxx"] = dym.fhxx;
			_row["jsOrg"] = dym.jsOrg;
			_row["gyOrg"] = dym.gyOrg;
			_row["kcOrg"] = dym.kcOrg;
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gridView1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			catch (Exception ex)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			@@ -294,6 +337,11 @@
			MsgHelper.ShowError("预计发货时间不能为空！");
			return;
			}
			if (string.IsNullOrEmpty(row["salesDetailId"].ToString()))
			{
			MsgHelper.ShowError("销售单物料明细不能为空！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			@@ -350,7 +398,7 @@
			{
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and a.FSubsidiary in");
			_sbSqlWhere.Append(" and a.FSaleOrgId in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			@@ -368,7 +416,8 @@
			{
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			gridView1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			@@ -552,35 +601,7 @@
			}

			}
			private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
			{
			SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			gvMx1.SetFocusedRowCellValue("salesDetailId", SelectedDataRow["id"].ToString());
			gvMx1.SetFocusedRowCellValue("billNo", SelectedDataRow["billNo"].ToString());
			gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
			gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
			gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
			gvMx1.SetFocusedRowCellValue("dwXs", SelectedDataRow["xxdw"].ToString());
			gvMx1.SetFocusedRowCellValue("dwJj", SelectedDataRow["jjdw"].ToString());
			gvMx1.SetFocusedRowCellValue("jjSl", SelectedDataRow["priceUnitQty"].ToString());
			gvMx1.SetFocusedRowCellValue("deliveryDate", SelectedDataRow["deliveryDate"].ToString());
			gvMx1.SetFocusedRowCellValue("xsSl", SelectedDataRow["qty"].ToString());
			gvMx1.SetFocusedRowCellValue("isFree", SelectedDataRow["isFree"].ToString());
			gvMx1.SetFocusedRowCellValue("hzlx", SelectedDataRow["hzlx"].ToString());
			gvMx1.SetFocusedRowCellValue("hz", SelectedDataRow["hz"].ToString());
			gvMx1.SetFocusedRowCellValue("xxbz", SelectedDataRow["xxbz"].ToString());
			gvMx1.SetFocusedRowCellValue("fhsx", SelectedDataRow["fhsx"].ToString());
			gvMx1.SetFocusedRowCellValue("fhxx", SelectedDataRow["fhxx"].ToString());
			gvMx1.SetFocusedRowCellValue("jsOrg", SelectedDataRow["jsOrg"].ToString());
			gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString());
			gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString());
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			}



			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;