|
|
@@ -452,7 +452,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//TODO:最早开始时间默认3天后(后期调整)
|
|
|
dtl.earliest_times = DateTime.Now.Date.AddDays(3);
|
|
|
dtl.need_qty = item.qty.GetValueOrDefault();
|
|
|
-
|
|
|
+ dtl.need_time = item.plan_date;
|
|
|
//获取当前物料bom数据
|
|
|
var childBom = boms.Where(p => p.item_number == item.item_number).FirstOrDefault();
|
|
|
dtl.bom_number = childBom.bom_number;
|
|
|
@@ -1298,6 +1298,12 @@ namespace Business.ResourceExamineManagement
|
|
|
return JsonConvert.SerializeObject(rtn);
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 检查结果组装
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="result"></param>
|
|
|
+ /// <param name="flag"></param>
|
|
|
+ /// <returns></returns>
|
|
|
public OrderResourceViewDto DataPackage(PschedDto result,bool flag =false)
|
|
|
{
|
|
|
OrderResourceViewDto rtn = new OrderResourceViewDto();
|
|
|
@@ -1348,8 +1354,9 @@ namespace Business.ResourceExamineManagement
|
|
|
cdto.is_use = subitem.is_use;
|
|
|
dto.order_item_list.Add(cdto);
|
|
|
string day = dto.time.ToString("yyyy-MM-dd");
|
|
|
- if (subitem.is_use)
|
|
|
+ if (subitem.is_use && subitem.level != 1)
|
|
|
{
|
|
|
+ //每日每物料使用情况
|
|
|
DayBulletinBoard dbb = rtn.DayBulletinBoardList.Find(s => s.day == day && s.item_number == cdto.item_number);
|
|
|
if (dbb == null)
|
|
|
{
|
|
|
@@ -1357,13 +1364,13 @@ namespace Business.ResourceExamineManagement
|
|
|
dbb.day = day;
|
|
|
dbb.item_name = cdto.item_name;
|
|
|
dbb.item_number = cdto.item_number;
|
|
|
+ rtn.DayBulletinBoardList.Add(dbb);
|
|
|
}
|
|
|
- dbb.self_lack_qty += subitem.self_lack_qty;
|
|
|
+ dbb.self_lack_qty += subitem.lack_qty;
|
|
|
dbb.use_qty += subitem.use_qty;
|
|
|
dbb.make_qty += cdto.make_qty;
|
|
|
dbb.mo_qty += subitem.mo_qty;
|
|
|
dbb.purchase_occupy_qty += subitem.purchase_occupy_qty;
|
|
|
- rtn.DayBulletinBoardList.Add(dbb);
|
|
|
}
|
|
|
});
|
|
|
rtn.KittingCheckResultList.Add(dto);
|