~tjx/GsMesClient.git

			@@ -29,7 +29,6 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			// Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, this.panelControl3, splitContainerControl1.Panel1, label1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
			{
			@@ -63,15 +62,53 @@
			"SalesManager/SelectFormFhMx", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			//this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			};

			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			this.ucBtnPrint1.btnDesignClick += (s, e) =>
			{
			ucBtnPrint1.rptParameter = "rpt_Xsth{}";
			};
			this.ucBtnPrint1.btnReportClick += (s, e) =>
			{
			ucBtnPrint1.guidKey = "";
			string rowGuid = lbMxGuid.Text.Trim();
			ucBtnPrint1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
			txt_iCount_1.Focus();
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
			txt_psnQty_1.Focus();
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (lbMxGuid.Text.Trim().Length < 10)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行！");
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
			+ "," + ""
			+ "," + ""
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			};
			}


			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			@@ -238,86 +275,92 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			//toolBarMenu1.isSetBtn = false;
			//string djlx = txt_fBillTypeID.Text.ToString();
			//string FNote = txt_fNote.Text.ToString();
			//string _sqGuid = txt_salesId.GetId();
			//string _fhOrg = txt_fStockOrgId.GetId();
			//if (string.IsNullOrEmpty(_fhOrg))
			//{
			// Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发货组织！");
			// txt_fStockOrgId.Focus();
			// return;
			//}
			//if (txt_fBillTypeID.SelectedIndex < 0)
			//{
			// Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
			// txt_fBillTypeID.Focus();
			// return;
			//}
			//if (string.IsNullOrEmpty(_sqGuid))
			//{
			// Gs.DevApp.ToolBox.MsgHelper.Warning("请选择申请组织！");
			// txt_salesId.Focus();
			// return;
			//}
			//var _obj = new
			//{
			// guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			// djlx = djlx,//单据类型
			// salesId = _sqGuid,//销售单号
			// inRemark = FNote.Trim(),//备注
			// fhOrg = _fhOrg,
			// list = new List<dynamic>(),
			//};
			//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 = UtilityHelper.ToGuid(row["id"].ToString());
			// string _msl = row["fMustQty"].ToString();
			// if (string.IsNullOrEmpty(_msl))
			// {
			// MsgHelper.ShowError("数量不能为空！");
			// return;
			// }
			// _obj.list.Add(new
			// {
			// Guid = _guid,
			// SalesDetailId = (row["salesDetailId"].ToString()),
			// Sqsl = (row["fMustQty"].ToString()),
			// Bz = (row["fEntrynote"].ToString()),
			// });
			// }
			//}
			//try
			//{
			// string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			// ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			// ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			// if (_rtn.rtnCode > 0)
			// {
			// lbGuid.Text = _rtn.rtnData.outGuid;
			// txt_billNo.Text = _rtn.rtnData.outNo;
			// toolBarMenu1.isSetBtn = true;
			// List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			// gvList.Add(gvMx1);
			// UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			// toolBarMenu1.currentAction = "";
			// }
			//}
			//catch (Exception ex)
			//{
			// ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			//}
			toolBarMenu1.isSetBtn = false;
			string djlx = txt_billType.Text.ToString();
			string FNote = txt_returnReason.Text.ToString();
			string _sqGuid = txt_customerOrderNo.GetId();
			if (string.IsNullOrEmpty(_sqGuid))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择销售订单！");
			txt_customerOrderNo.Focus();
			return;
			}
			if (txt_billType.SelectedIndex < 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
			txt_billType.Focus();
			return;
			}
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			djlx = djlx,//单据类型
			salesId = _sqGuid,//销售单号
			inRemark = FNote.Trim(),//备注
			list = new List<dynamic>(),
			};
			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 = UtilityHelper.ToGuid(row["id"].ToString());
			string _msl = row["sqQty"].ToString();
			if (string.IsNullOrEmpty(_msl))
			{
			MsgHelper.ShowError("数量不能为空！");
			return;
			}
			string _returnType = row["returnType"].ToString();
			if (string.IsNullOrEmpty(_returnType))
			{
			MsgHelper.ShowError("类型不能为空！");
			return;
			}
			string _returnDate = row["returnDate"].ToString();
			if (string.IsNullOrEmpty(_returnType))
			{
			MsgHelper.ShowError("日期不能为空！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			deliveDetailGuid = (row["deliveDetailGuid"].ToString()),
			Sqsl = (row["sqQty"].ToString()),
			Bz = (row["note"].ToString()),
			Thlx = (row["returnType"].ToString()),
			Thrq = (row["returnDate"].ToString()),
			});
			}
			}
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			lbGuid.Text = _rtn.rtnData.outGuid;
			txt_billNo.Text = _rtn.rtnData.outNo;
			toolBarMenu1.isSetBtn = true;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			}
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			/// <summary>
			/// 日志
			@@ -418,6 +461,23 @@
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}
			JArray array2 = new JArray();
			foreach (var a in _job["rtnData"]["list2"])
			{
			array2.Add(a);
			}
			DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
			if (dt2.Rows.Count > 0)
			{
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			}
			else
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			}
			}
			else
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			@@ -509,11 +569,11 @@
			SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			//gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
			gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
			gvMx1.SetFocusedRowCellValue("salesDetailId", SelectedDataRow["id"].ToString());
			gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
			gvMx1.CloseEditor();
			gvMx1.UpdateCurrentRow();
			}
			@@ -558,6 +618,21 @@
			}
			}



			private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
			{
			if (e.FocusedRowHandle >= 0)
			{
			DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
			lbMxGuid.Text = row["guid"].ToString();
			ucBtnPrint1.guidKey = row["guid"].ToString();
			//txtWlid.Text = row["qd002"].ToString();
			//txtWlgg.Text = row["qd004"].ToString();
			//txtWlmc.Text = row["qd003"].ToString();
			//txtQuantity.Text = row["qd007"].ToString();//申请总量
			//txtYdy.Text = row["ydy"].ToString();//已打印总量
			//txtKdy.Text = row["kdy"].ToString();//可打印总量
			}
			}
			}
			}