替代料占用记录检查

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

@@ -1077,7 +1077,7 @@ namespace Business.ResourceExamineManagement
                 {
                     foreach (var s in list)
                     {
-                        RecalculationStock(s, returnlist, sklist, bangid);
+                        RecalculationStock(s, returnlist, newStockOccList, bangid);
                     }
                     //可制计算:需要对list进行可制计算，按主料来算辅料
                     if (list.Where(s => s.stock_state != 1).Count() == 0)
@@ -1180,7 +1180,7 @@ namespace Business.ResourceExamineManagement
                 {
                     foreach (var s in list)
                     {
-                        RecalculationStock(s, returnlist, sklist, bangid);
+                        RecalculationStock(s, returnlist, newStockOccList, bangid);
                     }
                     decimal minMake = 99999999;
                     foreach (var hy in list)

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

@@ -3248,7 +3248,7 @@ namespace Business.ResourceExamineManagement
                 List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && x.morder_no == workord && (string.IsNullOrEmpty(x.morder_state) || x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
                 if (!morders.Any())
                 {
-                    return "没有需要下达的工单";
+                    return "工单不存在，请检查";
                 }
                 var rst = await OrderResourceCheck(morders, domain, userAccount);
                 if (rst == "ok")