|
|
@@ -6193,7 +6193,11 @@ namespace Business.Replenishment
|
|
|
{
|
|
|
string Msg = "OK|交货单生成成功";
|
|
|
//获取已发布的交货计划数据
|
|
|
- var demandplans = _icdemandschedule.GetListAsync(p=>p.factory_id.ToString() == domain && p.status == "P" && !p.IsDeleted).Result;
|
|
|
+ var demandplans = _icdemandschedule.GetListAsync(p=>p.factory_id.ToString() == domain && p.status == "P" && p.tosechedqty > 0 && !p.IsDeleted).Result;
|
|
|
+ //获取以生成交货单的交货计划
|
|
|
+ var alreadys = _srmpolistds.Select(p => p.domain == domain && demandplans.Select(m => m.Id).Contains(p.icdsid)).ToList();
|
|
|
+ //过滤掉已生成交货单的交货计划
|
|
|
+ demandplans = demandplans.Where(p => !alreadys.Select(m => m.icdsid).Contains(p.Id)).ToList();
|
|
|
if (!demandplans.Any())
|
|
|
{
|
|
|
Msg = "OK|没有需要生成的交货单";
|
|
|
@@ -6341,6 +6345,8 @@ namespace Business.Replenishment
|
|
|
entity.dsnum = "";
|
|
|
entity.status = "N";
|
|
|
entity.itemnum = item.itemnum;
|
|
|
+ entity.um = "";
|
|
|
+ entity.purgroup = "";
|
|
|
entity.suppliercode = pch.supplier_number;
|
|
|
entity.supplier = pch.supplier_name;
|
|
|
entity.requestdate = item.arrivaldate;
|
|
|
@@ -6353,6 +6359,7 @@ namespace Business.Replenishment
|
|
|
entity.restqty = xqQty;
|
|
|
entity.createtime = DateTime.Now;
|
|
|
entity.createuser = user;
|
|
|
+ entity.remarks = "";
|
|
|
inserts.Add(entity);
|
|
|
|
|
|
//当前交货计划已分配数量累加
|
