fix-发泡班组随时间切换清空plc数量，矫正统计数量完整版

Admin.Core.IService/IService_New/IRecordBoxFoamFixtureComplateServices.cs

@@ -10,7 +10,7 @@ namespace Admin.Core.IService.IService_New
 {
     public interface IRecordBoxFoamFixtureComplateServices : IBaseServices<RecordBoxFoamFixtureComplate>
     {
-        bool SaveFixtureComplate(List<RecordBoxFoamFixtureComplate> fixture, string productLineCode, string stationCode);
+        bool SaveFixtureComplate(List<RecordBoxFoamFixtureComplate> fixture, string productLineCode, string stationCode, string loginTeam);
 
         /// <summary>
         /// 获取班组产量

Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs

@@ -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
         /// <param name="fixture"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public bool SaveFixtureComplate(List<RecordBoxFoamFixtureComplate> fixture,string productLineCode,string stationCode)
+        public bool SaveFixtureComplate(List<RecordBoxFoamFixtureComplate> fixture,string productLineCode,string stationCode, string loginTeam)
         {
             bool result = false;
 
             try
             {
 
-                foreach(var item in fixture)
-                {
-                    //获取当前工位，前一条数据
-                    var lastFixtureList = _dal.Query(x => x.ProductionLine == productLineCode && x.StationCode == stationCode && x.FixtureCode == item.FixtureCode);
+                List<RecordBoxFoamFixtureComplate> list = _dal.QuerySql($"SELECT  * FROM  DATA_BOXFOAM_FIXTURECOMPLATE  WHERE LOGIN_TEAM='{loginTeam}' and PRODUCTION_LINE='{productLineCode}'");
 
-                    if(lastFixtureList != null && lastFixtureList.Count>0)
+                //List<RecordBoxFoamFixtureComplate> list = _boxFoamCompleteServices.getTeamData(productLineCode, loginTeam);
+                foreach (var item in fixture)
                 {
-                       
-                            RecordBoxFoamFixtureComplate lastFixtureComplate = lastFixtureList.OrderByDescending(x => x.RecordTime).First();
-                            if (lastFixtureComplate != null)
+                    //获取当前工位夹具产量 
+                    int lastFixtureListCount = list.Where(x => x.FixtureCode == item.FixtureCode).Count();
+                    Console.WriteLine($"lastFixtureListCount:============>{item.FixtureOutPut}/////{lastFixtureListCount}");
+                    if(lastFixtureListCount > 0)
                     {
                        
-                                    if (item.FixtureOutPut > lastFixtureComplate.FixtureOutPut)
+                           if (item.FixtureOutPut > lastFixtureListCount)
                            {
-                                        item.RealOutPut = item.FixtureOutPut - lastFixtureComplate.FixtureOutPut;
-
-                                        //更新生产计划
-                                        UpdatePlanInfo(item,productLineCode,stationCode);
+                               item.RealOutPut = lastFixtureListCount+1;
 
                                _dal.Add(item);
+                               //更新生产计划
+                              UpdatePlanInfo(item, productLineCode, stationCode);
 
                             //更新小时数据
                             UpdateHourInfo(item, productLineCode, stationCode);
 
                                break;
                            }
-                                
-                            }
-
                     }
                     else
                     {

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)

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);
 
                 }
             }