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

yangle

2023-02-08 ce05473585fad247af0703c83414add86cea45c7

 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);
            //生成首行标题