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

ch

2022-07-08 a51f8f5bd43b4dc86481f04c85842f27f119caea

 WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESProductReportStepBillController.cs

@@ -109,12 +109,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere + "order by å•æ®å· desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp order by HInterID desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    string sql = sql1 + sWhere + " order by HInterID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                }
                objJsonResult.code = "1";