~tjx/GsMesClient.git

			@@ -1,3 +1,5 @@
			using DevExpress.XtraEditors;
			using DevExpress.XtraGrid.Views.Grid;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -9,6 +11,7 @@
			using System.Data;
			using System.Drawing;
			using System.Text;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			namespace Gs.DevApp.DevFrm
			@@ -29,27 +32,21 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
			getPageList(1, UtilityHelper.GetPageSize());

			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			gridView1.CustomDrawRowIndicator += (s, e) =>
			txt_pba013.EditChanged += (s, e) =>
			{
			if (e.Info.IsRowIndicator && e.RowHandle >= 0)
			{
			e.Info.DisplayText = (e.RowHandle + 1).ToString();
			}
			};
			gridView1.CustomDrawEmptyForeground += (s, e) =>
			{
			string str = "暂未查找到匹配的数据!";
			Font f = new Font("微软雅黑", 16);
			Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
			e.Graphics.DrawString(str, f, Brushes.Gray, r);
			string workGuid = this.txt_pba013.GetGuid();
			txt_pba016.getSuppler(workGuid);
			_getListJybz(workGuid);
			};
			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_pba013.Text))
			if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择车间，才能选择任务单！");
			return;
			@@ -86,7 +83,12 @@
			frm.ShowDialog();
			};
			}

			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
			Task.Delay(100);
			getPageList(1);
			}
			/// <summary>
			/// 双击事件
			/// </summary>
			@@ -105,7 +107,7 @@
			/// <param name="pageSize"></param>
			private void PageBar1_PagerEvent(int curPage, int pageSize)
			{
			getPageList(curPage, pageSize);
			getPageList(curPage);
			}
			/// <summary>
			/// 查询事件
			@@ -125,15 +127,19 @@
			/// <param name="e"></param>
			private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
			{
			_filterList = e.FilterList;
			getPageList(1, pageBar1.RowsCount);
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			/// <summary>
			/// 审核事件
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
			private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			@@ -147,14 +153,14 @@
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定审核吗？"))
			return;
			UcLoading _loading = new UcLoading();

			var _obj = new
			{
			guid = rowGuid,
			};
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "EditModelSubmit",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			@@ -164,14 +170,14 @@
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			getPageList(1);
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();

			}

			/// <summary>
			@@ -180,7 +186,7 @@
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
			private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			@@ -193,14 +199,14 @@
			return;
			}
			//MsgHelper.Warning(rowGuid);
			UcLoading _loading = new UcLoading();

			var _obj = new
			{
			guid = rowGuid,
			};
			try
			{
			var strJson = await UtilityHelper.HttpPostAsync("",
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeApprove",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			@@ -209,7 +215,7 @@
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			getPageList(1);
			}
			else
			{
			@@ -220,7 +226,7 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			_loading.Stop();

			}

			/// <summary>
			@@ -242,7 +248,7 @@
			{
			string rowGuid = "", rowName = "";
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_hNo, gridView1,"hNo");
			lbGuid, txt_hNo, gridView1, "hNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			@@ -264,7 +270,7 @@
			if (_rtn.rtnCode > 0)
			{
			UtilityHelper.JumpToTab(xtraTabControl1, 0);
			getPageList(1, UtilityHelper.GetPageSize());
			getPageList(1);
			}

			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			@@ -285,7 +291,16 @@
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			getModel(lbGuid.Text.Trim(), false, 999);
			else
			getPageList(1, UtilityHelper.GetPageSize());
			{
			_filterList.Clear();
			if (gridView1.ActiveFilter.Count > 0)
			{
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			}
			getPageList(1);
			}
			}
			/// <summary>
			/// 修改事件
			@@ -325,19 +340,32 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			//if (string.IsNullOrEmpty(txt_account.Text.Trim()))
			//{
			// Gs.DevApp.ToolBox.MsgHelper.Warning("登录账号不能为空！");
			// txt_account.Focus();
			// return;
			//}
			var _sb = new StringBuilder();
			string workId = txt_pba013.GetId();
			if (string.IsNullOrEmpty(workId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择车间！");
			txt_pba013.Focus();
			return;
			}
			string lineId = txt_pba016.GetId();
			if (string.IsNullOrEmpty(lineId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择产线！");
			txt_pba016.Focus();
			return;
			}
			if (string.IsNullOrEmpty(txt_pba015.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("计划人数不能为空！");
			txt_pba015.Focus();
			return;
			}
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			bz = txt_pba009.Text.Trim(),
			cjId = 1,
			cxId = 1,
			cjId = workId,
			cxId = lineId,
			jhrs = txt_pba015.Text.Trim(),
			list = new List<dynamic>(),
			};
			@@ -354,12 +382,24 @@
			if (row != null)
			{
			Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			//string _msl = row["quantity"].ToString();
			//if (string.IsNullOrEmpty(_msl))
			//{
			// MsgHelper.ShowError("数量不能为空！");
			// return;
			//}
			string _LineId = row["daa015"].ToString();
			if (string.IsNullOrEmpty(_LineId))
			{
			MsgHelper.ShowError("产线不能为空！");
			return;
			}
			string _Pcsl = row["daa008"].ToString();
			if (string.IsNullOrEmpty(_LineId))
			{
			MsgHelper.ShowError("排产数量不能为空！");
			return;
			}
			string _Yjkgsj = row["mesStartProd"].ToString();
			if (string.IsNullOrEmpty(_LineId))
			{
			MsgHelper.ShowError("预计开工时间不能为空！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			@@ -397,31 +437,33 @@
			/// </summary>
			/// <param name="curPage">第几页</param>
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage, int pageSize)
			private void getPageList(int curPage)
			{
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			foreach (FilterEntity itm in _filterList)
			{
			_sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
			}
			PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());

			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			{
			string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
			var strReturn = UtilityHelper.HttpPost("",
			_webServiceName + "GetListPage", json);
			ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			int dddd = dd.rtnData.pages;//总页
			pageBar1.TotalPages = dddd;
			pageBar1.RecordCount = dd.rtnData.total;//记录总数
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			pageBar1.RowsCount = pageSize;//每页显示
			pageBar1.setTxt();
			pageBar1.RecordCount = dd.rtnData.total;//总记录数
			}
			else
			{
			@@ -432,6 +474,7 @@
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			}

			}
			private void getModel(string strGuid, bool isEdit, int tabIdx)
			{
			@@ -522,5 +565,51 @@
			}
			}
			}

			private void _getListJybz(string workGuid)
			{
			if (string.IsNullOrEmpty(workGuid))
			return;
			var _obj = new
			{
			guid = workGuid //主建
			};
			var json = JsonConvert.SerializeObject(_obj);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			"SysDepartmentManager/GetModel", json);
			var _job = JObject.Parse(strReturn);
			var array = new JArray();
			var d = _job["rtnData"]["list"];
			foreach (var a in d) array.Add(a);
			var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
			foreach (DataRow dr in dt.Rows)
			{
			rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}

			private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
			{
			ComboBoxEdit comboBox = sender as ComboBoxEdit;
			if (comboBox != null)
			{
			GridView myView = (gcMx1.MainView as GridView);
			int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
			CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
			string _val = _itm.Value.ToString();
			string _txt = _itm.Text.ToString();
			gvMx1.CloseEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.SetRowCellValue(dataIndex, "daa015LineName", _txt);
			gvMx1.SetRowCellValue(dataIndex, "daa015", _val);
			}
			}
			}
			}