~tjx/GsMesClient.git

			@@ -15,6 +15,11 @@
			{
			string _webServiceName = "MesItemQtrkManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucGys = "";//供应商
			string _ucBm = "";//领料部门
			string _ucCk = "";//发料仓库
			string _ucHzlx = "";//货主类型
			string _ucHz = "";//货主
			public Frm_MesItemQtrk()
			{
			InitializeComponent();
			@@ -25,8 +30,10 @@
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
			this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isSh", "", (value) =>
			@@ -39,41 +46,39 @@
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			txt_qt008.getSuppler("");
			txt_qt018.getSuppler("");
			//设置仓库选择
			this.txt_qt008.EditChanged += (s, e) =>
			{

			//选择库存组织（变明细中的物料和变货主）
			this.txt_qt022.EditChanged += (s, e) =>
			{
			string _orgId = txt_qt022.GetId();
			if (string.IsNullOrEmpty(_orgId))
			return;
			ucLookHuoZhu1.OrgId = _orgId;
			ucLookHuoZhu1.HzId = _ucHz;
			ucLookHuoZhu1.SetHzLx(_ucHzlx);
			txt_qt009.getSuppler(_orgId, _ucBm);
			txt_qt018.getSuppler(_orgId, _ucGys);
			txt_qt008.getSuppler(_orgId, _ucCk);
			System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
			sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
			var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
			var json = JsonConvert.SerializeObject(_obj);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			"MesItemsManager/GetListSelect", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			};
			//设置供应商选择
			this.txt_qt018.EditChanged += (s, e) =>
			{

			};
			var _obj = new
			{
			currentPage = 1,
			everyPageSize = 999999,
			sortName = "",
			keyWhere = "",
			};
			var json = JsonConvert.SerializeObject(_obj);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			"MesItemsManager/GetListSelect", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			this.ucBtnPrint1.btnDesignClick += (s, e) =>
			{
			@@ -114,9 +119,22 @@
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			/// <summary>
			/// 日志
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_qtck, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}

			/// <summary>
			@@ -138,7 +156,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();
			}
			@@ -253,7 +271,8 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			ucLookHuoZhu1.Enabled = true;
			}
			}
			/// <summary>
			@@ -268,9 +287,10 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			ucLookHuoZhu1.Enabled = true;
			}
			/// <summary>
			/// 保存事件
			@@ -317,9 +337,15 @@
			txt_qt019.Focus();
			return;
			}
			if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("部门或供应商必须选一个！");
			txt_qt009.Focus();
			return;
			}
			if (string.IsNullOrEmpty(kcCk))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发料仓库！");
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择收料仓库！");
			txt_qt008.Focus();
			return;
			}
			@@ -378,7 +404,10 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			ucLookHuoZhu1.Enabled = false;
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -404,16 +433,16 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain1.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gridView1.BestFitColumns();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			@@ -431,6 +460,7 @@
			}
			private void getModel(string strGuid)
			{
			gcMx1.DataSource = null;
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			@@ -450,11 +480,22 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucGys = dy.qt018;
			_ucBm = dy.qt009;
			_ucCk = dy.qt008;
			_ucHzlx = dy.qt023;
			_ucHz = dy.qt024;
			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.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucGys = "";
			_ucBm = "";
			_ucCk = "";
			_ucHzlx = "";
			_ucHz = "";
			ucLookHuoZhu1.Enabled = isEdit;
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			@@ -468,12 +509,12 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}

			JArray array2 = new JArray();
			foreach (var a in _job["rtnData"]["list2"])
			{
			@@ -486,6 +527,7 @@
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
			}
			else
			{
			@@ -508,7 +550,8 @@
			gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
			gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
			gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
			gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
			gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]);
			gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
			}

			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			@@ -619,8 +662,7 @@
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			Form parentForm = this.FindForm();
			UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
			UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
			}
			}
			catch (Exception ex)
			@@ -638,9 +680,9 @@
			txtWlid.Text = row["qd002"].ToString();
			txtWlgg.Text = row["qd004"].ToString();
			txtWlmc.Text = row["qd003"].ToString();
			//txtQuantity.Text = row["qd007"].ToString();//申请总量
			//txtYdy.Text = row["YDYNUM"].ToString();//已打印总量
			//kyPrtQty.Text = row["KDYNUM"].ToString();//可打印总量
			txtQuantity.Text = row["qd007"].ToString();//申请总量
			txtYdy.Text = row["ydy"].ToString();//已打印总量
			txtKdy.Text = row["kdy"].ToString();//可打印总量
			}
			}
			/// <summary>
			@@ -667,7 +709,7 @@
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteBarcode",
			"VArrivalBarcodeManager/DeleteBarcode",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)