diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index 3d30fc31..4397a5db 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/FileContentIndex/7337f1db-4564-42b7-93c5-ad9d20894263.vsidx b/.vs/Admin.Core/FileContentIndex/0c7a6718-2ab1-43b1-b53f-b81d8d7092d6.vsidx similarity index 79% rename from .vs/Admin.Core/FileContentIndex/7337f1db-4564-42b7-93c5-ad9d20894263.vsidx rename to .vs/Admin.Core/FileContentIndex/0c7a6718-2ab1-43b1-b53f-b81d8d7092d6.vsidx index a7403325..1904b341 100644 Binary files a/.vs/Admin.Core/FileContentIndex/7337f1db-4564-42b7-93c5-ad9d20894263.vsidx and b/.vs/Admin.Core/FileContentIndex/0c7a6718-2ab1-43b1-b53f-b81d8d7092d6.vsidx differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index eae35bb4..4521be79 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index c0c07e0a..895e7ac3 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Admin.Core.Model/Model_New/BaseBomInfo.cs b/Admin.Core.Model/Model_New/BaseBomInfo.cs index 09e04a2d..6e0263ad 100644 --- a/Admin.Core.Model/Model_New/BaseBomInfo.cs +++ b/Admin.Core.Model/Model_New/BaseBomInfo.cs @@ -56,7 +56,7 @@ namespace Admin.Core.Model /// 工厂编号 /// [SugarColumn(ColumnName = "PLANT_CODE")] - public string plantCode { get; set; } + public string planCode { get; set; } /// /// 产线/工位 diff --git a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs index 6150ac49..d15cab73 100644 --- a/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs +++ b/Admin.Core.Service/Service_New/ProductPlanInfoServices.cs @@ -14,11 +14,13 @@ namespace Admin.Core.Service.Service_New { private readonly IBaseRepository _dal; private readonly IProductOrderInfoRepository _productOrderInfoRepository; - public ProductPlanInfoServices(IBaseRepository dal, IProductOrderInfoRepository productOrderInfoRepository) + private readonly IBaseBomInfoRepository _baseBomInfoRepository; + + public ProductPlanInfoServices(IBaseRepository dal, IBaseBomInfoRepository baseBomInfoRepository) { this._dal = dal; base.BaseDal = dal; - _productOrderInfoRepository = productOrderInfoRepository; + _baseBomInfoRepository = baseBomInfoRepository; } /// @@ -29,7 +31,8 @@ namespace Admin.Core.Service.Service_New public async Task> QueryPlanInfo() { List planList = await _dal.QueryAsync(); - List orderinfoList= await _productOrderInfoRepository.QueryAsync(); + List orderinfoList= await _baseBomInfoRepository.QueryAsync(); + var list = (from p in planList join o in orderinfoList on p.PlanCode equals o.PlanCode select new PlanMaintenanceView @@ -43,11 +46,6 @@ namespace Admin.Core.Service.Service_New }).ToList(); return list; - //let sum = score.Chinese + score.Math + score.English //定义临时变量sum - //where sum / 3 > 60 - //group stu by new { stu.Age } into result - //orderby result.Key.Age descending - //select new { Age = result.Key.Age, Count = result.Count() }; } } }