过滤已报废物资

LiteChannel/Commons/HttpHelper.cs

@@ -880,16 +880,23 @@ namespace LiteChannel.Commons
                         }
                         else
                         {
-                            var successCount = res_data.data.Count(x => new[] { 1, 2, 8, 14, 15, 17, 6 }.Contains(x.currentState));
-                            var failCount = eps.Count - successCount;
+                            var successCount = res_data.data.Count(x => new[] { 1, 2, 8, 14, 15, 17 }.Contains(x.currentState));
+                            var bfCount = res_data.data.Count(x => new[] { 6 }.Contains(x.currentState));
+                            var failCount = eps.Count - successCount - bfCount;
                             var failEpcList = eps.Where(x =>
-                                    res_data.data.Where(y => new[] { 1, 2, 8, 14, 15, 17, 6 }.Contains(y.currentState)).Count(y => y.epc == x.RFID) == 0)
+                                    res_data.data.Where(y => new[] { 1, 2, 8, 14, 15, 17 }.Contains(y.currentState)).Count(y => y.epc == x.RFID) == 0)
                                 .Select(x => x.RFID);
 
+
                             var message = $"装备出库成功{successCount}条，失败{failCount}条";
+                            if (bfCount > 0)
+                            {
+                                message += $"，已报废物资{bfCount}条";
+                            }
 
-                            var safeWarringList = res_data.data.Where(x => x.safeLevel == 1).ToList();
-                            var safeDangerList = res_data.data.Where(x => x.safeLevel == 2).ToList();
+                            //过滤已报废物资
+                            var safeWarringList = res_data.data.Where(x => x.safeLevel == 1 && x.currentState != 6).ToList();
+                            var safeDangerList = res_data.data.Where(x => x.safeLevel == 2 && x.currentState != 6).ToList();
 
                             if (safeDangerList.Count > 0)
                             {