Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

ouyangqing

2021-01-20 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3

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

@@ -65,17 +65,7 @@
            if (!string.IsNullOrEmpty(textBox2.Text))

                whereBuilder.Append(" and b.FLOT_TEXT like ''%"+textBox2.Text+"%''");

            if (comboBox1.Text != "全部")

            {

                if(comboBox1.Text=="合格品")

                {

                    whereBuilder.Append(" and c.HProdLev=''''");

                }

                else

                {

                    whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text + "''");

                }

                
            }

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

                whereBuilder.Append(" and g.HName like ''%"+textBox4.Text+"%''");

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