~tjx/GsMesClient.git

			@@ -16,6 +16,7 @@
			{
			string _webServiceName = "SalesReturnManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucCk = "";//发料仓库
			public Frm_SalesReturnNotice()
			{
			InitializeComponent();
			@@ -31,17 +32,18 @@
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			}, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			// 设置销售单
			@@ -53,7 +55,9 @@
			if (string.IsNullOrEmpty(_sqGuid))
			return;
			txt_custName.Text = txt_salesOrderId.GetSalesCusName();
			txt_salesOrg.Text = txt_salesOrderId.GetSalesOrgName();
			txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
			string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
			txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
			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);
			@@ -64,48 +68,12 @@
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
			}
			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()
			+ "}";
			};
			}

			@@ -134,7 +102,7 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -244,12 +212,13 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			}
			@@ -264,8 +233,10 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);

			}
			/// <summary>
			@@ -279,6 +250,8 @@
			string djlx = txt_billType.Text.ToString();
			string FNote = txt_returnReason.Text.ToString();
			string _sqGuid = txt_salesOrderId.GetId();
			string ckId = txt_fstockid.GetId();
			int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
			if (string.IsNullOrEmpty(_sqGuid))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择销售订单！");
			@@ -291,15 +264,24 @@
			txt_billType.Focus();
			return;
			}
			if (string.IsNullOrEmpty(ckId))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择仓库！");
			txt_fstockid.Focus();
			return;
			}
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			djlx = djlx,//单据类型
			salesId = _sqGuid,//销售单号
			inRemark = FNote.Trim(),//备注
			ckId = ckId,
			FIsLink = _fIsLink,//有无源单
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			@@ -345,21 +327,25 @@
			{
			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)
			{
			ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			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);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			else
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			/// <summary>
			@@ -382,7 +368,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -398,7 +384,7 @@
			{
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			@@ -416,10 +402,15 @@
			{
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}

			}

			/// <summary>
			/// 读取实体
			/// </summary>
			/// <param name="strGuid"></param>
			private void getModel(string strGuid)
			{
			gcMx1.DataSource = null;
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			@@ -439,10 +430,13 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucCk = dy.fstockid;
			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.layoutMx1.Controls, dy, isEdit, gvList);
			_ucCk = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			@@ -456,6 +450,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -473,6 +468,7 @@
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
			}
			else
			{
			@@ -568,16 +564,22 @@
			{
			SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			//gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
			gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
			gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
			gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
			gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
			gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
			//gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
			gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString());
			gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			}

			/// <summary>
			/// 移出明细
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;
			@@ -615,23 +617,6 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			}


			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();//可打印总量
			}
			}
			}