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

lg

2025-11-24 dfd02ad42c5b4f8ee7190fe51730c21cf75d37a5

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs

@@ -7,8 +7,10 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlTypes;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -32,7 +34,10 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -675,7 +680,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and daa.erp_sczz in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -745,11 +754,13 @@
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        this.xtraTabControl2.SelectedTabPageIndex = 0;
                        gcMx1.DataSource = null;
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        ucUpFileList1.pGuid = lbGuid.Text.Trim();
                        ucChouJianList1.pGuid = lbGuid.Text.Trim();
                        if (guid5.Length > 10)
@@ -921,6 +932,37 @@
            frm.ShowDialog();
        }

        //生产报告
        private void ToolBarMenu1_btnBaoGaoClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetBaoGao", JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("生成成功");
                }
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 检验和反检验
@@ -1047,5 +1089,53 @@
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
        {
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
                _sbSqlWhere.Append(" and daa.erp_sczz in");
                _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
                _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
                if (dialogResult == DialogResult.OK)
                {
                    string _folder = folderBrowserDialog.SelectedPath;
                    var _params = new
                    {
                        inSortName = "",
                        inSortOrder = "",
                        inQueryWhere = _sbSqlWhere.ToString()
                    };
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_fqclst", "", "", "", _params);
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", 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())
                            {
                                client.DownloadFile(_url, _folderName);
                            }
                            ToolBox.MsgHelper.ShowInformation("导出成功！");
                        }
                        else
                        {
                            ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                        }
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                    }
                }
            }
        }
    }
}