dev前台代码
上一版本: 71663cce | 补丁 | 提交 | 忽略空白
lg
2025-11-28 1708934e25d663104182867b4c238a0c1531352f 
Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
已修改3个文件
185 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs


@@ -224,6 +224,8 @@


            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


@@ -477,7 +479,9 @@


            this.gridColumn17,


            this.gridColumn7,


            this.gridColumn6,


            this.gridColumn11});


            this.gridColumn11,


            this.gridColumn12,


            this.gridColumn16});


            this.gridView1.DetailHeight = 428;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 62;


@@ -2533,6 +2537,26 @@


            // 


            this.gridView4.Name = "gridView4";


            // 


            // gridColumn12


            // 


            this.gridColumn12.Caption = "违规类别";


            this.gridColumn12.FieldName = "msg";


            this.gridColumn12.MinWidth = 30;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 21;


            this.gridColumn12.Width = 112;


            // 


            // gridColumn16


            // 


            this.gridColumn16.Caption = "异常描述";


            this.gridColumn16.FieldName = "countmsg";


            this.gridColumn16.MinWidth = 30;


            this.gridColumn16.Name = "gridColumn16";


            this.gridColumn16.Visible = true;


            this.gridColumn16.VisibleIndex = 22;


            this.gridColumn16.Width = 112;


            // 


            // Frm_FqcDetect01


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);


@@ -2857,5 +2881,7 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;


    }


}




 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs


@@ -8,7 +8,9 @@


using Newtonsoft.Json.Linq;


using System;


using System.Collections.Generic;


using System.Configuration;


using System.Data;


using System.Net;


using System.Threading.Tasks;


using System.Windows.Forms;




@@ -37,6 +39,7 @@


            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;


            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;


            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;


            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;


            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;


            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;


            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;


@@ -770,5 +773,61 @@


            }


        }




        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 a.ReceiveOrgId in");


                _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());


                _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));


                if (strType == QcSeason.其它入库检.ToString())


                {


                    _sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");


                }


                if (strType == QcSeason.受托入库.ToString())


                {


                    _sbSqlWhere.Append(" and isnull(st.isCheck,0)=1 and isnull(st.qt032,0)=1");


                }


                if (dialogResult == DialogResult.OK)


                {


                    string _folder = folderBrowserDialog.SelectedPath;


                    var _params = new


                    {


                        inSortName = "",


                        inSortOrder = "",


                        inQueryWhere = _sbSqlWhere.ToString()


                    };


                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_rkqcdetect01lst", "", "", "", _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);


                    }


                }


            }


        }




    }


}




 DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs


@@ -29,15 +29,15 @@


        private void InitializeComponent()


        {


            this.components = new System.ComponentModel.Container();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraGrid.GridLevelNode gridLevelNode2 = new DevExpress.XtraGrid.GridLevelNode();


            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();


            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();


            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();


@@ -137,6 +137,8 @@


            this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -301,7 +303,9 @@


            this.fcheckByUserName,


            this.gridColumn13,


            this.gridColumn18,


            this.gridColumn19});


            this.gridColumn19,


            this.gridColumn11,


            this.gridColumn20});


            this.gridView1.DetailHeight = 428;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 62;


@@ -777,32 +781,32 @@


            this.layoutControlItem14});


            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;


            this.Root.Name = "Root";


            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition1.Width = 100D;


            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition2.Width = 100D;


            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition3.Width = 100D;


            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition4.Width = 100D;


            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition5.Width = 100D;


            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition6.Width = 100D;


            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition7.Width = 100D;


            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition8.Width = 100D;


            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {


            columnDefinition1,


            columnDefinition2,


            columnDefinition3,


            columnDefinition4});


            rowDefinition1.Height = 100D;


            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition2.Height = 100D;


            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition3.Height = 100D;


            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition4.Height = 100D;


            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition5,


            columnDefinition6,


            columnDefinition7,


            columnDefinition8});


            rowDefinition5.Height = 100D;


            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition6.Height = 100D;


            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition7.Height = 100D;


            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition8.Height = 100D;


            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;


            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {


            rowDefinition1,


            rowDefinition2,


            rowDefinition3,


            rowDefinition4});


            rowDefinition5,


            rowDefinition6,


            rowDefinition7,


            rowDefinition8});


            this.Root.Size = new System.Drawing.Size(1704, 183);


            this.Root.TextVisible = false;


            // 


@@ -1274,9 +1278,9 @@


            // 


            this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMx7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);


            gridLevelNode1.RelationName = "Level1";


            gridLevelNode2.RelationName = "Level1";


            this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {


            gridLevelNode1});


            gridLevelNode2});


            this.gcMx7.Location = new System.Drawing.Point(0, 0);


            this.gcMx7.MainView = this.gvMx7;


            this.gcMx7.Margin = new System.Windows.Forms.Padding(4);


@@ -1391,6 +1395,26 @@


            this.picCheckBox.TabIndex = 9;


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


            // gridColumn11


            // 


            this.gridColumn11.Caption = "异常描述";


            this.gridColumn11.FieldName = "msg";


            this.gridColumn11.MinWidth = 30;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 13;


            this.gridColumn11.Width = 112;


            // 


            // gridColumn20


            // 


            this.gridColumn20.Caption = "违规类别";


            this.gridColumn20.FieldName = "countmsg";


            this.gridColumn20.MinWidth = 30;


            this.gridColumn20.Name = "gridColumn20";


            this.gridColumn20.Visible = true;


            this.gridColumn20.VisibleIndex = 14;


            this.gridColumn20.Width = 112;


            // 


            // Frm_WomFanGong


            // 


@@ -1572,5 +1596,7 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;


    }


}