From 867fb76d8c097f35ed9e63f117a03081813b952c Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 21 Jan 2025 11:10:51 +0800 Subject: [PATCH] =?UTF-8?q?fix-=E5=8F=91=E6=B3=A1=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E9=9A=8F=E6=97=B6=E9=97=B4=E5=88=87=E6=8D=A2=E6=B8=85=E7=A9=BA?= =?UTF-8?q?plc=E6=95=B0=E9=87=8F=EF=BC=8C=E7=9F=AB=E6=AD=A3=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=87=8F=E5=AE=8C=E6=95=B4=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRecordBoxFoamFixtureComplateServices.cs | 2 +- .../RecordBoxFoamFixtureComplateServices.cs | 48 +++++++++---------- .../Business/CollectionFoamLine.cs | 2 +- Aucma.Core.OldBoxFoam/Business/Collection.cs | 2 +- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/Admin.Core.IService/IService_New/IRecordBoxFoamFixtureComplateServices.cs b/Admin.Core.IService/IService_New/IRecordBoxFoamFixtureComplateServices.cs index ef31bdd9..f249557a 100644 --- a/Admin.Core.IService/IService_New/IRecordBoxFoamFixtureComplateServices.cs +++ b/Admin.Core.IService/IService_New/IRecordBoxFoamFixtureComplateServices.cs @@ -10,7 +10,7 @@ namespace Admin.Core.IService.IService_New { public interface IRecordBoxFoamFixtureComplateServices : IBaseServices { - bool SaveFixtureComplate(List fixture, string productLineCode, string stationCode); + bool SaveFixtureComplate(List fixture, string productLineCode, string stationCode, string loginTeam); /// /// 获取班组产量 diff --git a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs index 270e5f72..7553dc11 100644 --- a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs +++ b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs @@ -28,9 +28,9 @@ namespace Admin.Core.Service.Service_New private readonly ISysUserInfoServices _sysUserInfoServices; private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; - + private readonly IProductPlanInfoServices _productPlanInfoServices; - + private readonly IMaterialCompletionServices _materialCompletionServices; public RecordBoxFoamFixtureComplateServices(IBaseRepository dal, IOldBoxFoamTypeServices boxFoamTypeServices, IBoxFoamPlanServices boxFoamPlanServices, IBoxFoamDataServices oldBoxFoamDataServices, ISysUserInfoServices sysUserInfoServices, IBaseSpaceInfoServices baseSpaceInfoServices, IProductPlanInfoServices productPlanInfoServices, IMaterialCompletionServices materialCompletionServices) @@ -44,6 +44,7 @@ namespace Admin.Core.Service.Service_New _baseSpaceInfoServices = baseSpaceInfoServices; _productPlanInfoServices = productPlanInfoServices; _materialCompletionServices = materialCompletionServices; + } @@ -75,42 +76,37 @@ namespace Admin.Core.Service.Service_New /// /// /// - public bool SaveFixtureComplate(List fixture,string productLineCode,string stationCode) + public bool SaveFixtureComplate(List fixture,string productLineCode,string stationCode, string loginTeam) { bool result = false; try { - foreach(var item in fixture) + List list = _dal.QuerySql($"SELECT * FROM DATA_BOXFOAM_FIXTURECOMPLATE WHERE LOGIN_TEAM='{loginTeam}' and PRODUCTION_LINE='{productLineCode}'"); + + //List list = _boxFoamCompleteServices.getTeamData(productLineCode, loginTeam); + foreach (var item in fixture) { - //获取当前工位，前一条数据 - var lastFixtureList = _dal.Query(x => x.ProductionLine == productLineCode && x.StationCode == stationCode && x.FixtureCode == item.FixtureCode); - - if(lastFixtureList != null && lastFixtureList.Count>0) + //获取当前工位夹具产量 + int lastFixtureListCount = list.Where(x => x.FixtureCode == item.FixtureCode).Count(); + Console.WriteLine($"lastFixtureListCount:============>{item.FixtureOutPut}/////{lastFixtureListCount}"); + if(lastFixtureListCount > 0) { - RecordBoxFoamFixtureComplate lastFixtureComplate = lastFixtureList.OrderByDescending(x => x.RecordTime).First(); - if (lastFixtureComplate != null) - { - - if (item.FixtureOutPut > lastFixtureComplate.FixtureOutPut) - { - item.RealOutPut = item.FixtureOutPut - lastFixtureComplate.FixtureOutPut; + if (item.FixtureOutPut > lastFixtureListCount) + { + item.RealOutPut = lastFixtureListCount+1; - //更新生产计划 - UpdatePlanInfo(item,productLineCode,stationCode); + _dal.Add(item); + //更新生产计划 + UpdatePlanInfo(item, productLineCode, stationCode); - _dal.Add(item); - - //更新小时数据 - UpdateHourInfo(item, productLineCode, stationCode); - - break; - } - - } + //更新小时数据 + UpdateHourInfo(item, productLineCode, stationCode); + break; + } } else { diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs index d21e394d..8e45537d 100644 --- a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs +++ b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs @@ -116,7 +116,7 @@ namespace Aucma.Core.BoxFoam.Business LoginTeam = appConfig.TeamName }); }); - var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode); + var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode,appConfig.TeamName); } } catch (Exception ex) diff --git a/Aucma.Core.OldBoxFoam/Business/Collection.cs b/Aucma.Core.OldBoxFoam/Business/Collection.cs index 31d0f985..fd52691c 100644 --- a/Aucma.Core.OldBoxFoam/Business/Collection.cs +++ b/Aucma.Core.OldBoxFoam/Business/Collection.cs @@ -123,7 +123,7 @@ namespace Aucma.Core.OldBoxFoam.Business }); }); - var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode); + var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode,appConfig.TeamName); } }