抛光，后道，GP12质量报表逻辑变动，看板逻辑变动

ZR.Service/mes/qc/CommonFQCService.cs

@@ -660,9 +660,9 @@ namespace ZR.Service.mes.qc
             boardData.ProductPolishTotal = boardData.ProductPolishTotal / 3;
             boardData.ProductSandingTotal = boardData.ProductSandingTotal / 3;
             boardData.ProductDiscardTotal = boardData.ProductDiscardTotal / 3;
-            // 合格数补正(合格数 = 总合格数 - 门把手 - 倒车雷达)
-            /*boardData.ProductQualifiedTotal = boardData.ProductQualifiedTotal - (boardData.ProductDoorknobQualifiedTotal + boardData.ProductParkingSensorbQualifiedTotal);*/
-
+            // 投入数,合格数补正(合格数 = 总合格数 - 倒车雷达)[倒车雷达不参与合格率统计]
+            boardData.ProductRequireTotal -= boardData.ProductParkingSensorbQualifiedTotal;
+            boardData.ProductQualifiedTotal -= boardData.ProductParkingSensorbQualifiedTotal;
             if (boardData.ProductRequireTotal > 0)
             {
                 double passRate =
@@ -896,12 +896,14 @@ namespace ZR.Service.mes.qc
                     .Queryable<WmPolishQualityStatistics>()
                     .Where(predicate2)
                     .Sum(it => it.BaofeiTotal) ?? 0;
-            // 合格数修正
-            boardData.PolishQualifiedTotal =
-                boardData.PolishQualifiedTotal - boardData.PolishParkingSensorbQualifiedTotal;
-            boardData.AfterPolishQualifiedTotal =
-                boardData.AfterPolishQualifiedTotal
-                - boardData.AfterPolishParkingSensorbQualifiedTotal;
+            // 合格数修正 去掉倒车雷达
+            boardData.PolishRequireTotal -= boardData.PolishParkingSensorbQualifiedTotal;
+            boardData.PolishQualifiedTotal -= boardData.PolishParkingSensorbQualifiedTotal;
+
+            boardData.AfterPolishQualifiedTotal -=
+                boardData.AfterPolishParkingSensorbQualifiedTotal;
+            boardData.AfterPolishRequireTotal -= boardData.AfterPolishParkingSensorbQualifiedTotal;
+
             if (boardData.PolishRequireTotal > 0)
             {
                 double passRate =
@@ -911,7 +913,10 @@ namespace ZR.Service.mes.qc
             if (boardData.AfterPolishRequireTotal > 0)
             {
                 double passRate =
-                    ((double)boardData.AfterPolishQualifiedTotal / boardData.AfterPolishRequireTotal) * 100;
+                    (
+                        (double)boardData.AfterPolishQualifiedTotal
+                        / boardData.AfterPolishRequireTotal
+                    ) * 100;
                 boardData.AfterPolishQualifiePassRate = passRate.ToString("0") + "%";
             }
             return boardData;
@@ -1060,16 +1065,15 @@ namespace ZR.Service.mes.qc
                     .Queryable<WmGp12QualityStatistics>()
                     .Where(predicate2)
                     .Sum(it => it.BaofeiTotal) ?? 0;
-
-            boardData.GP12QualifiedTotal =
-                boardData.GP12QualifiedTotal - boardData.GP12ParkingSensorQualifiedTotal;
+            // 倒车雷达去除
+            boardData.GP12QualifiedTotal -= boardData.GP12ParkingSensorQualifiedTotal;
+            boardData.GP12RequireTotal -= boardData.GP12ParkingSensorQualifiedTotal;
             if (boardData.GP12RequireTotal > 0)
             {
                 double passRate =
                     ((double)boardData.GP12QualifiedTotal / boardData.GP12RequireTotal) * 100;
                 boardData.GP12QualifiePassRate = passRate.ToString("0") + "%";
             }
-
             return boardData;
         }
 
@@ -1115,7 +1119,6 @@ namespace ZR.Service.mes.qc
                 .Queryable<WmGoodsNowProduction>()
                 .Where(predicate1)
                 .Count();
-
             boardData.FinishProductPartOutTotal =
                 Context.Queryable<WmGoodsOutRecord>().Where(predicate2).Sum(it => it.GoodsNumAction)
                 ?? 0;
@@ -1167,8 +1170,18 @@ namespace ZR.Service.mes.qc
                     query.EndTime != null,
                     it => it.StartTime <= query.EndTime.Value.ToLocalTime()
                 )
-                .And(it=>it.Type == 1)
+                .And(it => it.Type == 1)
                 .ToExpression();
+            boardData.AfterPolishInTotal =
+                Context
+                    .Queryable<WmPolishQualityStatistics>()
+                    .Where(predicate1)
+                    .Sum(it => it.QualifiedNumber) ?? 0;
+            boardData.AfterPolishOutTotal =
+                Context
+                    .Queryable<WmPolishQualityStatistics>()
+                    .Where(predicate1)
+                    .Sum(it => it.RequireNumber) ?? 0;
             boardData.StatisticsPolishQualifiedTotal =
                 (
                     Context
@@ -1182,7 +1195,9 @@ namespace ZR.Service.mes.qc
                         .Where(predicate2)
                         .Sum(it => it.QualifiedNumber) ?? 0
                 );
-            boardData.StatisticsProductAndPolishQualifiedTotal = boardData.StatisticsPolishQualifiedTotal + boardData.ProductQualifiedTotal;
+            boardData.StatisticsProductAndPolishQualifiedTotal =
+                boardData.StatisticsPolishQualifiedTotal + boardData.ProductQualifiedTotal;
+
             return boardData;
         }
 

ZR.Service/mes/qc/FirstFQCService.cs

@@ -3856,8 +3856,8 @@ namespace ZR.Service.mes.qc
 
 
 
-
-
+                //TODO 20241023 不再变动抛光盘点后的数据
+                return 1;
                 // 产线报表生成后自动化操作
 
                 try
@@ -3873,7 +3873,7 @@ namespace ZR.Service.mes.qc
                             Quantity = paoguang_by_first + paoguang_final,
                             ActionTime = DateTime.Now.ToLocalTime(),
                             CreatedBy = "包装" + team + "组",
-                            Remark = "首检抛光自动入库。来源工单号:[" + workorder_item.ClientWorkorder + "]"
+                            Remark = "产线抛光件,自动入库。来源工单号:[" + workorder_item.ClientWorkorder + "]"
                         };
                     wmPolishInventoryService.DoWmPolishWarehousing(warehousingInfo);
                     // 2.成品入一次合格品库