~tjx/GsMesClient.git

			@@ -4,9 +4,9 @@
			using System.Drawing;
			using System.Text;
			using System.Windows.Forms;
			using DevExpress.RichEdit.Export;
			using DevExpress.XtraEditors;
			using DevExpress.XtraGrid.Views.Grid;
			using Gs.DevApp.DevFrm.QC.Models;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -35,6 +35,10 @@
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
			gridView1.FocusedRowChanged += (s, e) =>
			{
			UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
			};
			getPageList(1, UtilityHelper.GetPageSize());
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			gridView1.CustomDrawRowIndicator += (s, e) =>
			@@ -264,7 +268,7 @@
			{
			toolBarMenu1.isSetBtn = false;
			string _ItemId = txt_ItemId.GetId()
			; if (string.IsNullOrEmpty(_ItemId))
			; if (string.IsNullOrEmpty(_ItemId))
			{
			MsgHelper.Warning("请选择物料！");
			txt_ItemId.Focus();
			@@ -288,7 +292,7 @@
			Fstand = row["Fstand"].ToString(),
			FacLevel = row["FacLevel"].ToString(),
			FspecRequ = row["FspecRequ"].ToString(),
			Memo = row["memo"].ToString(),
			Memo = row["memo"].ToString(),
			FupAllow = row["FupAllow"].ToString(),
			FdownAllow = row["FdownAllow"].ToString(),
			});
			@@ -297,11 +301,12 @@
			var _obj = new MesQmCheckitem
			{
			Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
			ItemId= long.Parse( _ItemId),
			ItemId = long.Parse(_ItemId),
			Memo = txt_memo.Text.Trim(),
			ItemNo = txt_itemNo.Text.Trim(),
			Isenabled = txt_isenabled.Checked,
			Ftype= "1",
			Ftype = "1",
			Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
			list = lst
			};
			try
			@@ -341,12 +346,12 @@
			itm.fileValue + "'");

			var pgq = new PageQueryModel(curPage, pageSize,
			"create_date", "asc", "", _sbSqlWhere.ToString());
			"a.create_date", "asc", "", _sbSqlWhere.ToString());
			var json = JsonConvert.SerializeObject(pgq);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			// _webServiceName + "GetListPageIQC", json);
			// _webServiceName + "GetListPageIQC", json);
			_webServiceName + "GetListPage", json);
			var dd =
			UtilityHelper.ReturnToTablePage(strReturn);
			@@ -390,7 +395,7 @@
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			// _webServiceName + "GetModelIQC",
			// _webServiceName + "GetModelIQC",
			_webServiceName + "GetModel",
			JsonConvert.SerializeObject(_obj));
			var _rtn =
			@@ -573,6 +578,7 @@
			foreach (DataRow dr in dt.Rows)
			{
			rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
			//rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
			//string ddddd = dr["SampleSizeName"].ToString();
			}
			}
			@@ -592,7 +598,7 @@
			"0.010---(AQL_0_0010)"
			, "0.015---(AQL_0_0015)"
			, "0.025---(AQL_0_0025)"
			,"0.04---(AQL_0_0040)"
			,"0.040---(AQL_0_0040)"
			,"0.065---(AQL_0_0065)"
			,"0.10---(AQL_0_010)"
			,"0.15---(AQL_0_015)"
			@@ -631,20 +637,55 @@
			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();
			GridView myView = (gcMx1.MainView as GridView);
			int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
			myView.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
			myView.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
			gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
			gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);

			}
			}


			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gvMx1.CloseEditor();
			gvMx1.UpdateCurrentRow();
			var rowhandle = gvMx1.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gvMx1.GetDataRow(rowhandle);
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			if (string.IsNullOrEmpty(mxGuid))
			{
			gvMx1.DeleteRow(rowhandle);
			return;
			}
			var strJson = "";
			var lst = new List<string>();
			lst.Add(mxGuid);
			try
			{
			strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModelMx",
			JsonConvert.SerializeObject(lst));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			}
			#endregion


			}
			}