产能检查调整

MicroServices/Business/Business.Application.Contracts/Business.Application.Contracts.csproj

@@ -37,4 +37,8 @@
     <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
+  </ItemGroup>
+
 </Project>

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -354,7 +354,7 @@ namespace Business.ResourceExamineManagement
             param.sorderId = input.sorderId;
             param.tenantId = input.tenantId;
             param.factoryId = input.factoryId;
-            
+
             //资源检查结果
             PschedDto rtn = new PschedDto();
             rtn.sorderid = input.sorderId;
@@ -617,10 +617,14 @@ namespace Business.ResourceExamineManagement
             }
             List<mes_tech_process> sortChilds = new List<mes_tech_process>();
             //添加最后一个工序
-            var last = fistChilds.First(p => p.nextprocid == null);
+            var last = fistChilds.FirstOrDefault(p => p.nextprocid == null);
+            if (last == null)
+            {
+                throw new NotImplementedException("当前工艺路径没有配置最终工序，请调整！");
+            }
             sortChilds.Add(last);
             //递归按工序先后顺序排序
-            SortProcess(fistChilds, last.Id, sortChilds);
+            SortProcess(fistChilds, last.proc_id.Value, sortChilds);
             //总耗时(分钟)
             //decimal sumTimes = CalcTakeTimeByLq(sortChilds, packages);//通过Lq计算
             decimal sumTimes = CalcTakeTimeByLqt(sortChilds, packages);//通过Lqt计算
@@ -639,7 +643,7 @@ namespace Business.ResourceExamineManagement
             if (curProcess != null)
             {
                 sortProcesses.AddFirst(curProcess);
-                SortProcess(Processes, curProcess.Id, sortProcesses);
+                SortProcess(Processes, curProcess.proc_id.Value, sortProcesses);
             }
         }
 
@@ -1419,7 +1423,7 @@ namespace Business.ResourceExamineManagement
                         if (item.erp_cls == 1)
                         {
                             //走自制
-                            var minute = ProductiveExamine(item.bom_number, item.lack_qty.GetInt());
+                            var minute = ProductiveExamine(item.bom_number,"1.0", item.lack_qty.GetInt());
                             //var ProductiveDate = ProductiveExamine(BomNumber, (int)(Quantity.Value));
                             //系统建议完工日期为 开工日期+产能检查时间=完工日期
                             var Day = minute.Result / (60 * 10); //返回的分钟除以十个小时得出工作天数；
@@ -1626,7 +1630,7 @@ namespace Business.ResourceExamineManagement
                     {
                         slt.make_qty = slt.lack_qty;
                         //走自制
-                        var minute = ProductiveExamine(item.bom_number, item.lack_qty.GetInt());
+                        var minute = ProductiveExamine(item.bom_number, "1.0", item.lack_qty.GetInt());
                         //系统建议完工日期为 开工日期+产能检查时间=完工日期
                         var Day = minute.Result / (60 * 10); //返回的分钟除以十个小时得出工作天数；
                         slt.kitting_time = slt.kitting_time.Value.AddDays((double)Day);