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

zzr99

2021-12-25 9385f2a2e4e2b6578f4b9e1cc139db977c2467ee

 PlanM/¼Æ»®¹ÜÀí/Gy_RoutingBillList.cs

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