|
|
@@ -5187,7 +5187,7 @@ namespace Business.Replenishment
|
|
|
mes_Morder.product_code = ic_item.ItemNum;
|
|
|
mes_Morder.product_name = ic_item.Descr;
|
|
|
mes_Morder.morder_date = DateTime.Now.Date.AddDays(1);
|
|
|
- mes_Morder.moentry_sys_stime= Convert.ToDateTime(productList[0].PlanMonth + "-01");
|
|
|
+ mes_Morder.moentry_sys_stime= Convert.ToDateTime(productList[i].PlanMonth + "-01");
|
|
|
mes_Morder.moentry_prd = null;
|
|
|
mes_Morder.moentry_prdname = null;
|
|
|
mes_Morder.moentry_wrkc = null;
|
|
|
@@ -5216,12 +5216,12 @@ namespace Business.Replenishment
|
|
|
moList.Add(mes_Morder);
|
|
|
moentryList.Add(mes_Moentry);
|
|
|
}
|
|
|
- var safeItemQty = _itemMaster.Select(a => a.PurMfg == "L" && a.SafetyStk > 0 &&a.IsActive);
|
|
|
- if(safeItemQty.Count>0)
|
|
|
+ var safeItemQty = _itemMaster.Select(a => a.PurMfg == "L" && a.SafetyStk > 0 && a.IsActive);
|
|
|
+ if (safeItemQty.Count > 0)
|
|
|
{
|
|
|
var itemStock = CalcStock(safeItemQty.Select(m => m.ItemNum).Distinct().ToList(), input);
|
|
|
var safelist = _serialNumberAppService.GetBillNo(input.factory_id.ToString(), "M5", productList.Count(), "", 1);
|
|
|
- for(int i=0;i<safeItemQty.Count;i++)
|
|
|
+ for (int i = 0; i < safeItemQty.Count; i++)
|
|
|
{
|
|
|
mes_morder mes_Morder = new mes_morder();
|
|
|
mes_Morder.GenerateNewId(help.NextId());
|
|
|
@@ -5249,24 +5249,24 @@ namespace Business.Replenishment
|
|
|
mes_Morder.picking_qty = 0;
|
|
|
mes_Morder.unit = safeItemQty[i].UM;
|
|
|
var itemStockQty = itemStock.Find(a => a.ItemNumber == safeItemQty[i].ItemNum);
|
|
|
- if (itemStockQty!=null)
|
|
|
+ if (itemStockQty != null)
|
|
|
{
|
|
|
- if(itemStockQty.Qty< safeItemQty[i].SafetyStk)
|
|
|
+ if (itemStockQty.Qty < safeItemQty[i].SafetyStk)
|
|
|
{
|
|
|
- mes_Morder.morder_production_number = safeItemQty[i].SafetyStk- itemStockQty.Qty;
|
|
|
+ mes_Morder.morder_production_number = safeItemQty[i].SafetyStk - itemStockQty.Qty;
|
|
|
mes_Morder.need_number = safeItemQty[i].SafetyStk - itemStockQty.Qty;
|
|
|
- }else
|
|
|
+ }
|
|
|
+ else
|
|
|
{
|
|
|
//超过安全库存不用考虑
|
|
|
continue;
|
|
|
}
|
|
|
- }else
|
|
|
+ }
|
|
|
+ else
|
|
|
{
|
|
|
mes_Morder.morder_production_number = safeItemQty[i].SafetyStk;
|
|
|
mes_Morder.need_number = safeItemQty[i].SafetyStk;
|
|
|
}
|
|
|
- mes_Morder.morder_production_number = safeItemQty[i].SafetyStk;
|
|
|
- mes_Morder.need_number = safeItemQty[i].SafetyStk;
|
|
|
mes_Morder.remaining_number = 0;
|
|
|
mes_Morder.create_time = DateTime.Now;
|
|
|
//生成工单子表数据
|