~tjx/GsMesClient.git

			@@ -16,6 +16,7 @@
			{
			string _webServiceName = "SalesReturnManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucCk = "";//发料仓库
			public Frm_SalesReturnNotice()
			{
			InitializeComponent();
			@@ -31,6 +32,7 @@
			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);
			@@ -41,7 +43,7 @@
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			// 设置销售单
			@@ -54,6 +56,8 @@
			return;
			txt_custName.Text = txt_salesOrderId.GetSalesCusName();
			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);
			@@ -134,7 +138,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,7 +248,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			@@ -282,6 +286,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("请选择销售订单！");
			@@ -294,15 +300,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)
			{
			@@ -359,6 +374,7 @@
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -402,7 +418,7 @@
			{
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			@@ -424,6 +440,7 @@
			}
			private void getModel(string strGuid)
			{
			gcMx1.DataSource = null;
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			@@ -443,11 +460,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"])
			@@ -575,12 +594,13 @@
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			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("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();
			}

			@@ -640,5 +660,45 @@
			txtKdy.Text = row["kdy"].ToString();//可打印总量
			}
			}

			/// <summary>
			/// 移出条码
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx2.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gvMx2.GetDataRow(rowhandle);
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			var _obj = new
			{
			mxGuid = mxGuid,
			inType = "dhtm"
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			"VArrivalBarcodeManager/DeleteBarcode",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			}
			}
			}