代码提交。

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -1396,7 +1396,7 @@ namespace Business.SystemJobManagement
                     "select wlh, wlmc, wlgg, gysdm, gysmc, jbdw, sl, left(rq, 4) + '-' + substring(rq, 5, 2) cgyf from scm_cgyc WHERE gysdm = '{0}'" +
                     " union " +
                     "SELECT i.number wlh, i.name wlmc, i.model wlgg, pr_purchasenumber gysdm, pr_purchasename gysmc, i.unit jbdw, p.pr_aqty sl, convert(varchar(7), p.pr_sarrive_date, 120) cgyf FROM srm_pr_main p left join ic_item i on p.icitem_id = i.id and p.company_id = i.company_id AND p.factory_id = i.factory_id " +
-                    "WHERE p.state = 1 AND p.pr_sarrive_date is not null AND p.pr_purchasenumber = '{0}') p left join scm_cgycfb m on p.wlh = m.wlh and p.gysdm = m.gysdm WHERE m.fbrq is not null", purchasenumber);
+                    "WHERE p.state = 1 AND p.pr_sarrive_date is not null AND p.pr_purchasenumber = '{0}' AND isnull(analogcalcversion,'')<>'') p left join scm_cgycfb m on p.wlh = m.wlh and p.gysdm = m.gysdm WHERE m.fbrq is not null", purchasenumber);
                 //正式测试需要加上  and isnull(analogcalcversion,'')<>''
                 var list = _businessDbContext.ProcurementForecast.FromSqlRaw(sql).ToList();
                 string result = "OK";