|
|
@@ -1104,7 +1104,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//直接按间隔多少天一次来处理数据,定时任务按周四来考虑。
|
|
|
DateTime toTime = DateTime.Now; //new DateTime(2023, 7, 6);
|
|
|
DateTime starttime = toTime.Date.AddDays(1);
|
|
|
- DateTime endtime = toTime.Date.AddDays(8);
|
|
|
+ DateTime endtime = toTime.Date.AddDays(7);
|
|
|
List<srm_pr_main> prlist = _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<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Contains(s.Id)).Result;
|
|
|
|
|
|
@@ -1312,9 +1312,9 @@ namespace Business.ResourceExamineManagement
|
|
|
//直接按间隔多少天一次来处理数据,定时任务按周四来考虑。
|
|
|
DateTime toTime = DateTime.Now;
|
|
|
DateTime starttime = toTime.AddDays(1);
|
|
|
- DateTime endtime = toTime.AddDays(8);
|
|
|
- List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.IsRequireGoods == 1 && s.pr_sarrive_date >= starttime &&
|
|
|
- s.pr_sarrive_date <= endtime && s.state == 1).Result;
|
|
|
+ DateTime endtime = toTime.AddDays(7);
|
|
|
+ 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;
|
|
|
|
|
|
if (prlist.Any())
|
|
|
{
|
|
|
@@ -2220,7 +2220,7 @@ namespace Business.ResourceExamineManagement
|
|
|
var itemsupplier = itemsupplierList.Find(a => a.Id == pr.pr_purchaseid);
|
|
|
po_Main.po_purchaser = pr.pr_purchaser;
|
|
|
po_Main.po_purchaser_no = pr.pr_purchaser_num;
|
|
|
- po_Main.po_ssend_date = DateTime.Now;
|
|
|
+ po_Main.po_ssend_date = list.Min(x => x.pr_ssend_date);
|
|
|
po_Main.po_tax_rate = pr.pr_rate;
|
|
|
po_Main.po_express = 1;
|
|
|
po_Main.state = 0;
|