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

yangle

2023-06-16 5921ea84c8339cdf9e9d91d4d41bfe15c4764f2a

 WorkM/Éú²ú¹ÜÀí/Sc_ICMOBillList.cs

@@ -49,7 +49,7 @@
            //过滤条件
            if (frmCondition.SqlStr.Trim().Length == 0)
                return;
            sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by å•æ®å· desc,hsubid ";
            sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by å•æ®å· desc,hsubid ";
            //
            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题