Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1166,7 +1166,7 @@ namespace Business.ResourceExamineManagement
             {
                 parent_lack = parent.lack_qty - parent.mo_qty - parent.purchase_occupy_qty;
             }
-
+            decimal subCount = item.needCount;
             List<int> orderNum = sublist.Select(s => s.substitute_all_num.GetValueOrDefault()).ToList();
             orderNum.Sort();
             foreach (var idx in orderNum)
@@ -1275,6 +1275,8 @@ namespace Business.ResourceExamineManagement
                         }*/
                         //先去掉上面的在制逻辑
                         zy.use_qty = use_p_num * zy.qty;
+                        zy.needCount = zy.use_qty;
+                        subCount -= zy.needCount;
                         itemStockoccupyDto.quantity = zy.use_qty;
                         itemStockoccupyDto.item_no = zy.num;
                         sklist.Add(itemStockoccupyDto);
@@ -1299,6 +1301,7 @@ namespace Business.ResourceExamineManagement
                 //对select执行补充（根据属性采购、外购、自制等）
                 foreach (var sct in select)
                 {
+                    sct.needCount = subCount > 0 ? subCount : 0;
                     decimal sqty = sct.sqty - sct.use_qty;//这里得出前面混用使用后的库存。
                     decimal lack_Count = sct.self_lack_qty;//混用后还缺的部分。
                     mo_ic_item_stockoccupy itemStockoccupyDto = new mo_ic_item_stockoccupy();