Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

8 天以前 ba975e62723d88d0b60f3fcf7ae31e2b3a6f7569

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs

@@ -119,50 +119,69 @@
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
        {
            var frm2 = new Frm_XunJianDetect01Show();
            frm2.UpdateParent += (ss, ee) =>
            //是否检查无毕beg
            var dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            {
                string begDate = ee.StringSingle.Trim();
                using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            string strLotNo = dr["lotNo"].ToString();
            if (string.IsNullOrEmpty(strLotNo))
            {
                MsgHelper.ShowError("未开始检验，不能导出！");
                return;
            }
            //是否检查无毕end

            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定导出吗？"))
                return;
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                if (dialogResult == DialogResult.OK)
                {
                    folderBrowserDialog.Description = "选择导出文件的保存路径";
                    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                    if (dialogResult == DialogResult.OK)
                    string _folder = folderBrowserDialog.SelectedPath;
                    var _obj = new
                    {
                        string _folder = folderBrowserDialog.SelectedPath;
                        var _obj = new
                        guid = rowGuid,
                    };
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutXunJian", JsonConvert.SerializeObject(_obj));
                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                        if (_rtn.rtnCode > 0)
                        {
                            begDate = begDate,
                        };
                        try
                        {
                            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutXunJian", JsonConvert.SerializeObject(_obj));
                            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                            if (_rtn.rtnCode > 0)
                            string _file = _rtn.rtnData.fileUrl.ToString();
                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                            using (WebClient client = new WebClient())
                            {
                                string _file = _rtn.rtnData.fileUrl.ToString();
                                string _folderName = _folder + "\\" + _file.Replace("down/", "");
                                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                                using (WebClient client = new WebClient())
                                {
                                    client.DownloadFile(_url, _folderName);
                                }
                                var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
                                frm.ShowDialog();
                                client.DownloadFile(_url, _folderName);
                            }
                            else
                            {
                                ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                            }
                            var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
                            frm.ShowDialog();
                        }
                        catch (Exception ex)
                        else
                        {
                            ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                            ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                        }
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                    }
                }
            };
            frm2.ShowDialog();
            }
        }
        /// <summary>
        /// 日志事件