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

lu

2025-09-24 2c7e4315b905f2af7dfc88525077f6919177a379

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

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs

@@ -59,10 +59,8 @@
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -361,10 +359,8 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn17,
@@ -411,16 +407,6 @@
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 112;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "室温";
            this.gridColumn3.FieldName = "temperature";
            this.gridColumn3.MinWidth = 30;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 112;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "产品名称";
@@ -428,7 +414,7 @@
            this.gridColumn4.MinWidth = 30;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 112;
            // 
            // gridColumn5
@@ -438,18 +424,8 @@
            this.gridColumn5.MinWidth = 30;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.VisibleIndex = 3;
            this.gridColumn5.Width = 112;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "电压";
            this.gridColumn6.FieldName = "voltage";
            this.gridColumn6.MinWidth = 30;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 112;
            // 
            // gridColumn7
            // 
@@ -458,7 +434,7 @@
            this.gridColumn7.MinWidth = 30;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.Width = 112;
            // 
            // gridColumn8
@@ -468,7 +444,7 @@
            this.gridColumn8.MinWidth = 30;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 7;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 112;
            // 
            // gridColumn17
@@ -478,7 +454,7 @@
            this.gridColumn17.MinWidth = 30;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 8;
            this.gridColumn17.VisibleIndex = 6;
            this.gridColumn17.Width = 112;
            // 
            // gridColumn20
@@ -488,7 +464,7 @@
            this.gridColumn20.MinWidth = 30;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 9;
            this.gridColumn20.VisibleIndex = 7;
            this.gridColumn20.Width = 112;
            // 
            // gridColumn21
@@ -498,7 +474,7 @@
            this.gridColumn21.MinWidth = 30;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 10;
            this.gridColumn21.VisibleIndex = 8;
            this.gridColumn21.Width = 112;
            // 
            // gridColumn22
@@ -508,7 +484,7 @@
            this.gridColumn22.MinWidth = 30;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 11;
            this.gridColumn22.VisibleIndex = 9;
            this.gridColumn22.Width = 112;
            // 
            // gridColumn23
@@ -518,7 +494,7 @@
            this.gridColumn23.MinWidth = 30;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 12;
            this.gridColumn23.VisibleIndex = 10;
            this.gridColumn23.Width = 112;
            // 
            // gridColumn24
@@ -528,7 +504,7 @@
            this.gridColumn24.MinWidth = 30;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 13;
            this.gridColumn24.VisibleIndex = 11;
            this.gridColumn24.Width = 112;
            // 
            // gridColumn25
@@ -538,7 +514,7 @@
            this.gridColumn25.MinWidth = 30;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 14;
            this.gridColumn25.VisibleIndex = 12;
            this.gridColumn25.Width = 112;
            // 
            // gridColumn26
@@ -548,7 +524,7 @@
            this.gridColumn26.MinWidth = 30;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 15;
            this.gridColumn26.VisibleIndex = 13;
            this.gridColumn26.Width = 112;
            // 
            // gridColumn27
@@ -558,7 +534,7 @@
            this.gridColumn27.MinWidth = 30;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 16;
            this.gridColumn27.VisibleIndex = 14;
            this.gridColumn27.Width = 112;
            // 
            // gridColumn28
@@ -568,7 +544,7 @@
            this.gridColumn28.MinWidth = 30;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 17;
            this.gridColumn28.VisibleIndex = 15;
            this.gridColumn28.Width = 112;
            // 
            // gridColumn29
@@ -578,7 +554,7 @@
            this.gridColumn29.MinWidth = 30;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 18;
            this.gridColumn29.VisibleIndex = 16;
            this.gridColumn29.Width = 112;
            // 
            // gridColumn30
@@ -588,7 +564,7 @@
            this.gridColumn30.MinWidth = 30;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 19;
            this.gridColumn30.VisibleIndex = 17;
            this.gridColumn30.Width = 112;
            // 
            // gridColumn31
@@ -598,7 +574,7 @@
            this.gridColumn31.MinWidth = 30;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 20;
            this.gridColumn31.VisibleIndex = 18;
            this.gridColumn31.Width = 112;
            // 
            // gridColumn32
@@ -608,7 +584,7 @@
            this.gridColumn32.MinWidth = 30;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 21;
            this.gridColumn32.VisibleIndex = 19;
            this.gridColumn32.Width = 112;
            // 
            // gridColumn33
@@ -618,7 +594,7 @@
            this.gridColumn33.MinWidth = 30;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Visible = true;
            this.gridColumn33.VisibleIndex = 22;
            this.gridColumn33.VisibleIndex = 20;
            this.gridColumn33.Width = 112;
            // 
            // gridColumn52
@@ -628,7 +604,7 @@
            this.gridColumn52.MinWidth = 30;
            this.gridColumn52.Name = "gridColumn52";
            this.gridColumn52.Visible = true;
            this.gridColumn52.VisibleIndex = 23;
            this.gridColumn52.VisibleIndex = 21;
            this.gridColumn52.Width = 112;
            // 
            // pageBar1
@@ -2043,10 +2019,8 @@
        private DevExpress.XtraEditors.TextEdit txt_FQCNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs

@@ -11,9 +11,11 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -43,6 +45,7 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnGongZiClick += ToolBarMenu1_btnGongZiClick;
            this.toolBarMenu1.btnLianBanClick += ToolBarMenu1_btnLianBanClick;
            this.toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
@@ -559,5 +562,49 @@
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
        {
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                if (dialogResult == DialogResult.OK)
                {
                    string _folder = folderBrowserDialog.SelectedPath;
                    var _params = new
                    {
                        inLineNo = lineNo,//主建
                        inDate = date,
                        inOrgId = orgId
                    };
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_AttanCon", "", "", "", _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);
                    }
                }
            }
        }
    }
}