1

ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs

@@ -1,5 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
+using NPOI.HPSF;
+using System.Text;
+using System.Web;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model;
@@ -229,7 +232,8 @@ namespace ZR.Admin.WebApi.Controllers
         [AllowAnonymous]
         public IActionResult ImportTemplateExcel()
         {
-            (string, string) result = DownloadImportTemplate("抛光仓库盘点模板");
+            string fileName = "抛光仓库盘点模板";
+            (string, string) result = DownloadImportTemplate(fileName);
             return ExportExcel(result.Item2, result.Item1);
         }
 

ZR.Service/mes/qc/CommonFQCService.cs

@@ -1314,7 +1314,7 @@ namespace ZR.Service.mes.qc
             var predicateParkingSensor = Expressionable
                 .Create<QcQualityStatisticsFirst>()
                 .And(it => ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
-                .And(it => it.FinishedPartNumber == query.Partnumber)
+                .AndIF(!string.IsNullOrEmpty(query.Partnumber), it => it.FinishedPartNumber == query.Partnumber)
                 .And(it => it.StartTime >= boardData.OneTimeStockTime)
                 .ToExpression();
             // 倒车雷达
@@ -1483,7 +1483,7 @@ namespace ZR.Service.mes.qc
                             .Sum(it => it.Quantity) ?? 0;
 
                     // 产线倒车雷达
-                    // 倒车雷达提取
+                    // 倒车雷达剔除数据
                     string[] checkStrArray2 = { "倒车雷达" };
                     var ParkingSensorPartNumberCheck = Expressionable.Create<WmMaterial>();
                     foreach (string checkStr in checkStrArray2)
@@ -1497,41 +1497,41 @@ namespace ZR.Service.mes.qc
                         .Where(ParkingSensorPartNumberCheck.ToExpression())
                         .Select(it => it.Partnumber)
                         .ToList();
-                    var predicateParkingSensor = Expressionable
+/*                    var predicateParkingSensor = Expressionable
                         .Create<QcQualityStatisticsFirst>()
                         .And(it => ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
                         .And(it => it.FinishedPartNumber == partNumber)
                         .And(it => it.StartTime >= startTime.ToLocalTime())
                         .ToExpression();
-                    // 倒车雷达
                     int productParkingSensorbQualifiedTotal =
                         Context
                             .Queryable<QcQualityStatisticsFirst>()
                             .Where(predicateParkingSensor)
                             .Sum(it => it.QualifiedNumber) ?? 0;
-                    productParkingSensorbQualifiedTotal = productParkingSensorbQualifiedTotal / 3;
-                    // 产线合格 - 倒车雷达
+                    productParkingSensorbQualifiedTotal = productParkingSensorbQualifiedTotal / 3;*/
+                    // 产线合格
                     int productQualifiedTotal =
                         Context
                             .Queryable<QcQualityStatisticsFirst>()
+                            .Where(it => !ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
                             .Where(it => it.FinishedPartNumber == partNumber)
                             .Where(it => it.StartTime >= startTime.ToLocalTime())
                             .Sum(it => it.QualifiedNumber)
-                        ?? 0 - productParkingSensorbQualifiedTotal;
+                        ?? 0;
                     productQualifiedTotal = productQualifiedTotal / 3;
                     // 抛光合格
                     int polishQualifiedTotal =
                         Context
                             .Queryable<WmPolishWorkQualityStatistics>()
                             .Where(it => it.Partnumber == partNumber)
-                            .Where(it => it.StartTime >= startTime.ToLocalTime())
+                            .Where(it => it.StartTime.Value.ToLocalTime() >= startTime.ToLocalTime())
                             .Sum(it => it.QualifiedNumber) ?? 0;
                     // gp12投入
                     int gP12RequireTotal =
                         Context
                             .Queryable<WmGp12QualityStatistics>()
                             .Where(it => it.Partnumber == partNumber)
-                            .Where(it => it.StartTime >= startTime.ToLocalTime())
+                            .Where(it => it.StartTime.Value.ToLocalTime() >= startTime.ToLocalTime())
                             .Sum(it => it.RequireNumber) ?? 0;
                     // 后道直接出库
                     int afterPolishOutTotal =

ZR.Service/mes/wms/WmOneTimeInventoryService.cs

@@ -502,7 +502,7 @@ namespace ZR.Service.mes.wms
                 CommonFQCService commonFQCService = new();
                 // 获取报表数据
                 // 一次合格计算后库存 = 盘点库存 + 产线合格 + 抛光合格 - gp12投入 - 后道直接出库
-                return commonFQCService.GetBatchOneTimePartRealStock(partnumbers, checkTime.Value);
+                return commonFQCService.GetBatchOneTimePartRealStock(partnumbers, checkTime.Value.ToLocalTime());
             }
             catch (Exception e)
             {

ZR.Service/mes/wms/WmPolishInventoryService.cs

@@ -583,7 +583,7 @@ namespace ZR.Service.mes.wms
                 CommonFQCService commonFQCService = new();
                 // 获取报表数据
                 // 抛光计算后库存 = 盘点库存 + 产线抛光 + 后道反抛 + GP12反抛 - 抛光投入
-                return commonFQCService.GetBatchPolishPartRealStock(partnumbers, checkTime.Value);
+                return commonFQCService.GetBatchPolishPartRealStock(partnumbers, checkTime.Value.ToLocalTime());
             }
             catch (Exception e)
             {