雅琪诺MES智能条码管理系统
parent: 7a1c5d24 | 补丁 | 提交 | show whitespace
zgq
2021-01-20 1ec6f88cd1ce5901c37046dad254f497603324f0 
Revert "汇总表检验状态筛选"

This reverts commit 7a1c5d244dc5b6f6fa62b3d8e3322b5a555948be.
2个文件已修改
84 ■■■■■ 已修改文件
SCM/单据资料/Gy_BarCodeMain.Designer.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Gy_BarCodeMain.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.Designer.cs


@@ -48,14 +48,12 @@


            this.lbldj = new System.Windows.Forms.Label();


            this.lblCaption = new System.Windows.Forms.Label();


            this.Tool = new System.Windows.Forms.ToolStrip();


            this.yl = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();


            this.cx = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();


            this.tc = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();


            this.comboBox1 = new System.Windows.Forms.ComboBox();


            this.label8 = new System.Windows.Forms.Label();


            this.yl = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();


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


            this.groupBox1.SuspendLayout();


            this.pPic.SuspendLayout();


@@ -71,7 +69,7 @@


            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


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


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


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


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


            this.grdMain.Name = "grdMain";


            this.grdMain.ReadOnly = true;


            this.grdMain.RowHeadersWidth = 51;


@@ -82,8 +80,6 @@


            // groupBox1


            // 


            this.groupBox1.BackColor = System.Drawing.Color.Lavender;


            this.groupBox1.Controls.Add(this.comboBox1);


            this.groupBox1.Controls.Add(this.label8);


            this.groupBox1.Controls.Add(this.dateTimePicker2);


            this.groupBox1.Controls.Add(this.dateTimePicker1);


            this.groupBox1.Controls.Add(this.label9);


@@ -96,9 +92,9 @@


            this.groupBox1.Controls.Add(this.label4);


            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;


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


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


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


            this.groupBox1.Name = "groupBox1";


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


            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.groupBox1.Size = new System.Drawing.Size(1277, 129);


            this.groupBox1.TabIndex = 56;


            this.groupBox1.TabStop = false;


@@ -146,7 +142,7 @@


            // textBox2


            // 


            this.textBox2.Location = new System.Drawing.Point(628, 75);


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


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


            this.textBox2.Name = "textBox2";


            this.textBox2.Size = new System.Drawing.Size(172, 25);


            this.textBox2.TabIndex = 16;


@@ -164,7 +160,7 @@


            // textBox1


            // 


            this.textBox1.Location = new System.Drawing.Point(365, 75);


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


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


            this.textBox1.Name = "textBox1";


            this.textBox1.Size = new System.Drawing.Size(172, 25);


            this.textBox1.TabIndex = 14;


@@ -182,7 +178,7 @@


            // txtHBillNo


            // 


            this.txtHBillNo.Location = new System.Drawing.Point(96, 76);


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


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


            this.txtHBillNo.Name = "txtHBillNo";


            this.txtHBillNo.Size = new System.Drawing.Size(172, 25);


            this.txtHBillNo.TabIndex = 12;


@@ -206,7 +202,7 @@


            this.pPic.Controls.Add(this.lblCaption);


            this.pPic.Dock = System.Windows.Forms.DockStyle.Top;


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


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


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


            this.pPic.Name = "pPic";


            this.pPic.Size = new System.Drawing.Size(1277, 41);


            this.pPic.TabIndex = 55;


@@ -217,7 +213,7 @@


            this.panel1.Controls.Add(this.lbldj);


            this.panel1.Dock = System.Windows.Forms.DockStyle.Right;


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


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


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


            this.panel1.Name = "panel1";


            this.panel1.Size = new System.Drawing.Size(181, 41);


            this.panel1.TabIndex = 7;


@@ -276,25 +272,6 @@


            this.Tool.TabIndex = 54;


            this.Tool.Text = "toolStrip1";


            // 


            // yl


            // 


            this.yl.AutoSize = false;


            this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));


            this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.yl.Name = "yl";


            this.yl.Size = new System.Drawing.Size(35, 42);


            this.yl.Text = "引出";


            this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.yl.Click += new System.EventHandler(this.yl_Click);


            // 


            // toolStripSeparator1


            // 


            this.toolStripSeparator1.Name = "toolStripSeparator1";


            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);


            // 


            // cx


            // 


            this.cx.AutoSize = false;


@@ -334,28 +311,24 @@


            this.toolStripSeparator9.Name = "toolStripSeparator9";


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);


            // 


            // comboBox1


            // yl


            // 


            this.comboBox1.FormattingEnabled = true;


            this.comboBox1.Items.AddRange(new object[] {


            "全部",


            "已检验",


            "未检验"});


            this.comboBox1.Location = new System.Drawing.Point(907, 75);


            this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.comboBox1.Name = "comboBox1";


            this.comboBox1.Size = new System.Drawing.Size(172, 23);


            this.comboBox1.TabIndex = 35;


            this.yl.AutoSize = false;


            this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));


            this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.yl.Name = "yl";


            this.yl.Size = new System.Drawing.Size(35, 42);


            this.yl.Text = "引出";


            this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.yl.Click += new System.EventHandler(this.yl_Click);


            // 


            // label8


            // toolStripSeparator1


            // 


            this.label8.AutoSize = true;


            this.label8.Location = new System.Drawing.Point(818, 80);


            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label8.Name = "label8";


            this.label8.Size = new System.Drawing.Size(82, 15);


            this.label8.TabIndex = 34;


            this.label8.Text = "检验状况：";


            this.toolStripSeparator1.Name = "toolStripSeparator1";


            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);


            // 


            // Gy_BarCodeMain


            // 


@@ -408,7 +381,5 @@


        private System.Windows.Forms.Label label11;


        private System.Windows.Forms.ToolStripButton yl;


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;


        private System.Windows.Forms.ComboBox comboBox1;


        private System.Windows.Forms.Label label8;


    }


}




 SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.cs


@@ -16,7 +16,6 @@


            InitializeComponent();


            dateTimePicker1.Text = DateTime.Now.AddDays(-7).ToString();


            dateTimePicker2.Text = DateTime.Now.ToString();


            comboBox1.SelectedItem = "全部";


            oWeb.Url = SCM.ClsPub1.WEBSURL;


        }


        public frmBillQueryCondition_Base frmCondition;


@@ -50,10 +49,6 @@


                whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''");


            if (!string.IsNullOrEmpty(textBox2.Text))


                whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''");


            if (comboBox1.Text == "已检验")


                whereBuilder.Append(" and c.HMaterName is not null");


            else if(comboBox1.Text=="未检验")


                whereBuilder.Append(" and c.HMaterName is null");


            var execSql = "exec "+ViewName+" '"+whereBuilder+"'";


            DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);


            //生成首行标题