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

zzr99

2021-10-22 17ea6bba570df1f10bf203c7577054d6d7b43a2a

 WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs

@@ -414,13 +414,13 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillList " + sWhere, "h_v_QC_ProcessCheckBillList");
                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail " + sWhere, "h_v_QC_ProcessCheckBillListDetail");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_ProcessCheckBillList where 1 = 1 ";
                    string sql1 = "select * from h_v_QC_ProcessCheckBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillList");
                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {