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

zzr99

2021-11-05 e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76

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