|
|
@@ -428,7 +428,7 @@ namespace Business.Replenishment
|
|
|
var routingOpList = routingOps.Where(x => x.Ufld1 == "组装" && x.MilestoneOp).ToList();
|
|
|
//生产线明细表
|
|
|
List<ProdLineDetail> prodLines = _prodLineDetail.Select(p => sapItemList.Contains(p.Part) && p.Domain == input.factory_id.ToString() && p.IsActive && routingOpList.Select(m => m.Op).Contains(p.Op)).OrderBy(x => x.Sequence).ToList();
|
|
|
- List<LineMaster> lineMasters = _lineMaster.Select(p => prodLines.Select(a=>a.Line).Contains(p.Line) && p.Domain == input.factory_id.ToString() && p.IsActive).ToList();
|
|
|
+ List<LineMaster> lineMasters = _lineMaster.Select(p => prodLines.Select(a=>a.Line).Distinct().ToList().Contains(p.Line) && p.Domain == input.factory_id.ToString() && p.IsActive).ToList();
|
|
|
List<InvMaster> locations = _invMaster.Select(x => sapItemList.Contains(x.ItemNum) && x.Domain == input.factory_id.ToString() && x.IsActive).ToList();
|
|
|
//平台库存
|
|
|
var DMSItemList = _DMS_IN_ITEMMAPPING.Select(a => sapItemList.Contains(a.CfnERPCode));
|
|
|
@@ -1633,7 +1633,7 @@ namespace Business.Replenishment
|
|
|
{
|
|
|
ReplenishmentWeekPlan weekItemPlanAdd = new ReplenishmentWeekPlan();
|
|
|
weekItemPlanAdd.Area = item.area;
|
|
|
- weekItemPlanAdd.Week = $"WK{GetWeekOfYear(DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(k).AddDays(7 * (w))).ToString("00")}";
|
|
|
+ weekItemPlanAdd.Week = $"WK{GetWeekOfYear(DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(k+1).AddDays(7 * (w))).ToString("00")}";
|
|
|
weekItemPlanAdd.DistributionChannel = item.distributionchannel;
|
|
|
weekItemPlanAdd.ProdLine = item.ProdLine;
|
|
|
weekItemPlanAdd.ProdRange = item.ProdRange;
|
|
|
@@ -1641,9 +1641,9 @@ namespace Business.Replenishment
|
|
|
weekItemPlanAdd.ItemNumber = item.number;
|
|
|
weekItemPlanAdd.Languages = item.Languages;
|
|
|
weekItemPlanAdd.Qty = Math.Ceiling((item.montheop1.GetValueOrDefault() + item.montheop2.GetValueOrDefault() - publishedWeekQtySum) / (4 - publishedWeekCount));
|
|
|
- weekItemPlanAdd.Year = DateTime.Now.AddMonths(k).Year;
|
|
|
- weekItemPlanAdd.Month = DateTime.Now.AddMonths(k).Month;
|
|
|
- weekItemPlanAdd.PlanMonth = $"{DateTime.Now.AddMonths(k ).Year}-{DateTime.Now.AddMonths(k ).Month.ToString("00")}"; ;
|
|
|
+ weekItemPlanAdd.Year = DateTime.Now.AddMonths(k+1).Year;
|
|
|
+ weekItemPlanAdd.Month = DateTime.Now.AddMonths(k+1).Month;
|
|
|
+ weekItemPlanAdd.PlanMonth = $"{DateTime.Now.AddMonths(k +1).Year}-{DateTime.Now.AddMonths(k+1 ).Month.ToString("00")}"; ;
|
|
|
weekItemPlanAdd.WeekSeq = w;
|
|
|
weekItemPlanAdd.tenant_id = input.tenant_id;
|
|
|
weekItemPlanAdd.company_id = input.company_id;
|
|
|
@@ -1821,7 +1821,7 @@ namespace Business.Replenishment
|
|
|
CaclMaterialShortage(returnlist);
|
|
|
foreach (var r in returnlist)
|
|
|
{
|
|
|
- if (r.item_number != itemSeq && r.erp_cls == 1)
|
|
|
+ if (r.item_number != itemSeq && r.erp_cls == 1 && !string.IsNullOrEmpty(r.bom_number))
|
|
|
{
|
|
|
if (subProductItem.ContainsKey(r.item_number))
|
|
|
{
|
