~tjx/GsMesClient.git

			@@ -32,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;
			// 设置销售单
			@@ -56,7 +57,7 @@
			txt_custName.Text = txt_salesOrderId.GetSalesCusName();
			txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
			string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
			txt_fstockid.getSuppler(_xsOrgFid,_ucCk);
			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);
			@@ -83,14 +84,14 @@
			ucBtnPrint1.guidKey = "";
			string rowGuid = lbMxGuid.Text.Trim();
			ucBtnPrint1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(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()))
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
			txt_psnQty_1.Focus();
			@@ -105,10 +106,20 @@
			}
			this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
			+ "," + ""
			+ "," + ""
			+ "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			};
			//自动计算打印量
			txt_psnQty_1.TextChanged += (s, e) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
			};

			radOut.SelectedIndexChanged += (s, e) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
			};
			}

			@@ -137,7 +148,7 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -247,7 +258,7 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			@@ -286,6 +297,7 @@
			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("请选择销售订单！");
			@@ -311,6 +323,7 @@
			salesId = _sqGuid,//销售单号
			inRemark = FNote.Trim(),//备注
			ckId = ckId,
			FIsLink = _fIsLink,//有无源单
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			@@ -371,6 +384,7 @@
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -398,7 +412,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
			@@ -436,6 +450,7 @@
			}
			private void getModel(string strGuid)
			{
			gcMx1.DataSource = null;
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			@@ -475,6 +490,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -492,6 +508,7 @@
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
			}
			else
			{
			@@ -647,12 +664,65 @@
			DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
			lbMxGuid.Text = row["guid"].ToString();
			ucBtnPrint1.guidKey = row["guid"].ToString();
			txtWlid.Text = row["itemId"].ToString();
			txtWlgg.Text = row["itemNo"].ToString();
			txtWlid.Text = row["itemNo"].ToString();
			txtWlgg.Text = row["itemModel"].ToString();
			txtWlmc.Text = row["itemName"].ToString();
			txtQuantity.Text = row["sqQty"].ToString();//申请总量
			txtYdy.Text = row["ydy"].ToString();//已打印总量
			txtKdy.Text = row["kdy"].ToString();//可打印总量
			txt_yQty.Text = row["ydy"].ToString();//已打印总量
			txt_kQty.Text = row["kdy"].ToString();//可打印总量
			}
			else
			{
			lbMxGuid.Text = "";
			ucBtnPrint1.guidKey = "";
			txtWlid.Text = "";
			txtWlgg.Text = "";
			txtWlmc.Text = "";
			txtQuantity.Text = "";
			txt_yQty.Text = "";
			txt_kQty.Text = "";
			txt_psnQty_1.Text = "";
			txt_iCount_1.Text = "";
			}
			}

			/// <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);
			}
			}
			}
			}