~tjx/GsMesClient.git

			@@ -62,6 +62,7 @@
			btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
			btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
			btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
			btnOa.ItemClick += BtnOa_ItemClick;
			var lst = new List<string>();
			foreach (BarItem item in barManager1.Items)
			if (item is BarLargeButtonItem largeButtonItem)
			@@ -69,7 +70,8 @@
			lst.Add(item.Caption);
			actions = lst;
			}



			/// <summary>
			/// 初始化按钮状态
			/// </summary>
			@@ -262,21 +264,6 @@
			btnFjianYanClick(this, e);
			else
			return;
			//if (string.IsNullOrEmpty(guidKey))
			//{
			// MsgHelper.Warning("请先选择你要操作的行！");
			// return;
			//}

			//if (string.IsNullOrEmpty(chkParameter))
			//{
			// MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！");
			// return;
			//}

			//if (!MsgHelper.AskQuestion("你选择了1条数据，确定撤回检验吗？"))
			// return;
			//_ckService(0.ToString());
			}

			private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
			@@ -287,27 +274,6 @@
			btnJianYanClick(this, e);
			else
			return;

			//if (string.IsNullOrEmpty(guidKey))
			//{
			// MsgHelper.Warning("请先选择你要操作的行！");
			// return;
			//}

			//if (string.IsNullOrEmpty(chkParameter))
			//{
			// MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！");
			// return;
			//}

			//if (!MsgHelper.AskQuestion("你选择了1条数据，确定提交检验吗？"))
			// return;
			//var _obj = new
			//{
			// guid = guidKey,
			// parameter = chkParameter
			//};
			//_ckService(1.ToString());
			}
			private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
			{
			@@ -324,38 +290,42 @@
			MsgHelper.ShowError("没有指定导入服务，请联系开发人员获取支持！");
			return;
			}

			var openFileDialog = new OpenFileDialog();
			//openFileDialog.InitialDirectory = "c:\\";
			openFileDialog.Filter = "文本文件 (.txt)\|.txt\|所有文件 (.)\|.";
			openFileDialog.Title = "选择文件";
			var result = openFileDialog.ShowDialog();
			if (result == DialogResult.OK)
			//用于判断iqc,ipqc首检，ipqc巡检，fqc
			string strType = "";
			string strService = "";
			if (xlsInService.Contains("&"))
			{
			var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] +
			"Upload/UploadFile";
			var strJson =
			await UtilityHelper.UploadFileAsync(openFileDialog
			.FileName);
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			string filePath = _rtn.rtnData["filePath"].ToString();
			if (_rtn.rtnCode > 0)
			{
			var _obj = filePath;
			try
			{
			strJson = UtilityHelper.HttpPost("",
			"XlsInOut/" + xlsInService,
			JsonConvert.SerializeObject(_obj));
			_rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			strType = xlsInService.Split('&')[1];
			strService = xlsInService.Split('&')[0];
			}
			else {
			strType = "";
			strService = xlsInService;
			}
			//这是一个随机值，将会被当作父亲guid存到file表中，服务端根据这个guid读取相应的文件
			string upGuid = Guid.NewGuid().ToString();
			Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
			frm.UpdateParent += (ss, ee) =>
			{
			var _obj = new
			{
			tmpGuid = upGuid,
			strType = strType,
			};
			try
			{
			string strJson = UtilityHelper.HttpPost("",
			"XlsInOut/" + strService,
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			};
			frm.ShowDialog();
			}

			private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
			@@ -458,6 +428,16 @@
			if (btnQueryClick != null) btnQueryClick(this, e);
			}

			private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
			{
			if (btnOaClick != null) btnOaClick(this, e);
			}

			/// <summary>
			/// 取消时，还原按钮可用性
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
			{
			if (MsgHelper.AskQuestion("确定要要取消吗?"))
			@@ -486,6 +466,12 @@
			lst.Add(btnKg.Name);
			lst.Add(btnWg.Name);
			lst.Add(btnZhongTai.Name);
			lst.Add(btnCaiWuChk.Name);
			lst.Add(btnCaiWuFchk.Name);
			lst.Add(btnCaiGouChk.Name);
			lst.Add(btnCaiGouFchk.Name);
			lst.Add(btnShouHouChk.Name);
			lst.Add(btnShouHouFchk.Name);
			_enabledBtn(lst);
			this.currentAction = "esc";
			if (btnEscClick != null) btnEscClick(this, e);
			@@ -493,6 +479,11 @@
			}


			/// <summary>
			/// 保存成功后，还原按钮可用性
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
			{
			if (btnSaveClick != null)
			@@ -503,7 +494,6 @@
			var lst = new List<string>();
			lst.Add(btnAdd.Name);
			lst.Add(btnEdit.Name);
			//lst.Add(btnEsc.Name);
			lst.Add(btnChk.Name);
			lst.Add(btnFchk.Name);
			lst.Add(btnDel.Name);
			@@ -525,6 +515,13 @@
			lst.Add(btnFont.Name);
			lst.Add(btnLoad.Name);
			lst.Add(btnTzbl.Name);
			lst.Add(btnZhongTai.Name);
			lst.Add(btnCaiWuChk.Name);
			lst.Add(btnCaiWuFchk.Name);
			lst.Add(btnCaiGouChk.Name);
			lst.Add(btnCaiGouFchk.Name);
			lst.Add(btnShouHouChk.Name);
			lst.Add(btnShouHouFchk.Name);
			_enabledBtn(lst);
			}

			@@ -551,6 +548,9 @@
			lst.Add(btnHelp.Name);
			lst.Add(btnLayout.Name);
			lst.Add(btnFont.Name);
			lst.Add(btnFont.Name);
			lst.Add(btnJianYan.Name);
			lst.Add(btnLog.Name);
			_enabledBtn(lst);
			this.currentAction = "edit";
			if (btnEdtClick != null) btnEdtClick(this, e);
			@@ -1030,7 +1030,11 @@
			/// 生成首检
			/// </summary>
			public event EventHandler btnShouJianClick;
			//public event EventHandler btnLayoutClick;

			/// <summary>
			/// 发送OA
			/// </summary>
			public event EventHandler btnOaClick;

			#endregion