|
|
@@ -617,7 +617,6 @@ namespace Business.ResourceExamineManagement
|
|
|
_productExamineAppService.tech_Processes = tech_Processes;
|
|
|
_productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
|
|
|
|
|
|
- item.make_qty = item.lack_qty;
|
|
|
/*if (param.checkflag)
|
|
|
{
|
|
|
//todo:增加生成子工单后,这里需要加上生成的子工单的明细。
|
|
|
@@ -1107,7 +1106,7 @@ namespace Business.ResourceExamineManagement
|
|
|
sRMPR.srm_Pr_Main = new List<mo_srm_pr_main>();
|
|
|
if (leadTime == null || !supplier.Any() || plan == null)
|
|
|
{
|
|
|
- sRMPR.lastStartTmie = deliveryDate.AddDays(7 * -1);//减去提前期
|
|
|
+ sRMPR.lastStartTmie = DateTime.Now.AddDays(7);//减去提前期
|
|
|
return sRMPR;
|
|
|
//throw new NotImplementedException("未找到物料ic_factory_details或ic_item_pur或ic_plan信息!");
|
|
|
}
|
|
|
@@ -1139,11 +1138,11 @@ namespace Business.ResourceExamineManagement
|
|
|
srm_Pr.icitem_id = returnlist.item_id;//物料id
|
|
|
srm_Pr.icitem_name = returnlist.item_name;//物料名称
|
|
|
srm_Pr.pr_order_type = 1;//单据类型
|
|
|
- srm_Pr.pr_ssend_date = deliveryDate.AddDays((double)leadTime.order_leadtime * -1);//系统建议下单日期
|
|
|
- srm_Pr.pr_sarrive_date = deliveryDate.AddDays((double)leadTime.transportation_leadtime * -1);//系统建议到达日期(建议到货日期)
|
|
|
- srm_Pr.pr_psend_date = deliveryDate.AddDays((double)leadTime.order_leadtime * -1);//计划下单日期
|
|
|
- srm_Pr.pr_parrive_date = deliveryDate.AddDays((double)leadTime.transportation_leadtime * -1);//计划到达日期
|
|
|
- srm_Pr.pr_psend_date = deliveryDate.AddDays((double)leadTime.order_leadtime * -1);//计划下单日期
|
|
|
+ srm_Pr.pr_ssend_date = DateTime.Now.AddDays((double)leadTime.order_leadtime);//系统建议下单日期
|
|
|
+ srm_Pr.pr_sarrive_date = DateTime.Now.AddDays((double)leadTime.transportation_leadtime);//系统建议到达日期(建议到货日期)
|
|
|
+ srm_Pr.pr_psend_date = DateTime.Now.AddDays((double)leadTime.order_leadtime);//计划下单日期
|
|
|
+ srm_Pr.pr_parrive_date = DateTime.Now.AddDays((double)leadTime.transportation_leadtime);//计划到达日期
|
|
|
+ srm_Pr.pr_psend_date = DateTime.Now.AddDays((double)leadTime.order_leadtime);//计划下单日期
|
|
|
srm_Pr.pr_sysprice = returnlist.lack_qty * x.netpurchase_price * (1 + x.taxrate);//系统价格(含税)
|
|
|
srm_Pr.pr_orderprice = returnlist.lack_qty * x.netpurchase_price * (1 + x.taxrate);//订单价格(含税)
|
|
|
srm_Pr.pr_price = x.netpurchase_price;//采购净价(不含税)
|
|
|
@@ -1168,7 +1167,7 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
|
sRMPR.item_no = returnlist.num;
|
|
|
sRMPR.orderentry_id = returnlist.sentry_id;
|
|
|
- sRMPR.lastStartTmie = deliveryDate.AddDays((double)sRMPR.srm_Pr_Main.MinBy(x=>x.totalLeadTime).totalLeadTime * -1);//减去提前期
|
|
|
+ sRMPR.lastStartTmie = DateTime.Now.AddDays((double)sRMPR.srm_Pr_Main.MinBy(x=>x.totalLeadTime).totalLeadTime);//减去提前期
|
|
|
return sRMPR;
|
|
|
}
|
|
|
// 生成订单编号 字母+年月日+8位随机数+时间戳
|