|
|
@@ -557,23 +557,6 @@ namespace Business.Replenishment
|
|
|
}
|
|
|
}
|
|
|
#endregion
|
|
|
-
|
|
|
- //var pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => bomList.Select(c => c.Id).ToList().Contains(s.sourceid)).Result;
|
|
|
- //List<mo_ic_bom> autoCreates = new List<mo_ic_bom>();
|
|
|
- //var mobomlist = ObjectMapper.Map<List<ic_bom>, List<mo_ic_bom>>(bomList);
|
|
|
- //mobomlist.ForEach(p =>
|
|
|
- //{
|
|
|
- // if (!pretreatments.Where(s => s.sourceid == p.mysql_id).Any())
|
|
|
- // {
|
|
|
- // autoCreates.Add(p);
|
|
|
- // }
|
|
|
- //});
|
|
|
- //if (autoCreates.Any())
|
|
|
- //{
|
|
|
- // AutoCreateBomBill(input.company_id.ToString(), autoCreates);
|
|
|
- // pretreatments = _mysql_b_bom_pretreatment.GetListAsync(s => bomList.Select(c => c.Id).ToList().Contains(s.sourceid)).Result;
|
|
|
- //}
|
|
|
-
|
|
|
//年度生产大纲实体
|
|
|
List<ReplenishmentAnnualProduction> annualProductionOutlines = new List<ReplenishmentAnnualProduction>();
|
|
|
List<YearDemandManagement> frontYearDemand = new List<YearDemandManagement>();
|
|
|
@@ -699,87 +682,6 @@ namespace Business.Replenishment
|
|
|
annualProductionOutline.factory_id = input.factory_id;
|
|
|
annualProductionOutline.org_id = input.org_id;
|
|
|
annualProductionOutlines.Add(annualProductionOutline);
|
|
|
-
|
|
|
- //var planBOM = bomList.Find(b => b.item_number == productList[i].SAPItemNumber);
|
|
|
- //var pretreament = pretreatments.Where(c => c.sourceid == planBOM.Id).ToList();
|
|
|
- //var returnlist = ObjectMapper.Map<List<b_bom_pretreatment>, List<BomChildExamineDto>>(pretreament);
|
|
|
- //returnlist = returnlist.OrderBy(s => s.num_order).ToList();
|
|
|
- //var level1Dto = returnlist[0];
|
|
|
- //level1Dto.needCount = productList[i].Qty;
|
|
|
- //CaclMaterialShortage(returnlist);
|
|
|
- //foreach (var r in returnlist)
|
|
|
- //{
|
|
|
- // if (r.item_number != productList[i].SAPItemNumber && r.erp_cls == 1 && !string.IsNullOrEmpty(r.bom_number))
|
|
|
- // {
|
|
|
- // if (r.needCount <= 0)
|
|
|
- // continue;
|
|
|
- // var ic_itemSub = _itemMaster.Select(x => x.ItemNum == r.item_number && x.Domain == input.factory_id.ToString());
|
|
|
- // if (ic_itemSub.Count <= 0)
|
|
|
- // continue;
|
|
|
-
|
|
|
- // mes_morder mes_MorderSub = new mes_morder();
|
|
|
- // mes_MorderSub.GenerateNewId(help.NextId());
|
|
|
- // mes_MorderSub.morder_type = MorderEnum.JhMorder;
|
|
|
- // mes_MorderSub.work_order_type = MorderEnum.CgMorder;
|
|
|
- // mes_MorderSub.morder_state = "";
|
|
|
- // var nbrlistDto = _serialNumberAppService.GetBillNo(input.factory_id.ToString(), "M5", 1, "", 1);
|
|
|
- // if (nbrlistDto.Any())
|
|
|
- // {
|
|
|
- // mes_MorderSub.morder_no = nbrlistDto[0].NbrResult;
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
- // return "没有正确获取到工单编号，请检查";
|
|
|
- // }
|
|
|
- // mes_MorderSub.fms_number = "";
|
|
|
- // mes_MorderSub.bom_number = r.bom_number;
|
|
|
- // mes_MorderSub.fmodel = ic_itemSub[0].Descr1;
|
|
|
- // mes_MorderSub.urgent = 1;
|
|
|
- // mes_MorderSub.moentry_startup_status = 0;
|
|
|
- // mes_MorderSub.tenant_id = input.tenant_id;
|
|
|
- // mes_MorderSub.factory_id = input.factory_id;
|
|
|
- // mes_MorderSub.company_id = input.company_id;
|
|
|
- // mes_MorderSub.org_id = input.org_id;
|
|
|
- // mes_MorderSub.product_code = ic_itemSub[0].ItemNum;
|
|
|
- // mes_MorderSub.product_name = ic_itemSub[0].Descr;
|
|
|
- // mes_MorderSub.morder_date = DateTime.Now.Date.AddDays(1);
|
|
|
- // if (ic_itemSub[0].PurLT > 0)
|
|
|
- // {
|
|
|
- // mes_MorderSub.moentry_sys_stime = Convert.ToDateTime(productList[i].PlanMonth + "-01").AddDays(-ic_itemSub[0].PurLT);
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
- // mes_MorderSub.moentry_sys_stime = Convert.ToDateTime(productList[i].PlanMonth + "-01").AddDays(-1);
|
|
|
- // }
|
|
|
- // mes_MorderSub.moentry_prd = null;
|
|
|
- // mes_MorderSub.moentry_prdname = null;
|
|
|
- // mes_MorderSub.moentry_wrkc = null;
|
|
|
- // mes_MorderSub.moentry_wrkcname = null;
|
|
|
- // mes_MorderSub.picking_qty = 0;
|
|
|
- // mes_MorderSub.unit = ic_itemSub[0].UM;
|
|
|
- // mes_MorderSub.morder_production_number = r.needCount;
|
|
|
- // mes_MorderSub.need_number = r.needCount;
|
|
|
- // mes_MorderSub.remaining_number = 0;
|
|
|
- // mes_MorderSub.create_time = DateTime.Now;
|
|
|
- // //生成工单子表数据
|
|
|
- // mes_moentry mes_MoentrySub = new mes_moentry();
|
|
|
- // mes_MoentrySub.GenerateNewId(help.NextId());
|
|
|
- // mes_MoentrySub.moentry_moid = mes_MorderSub.Id;
|
|
|
- // mes_MoentrySub.moentry_mono = mes_MorderSub.morder_no;
|
|
|
- // mes_MoentrySub.unit = ic_itemSub[0].UM;
|
|
|
- // mes_MoentrySub.morder_production_number = r.needCount;
|
|
|
- // mes_MoentrySub.need_number = r.needCount;
|
|
|
- // mes_MoentrySub.remaining_number = 0;
|
|
|
- // mes_MoentrySub.tenant_id = input.tenant_id;
|
|
|
- // mes_MoentrySub.factory_id = input.factory_id;
|
|
|
- // mes_MoentrySub.company_id = input.company_id;
|
|
|
- // mes_MoentrySub.org_id = input.org_id;
|
|
|
- // mes_MoentrySub.create_time = DateTime.Now;
|
|
|
-
|
|
|
- // moList.Add(mes_MorderSub);
|
|
|
- // moentryList.Add(mes_MoentrySub);
|
|
|
- // }
|
|
|
- //}
|
|
|
}
|
|
|
//保存数据
|
|
|
using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
|
