|
|
@@ -1171,7 +1171,7 @@ namespace Business.ResourceExamineManagement
|
|
|
DateTime starttime = toTime.Date.AddDays(1);
|
|
|
DateTime endtime = toTime.Date.AddDays(28);
|
|
|
//只合并要货令
|
|
|
- List<srm_pr_main> alllist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1).Result;
|
|
|
+ List<srm_pr_main> alllist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1 && string.IsNullOrEmpty(s.analogcalcversion) == true).Result;
|
|
|
List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && alllist.Select(c => c.icitem_id).Distinct().Contains(s.Id)).Result;
|
|
|
|
|
|
|
|
|
@@ -1349,7 +1349,7 @@ namespace Business.ResourceExamineManagement
|
|
|
DateTime starttime = toTime.Date.AddDays(1);
|
|
|
DateTime endtime = toTime.Date.AddDays(28);
|
|
|
//取出采购申请数据
|
|
|
- List<srm_pr_main> prapplyList = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1 && s.IsRequireGoods == 0).Result;
|
|
|
+ List<srm_pr_main> prapplyList = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1 && s.IsRequireGoods == 0 && string.IsNullOrEmpty(s.analogcalcversion) == true).Result;
|
|
|
//List<srm_pr_main> prapplyList = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date <= starttime && s.state == 1 && s.IsRequireGoods == 0).Result;
|
|
|
string seqSql = "";
|
|
|
if (prapplyList.Any())
|
|
|
@@ -1472,7 +1472,7 @@ namespace Business.ResourceExamineManagement
|
|
|
DateTime starttime = toTime.AddDays(1);
|
|
|
DateTime endtime = toTime.AddDays(28);
|
|
|
List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.IsRequireGoods == 1 && s.pr_ssend_date >= starttime &&
|
|
|
- s.pr_ssend_date <= endtime && s.state == 1).Result;
|
|
|
+ s.pr_ssend_date <= endtime && s.state == 1 && string.IsNullOrEmpty(s.analogcalcversion) == true).Result;
|
|
|
|
|
|
if (prlist.Any())
|
|
|
{
|
