Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2022-11-25 494c68c9ad1cc3b085c27e87865269c4593c24e8

 WorkM/±¨±í·ÖÎö/Pt_RadiumCarvingCodeBillList.cs

@@ -194,6 +194,21 @@
            {
                sFastSQL = sFastSQL + " and a.CarveTime<='" + dtpHEDate.Value.ToString("yyyy-MM-dd") + " 23:59:59" + "'";
            }
            //判断流传单号
            if (SpreadNo.Text.ToString().Trim() != "") 
            {
                sFastSQL = sFastSQL + " and b.spreadno like '%"+ SpreadNo.Text.ToString().Trim() + "%'";
            }
            //判断镭雕码
            if (SpreadCar.Text.ToString().Trim() != "")
            {
                sFastSQL = sFastSQL + " and a.SerialNo like '%" + SpreadCar.Text.ToString().Trim() + "%'";
            }
            //判断机台编号
            if (SpreadNo.Text.ToString().Trim() != "")
            {
                sFastSQL = sFastSQL + " and b.DeviceSerialNum='" + SpreadNo.Text.ToString().Trim() + "'";
            }
            if (sFastSQL.Trim() == "")
            {
                MessageBox.Show("没有输入条件!");