Просмотр исходного кода

Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

tangdi 3 лет назад
Родитель
Сommit
e739deb8cc

+ 5 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2090,7 +2090,6 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         private List<ICItemLeadTimeDto> GetLeadTime(List<long> icItemIds, long tenantId, long factoryid)
         {
-            //ToDo:企业Id
             ProjectionDefinitionBuilder<ic_factory_details> project = new ProjectionDefinitionBuilder<ic_factory_details>();
             return _ic_factory_details.Find(p => icItemIds.Contains(p.icitem_id) && p.factory_id == factoryid && p.tenant_id == tenantId && !p.IsDeleted,
                 project.Include(p => p.icitem_id).Include(p => p.production_leadtime).Include(p => p.stock_leadtime).Include(p => p.transportation_leadtime).Include(p => p.order_leadtime)).Result.
@@ -2100,7 +2099,6 @@ namespace Business.ResourceExamineManagement
         //根据物料id获取物料供应商
         private List<ic_item_pur> GetSupplier(List<BomChildExamineDto> returnlist, long tenantId, long factoryid)
         {
-            //ToDo:企业Id
             return _ic_item_pur.Find(p => returnlist.Select(x => x.item_id).Contains(p.icitem_id) && p.tenant_id == tenantId && p.factory_id == factoryid && !p.IsDeleted).Result;
         }
 
@@ -2268,7 +2266,11 @@ namespace Business.ResourceExamineManagement
         {
             var leadTime = iCItemLeadTimes.Find(x => x.item_id == returnlist.item_id);
             var supplier = supplierList.Find(x => x.icitem_id == returnlist.item_id);//默认取第一个供应商
-            var plan = planList.Find(x => x.icitem_id == returnlist.item_id);//
+            var plan = planList.Find(x => x.icitem_id == returnlist.item_id);
+            if(leadTime==null || supplier==null || plan==null)
+            {
+                throw new NotImplementedException("未找到物料ic_factory_details或ic_item_pur或ic_plan信息!");
+            }
             srm_pr_main srm_Pr = new srm_pr_main();
             srm_Pr.GenerateNewId();
             srm_Pr.pr_billno = getOrderNum("PR");//pr单号