|
|
@@ -132,7 +132,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <param name="plan_date"></param>
|
|
|
/// <param name="checkflag">是否生成工单、委外、采购</param>
|
|
|
public void CalcView(List<BomChildExamineDto> returnlist, long bangid, decimal count, DateTime
|
|
|
- ? plan_date, List<mo_ic_item_stockoccupy> sklist, crm_seorderentry sentrys, List<mo_ic_item> icitemlist)
|
|
|
+ ? plan_date, List<mo_ic_item_stockoccupy> sklist, crm_seorderentry sentrys,int urgent, List<mo_ic_item> icitemlist)
|
|
|
{
|
|
|
ProductionTimeDay = 0;
|
|
|
//第一级
|
|
|
@@ -260,7 +260,7 @@ namespace Business.ResourceExamineManagement
|
|
|
morder_state = MorderEnum.Initial_state,
|
|
|
bang_id = bangid
|
|
|
};
|
|
|
- CreateMainOrder(generateMorderDto, level1Dto, childList, returnlist, bangid, plan_date, sklist, sentrys, icitemlist);
|
|
|
+ CreateMainOrder(generateMorderDto, level1Dto, childList, returnlist, bangid, plan_date, sklist, sentrys, urgent, icitemlist);
|
|
|
}
|
|
|
else if (level1Dto.erp_cls == 3)
|
|
|
{
|
|
|
@@ -330,14 +330,14 @@ namespace Business.ResourceExamineManagement
|
|
|
/// 生成主工单
|
|
|
/// </summary>
|
|
|
public void CreateMainOrder(GenerateMorderDto generateMorderDto, BomChildExamineDto level1Dto, List<BomChildExamineDto> childList, List<BomChildExamineDto> returnlist, long bangid, DateTime
|
|
|
- ? plan_date, List<mo_ic_item_stockoccupy> sklist, crm_seorderentry sentrys, List<mo_ic_item> icitemlist)
|
|
|
+ ? plan_date, List<mo_ic_item_stockoccupy> sklist, crm_seorderentry sentrys,int urgent, List<mo_ic_item> icitemlist)
|
|
|
{
|
|
|
//生成主工单
|
|
|
_morderAppService.process = process;
|
|
|
_morderAppService.techs = techs;
|
|
|
_morderAppService.tech_Processes = tech_Processes;
|
|
|
_morderAppService.tech_Proc_Workshops = tech_Proc_Workshops;
|
|
|
- Mes_MorderDto mes_MorderDto = _morderAppService.GenerateMorder(generateMorderDto);
|
|
|
+ Mes_MorderDto mes_MorderDto = _morderAppService.GenerateMorder(generateMorderDto, urgent);
|
|
|
MatterTileDevelop(level1Dto, childList, returnlist, sklist, bangid, plan_date, sentrys, icitemlist);
|
|
|
//这里更新产品得满足时间。
|
|
|
if (mes_MorderDto != null)
|