diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs index 190f6ba2..353944d3 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs @@ -35,7 +35,7 @@ namespace ZR.Admin.WebApi.Controllers // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")] public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm) { - var response = _WmOneTimeInventoryService.GetList(parm); + var response = _WmOneTimeInventoryService.GetListNew(parm); return SUCCESS(response); } diff --git a/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs b/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs index f5fbd887..897c7b0e 100644 --- a/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs +++ b/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs @@ -65,6 +65,8 @@ namespace ZR.Model.MES.wms.Dto public int StocktakingTotal { get; set; } public int QuantitySum { get; set; } public int RealQuantitySum { get; set; } + public DateTime MinStocktakingTime { get; set; } + public List Result { get; set; } } diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs index c0b5f8ba..d4543d10 100644 --- a/ZR.Service/mes/qc/CommonFQCService.cs +++ b/ZR.Service/mes/qc/CommonFQCService.cs @@ -1872,8 +1872,8 @@ namespace ZR.Service.mes.qc query.EndTime != null, it => it.StartTime <= query.EndTime.Value.ToLocalTime() ) - .Sum(it => it.PolishNumber) ?? 0; - gP12PolishTotal = gP12PolishTotal / 3; + .Where(it => it.GroupSort == 1) + .Sum(it => it.PolishNumber) ?? 0; // 抛光总投入数 int polishRequireTotal = Context @@ -1997,8 +1997,8 @@ namespace ZR.Service.mes.qc query.EndTime != null, it => it.StartTime <= query.EndTime.Value.ToLocalTime() ) - .Sum(it => it.RequireNumber) ?? 0; - gP12RequireTotal = gP12RequireTotal / 3; + .Where(it => it.GroupSort == 1) + .Sum(it => it.RequireNumber) ?? 0; // 后道直接出库 int afterPolishOutTotal = Context @@ -2069,8 +2069,8 @@ namespace ZR.Service.mes.qc ) .Where(it => it.StartTime >= boardData.PolishStockTime) .Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime()) - .Sum(it => it.PolishNumber) ?? 0; - gP12PolishTotal2 = gP12PolishTotal2 / 3; + .Where(it => it.GroupSort == 1) + .Sum(it => it.PolishNumber) ?? 0; // 抛光总投入数 int polishRequireTotal2 = Context @@ -2144,9 +2144,9 @@ namespace ZR.Service.mes.qc it => it.PartNumber == query.Partnumber ) .Where(it => it.StartTime >= boardData.OneTimeStockTime) - .Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime()) + .Where(it => it.GroupSort == 1) + .Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime()) .Sum(it => it.RequireNumber) ?? 0; - gP12RequireTotal2 = gP12RequireTotal2 / 3; // 后道直接出库 int afterPolishOutTotal2 = Context diff --git a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs index 20358339..4bd65460 100644 --- a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs +++ b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs @@ -294,7 +294,7 @@ namespace ZR.Service.mes.wms //.Where(it => it.Code == "自动") .Where(it => it.ActionTime >= minDateTime) .ToList(); - foreach (WmOneTimeInventoryDto item in list) + foreach (WmOneTimeInventoryDto item in list) { int? runum = wmOneTimeRecords .Where(o => @@ -314,10 +314,10 @@ namespace ZR.Service.mes.wms .Sum(); item.RealQuantity = item.Quantity.Value + (runum.Value - chunum.Value); } - list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0) .Where(it => !string.IsNullOrEmpty(it.Partnumber)) .DistinctBy(it => it.Partnumber) + .OrderBy(it => it.RealQuantity) .ToList(); int total = list.Count; @@ -335,7 +335,8 @@ namespace ZR.Service.mes.wms StocktakingTotal = StocktakingTotal, QuantitySum = QuantitySum, RealQuantitySum = RealQuantitySum, - Result = list.Skip((parm.PageNum - 1) * parm.PageSize) + MinStocktakingTime = minDateTime, + Result = list.Skip((parm.PageNum - 1) * parm.PageSize) .Take(parm.PageSize) .ToList(), }; diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs index 4da93de6..faa082f5 100644 --- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -40,10 +40,10 @@ namespace ZR.Service.mes.wms ) .AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark)) .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) - .AndIF( + /*.AndIF( !string.IsNullOrEmpty(parm.FkInventoryId), it => it.FkInventoryId == parm.FkInventoryId - ) + )*/ .AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id) .AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType) .AndIF( @@ -137,7 +137,8 @@ namespace ZR.Service.mes.wms .Where(it => !it.ProductDescription.Contains("倒车雷达")) .Where(it => it.StartTime >= parm.StartTime) .Where(it => it.QualifiedNumber > 0) - .ToList(); + .Where(it => it.Remark == "抛光") + .ToList(); //TODO 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数 List wmPolishWorkQualityStatistics = Context @@ -189,7 +190,7 @@ namespace ZR.Service.mes.wms ChangeQuantity = item.QualifiedNumber, ActionTime = item.StartTime, Status = 1, - Remark = "产线合格品 合格数" + Remark = "产线报表合格品自动入库,来源工单号:" + item.WorkorderId } ); } @@ -207,7 +208,7 @@ namespace ZR.Service.mes.wms ChangeQuantity = item.QualifiedNumber, ActionTime = item.StartTime, Status = 1, - Remark = "抛光合格品 合格数" + Remark = "抛光报表合格品自动入库" } ); } @@ -225,7 +226,7 @@ namespace ZR.Service.mes.wms ChangeQuantity = item.RequireNumber, ActionTime = item.StartTime, Status = 1, - Remark = "触摸屏投入数" + Remark = "GP12触摸屏报表投入自动出库" } ); } @@ -243,7 +244,7 @@ namespace ZR.Service.mes.wms ChangeQuantity = item.RequireNumber, ActionTime = item.StartTime, Status = 1, - Remark = "后道投入数" + Remark = "后道报表自动出库" } ); } diff --git a/ZR.Service/mes/wms/WmPolishInventoryService.cs b/ZR.Service/mes/wms/WmPolishInventoryService.cs index 68a3d325..40c98149 100644 --- a/ZR.Service/mes/wms/WmPolishInventoryService.cs +++ b/ZR.Service/mes/wms/WmPolishInventoryService.cs @@ -336,6 +336,7 @@ namespace ZR.Service.mes.wms list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0) .Where(it => !string.IsNullOrEmpty(it.Partnumber)) .DistinctBy(it => it.Partnumber) + .OrderBy(it => it.RealQuantity) .ToList(); int total = list.Count; diff --git a/ZR.Service/mes/wms/WmPolishRecordService.cs b/ZR.Service/mes/wms/WmPolishRecordService.cs index f9ada6ec..ad32c0de 100644 --- a/ZR.Service/mes/wms/WmPolishRecordService.cs +++ b/ZR.Service/mes/wms/WmPolishRecordService.cs @@ -131,6 +131,7 @@ namespace ZR.Service.mes.wms .Where(it => !it.ProductDescription.Contains("倒车雷达")) .Where(it => it.StartTime >= parm.StartTime) .Where(it => it.PaoguangTotal > 0) + .Where(it=> it.Remark == "抛光") .ToList(); // 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics @@ -156,8 +157,8 @@ namespace ZR.Service.mes.wms .Where(it => it.PolishNumber > 0) .ToList(); //qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList(); - - List wmGp12QualityStatistics = Context + //TODO 旧数据先不使用 + /*List wmGp12QualityStatistics = Context .Queryable() .WhereIF( !string.IsNullOrEmpty(parm.Partnumber), @@ -165,7 +166,7 @@ namespace ZR.Service.mes.wms ) .Where(it => it.StartTime >= parm.StartTime) .Where(it => it.PaoguangTotal > 0) - .ToList(); + .ToList();*/ //二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据 List wmPolishWorkQualityStatistics = Context @@ -182,7 +183,7 @@ namespace ZR.Service.mes.wms qcQualityStatisticsFirsts.Count + wmPolishQualityStatistics.Count + qcGp12ServiceStatistics.Count - + wmGp12QualityStatistics.Count + //+ wmGp12QualityStatistics.Count + wmPolishWorkQualityStatistics.Count; #region 组装 WmPolishRecord 实体 @@ -202,7 +203,7 @@ namespace ZR.Service.mes.wms ChangeQuantity = item.PaoguangTotal, ActionTime = item.StartTime, Status = 1, - Remark = "产线触摸屏报表抛光件自动入库" + Remark = "产线报表抛光件自动入库，来源工单："+item.WorkorderId } ); } @@ -243,7 +244,7 @@ namespace ZR.Service.mes.wms ); } - foreach (var item in wmGp12QualityStatistics) + /*foreach (var item in wmGp12QualityStatistics) { wmPolishRecords.Add( new WmPolishRecord @@ -259,7 +260,7 @@ namespace ZR.Service.mes.wms Remark = " GP12手填报表抛光件自动入库" } ); - } + }*/ foreach (var item in wmPolishWorkQualityStatistics) {