Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs

@@ -17,12 +17,12 @@ namespace Admin.Core.Repository
         public async Task<List<BaseBomInfo>> GetBoxChildData(string parentId)
         {
             string sql = $@"select * from （select distinct *  from BASE_BOMINFO a start with PARENT_ID =  '{parentId}' connect by prior BOM_CODE = PARENT_ID） t  where t.MATERIAL_TYPE='200' and t.MATERIAL_TYPE='500' ";
-            return await Db.Ado.SqlQueryAsync<BaseBomInfo>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<BaseBomInfo>(sql);
         }
         public async Task<List<BaseBomInfo>> GetLinerChildData(string parentId)
         {
             string sql = $@"select * from （select distinct *  from BASE_BOMINFO a start with PARENT_ID =  '{parentId}' connect by prior BOM_CODE = PARENT_ID） t  where t.MATERIAL_TYPE='500' ";
-            return await Db.Ado.SqlQueryAsync<BaseBomInfo>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<BaseBomInfo>(sql);
         }
     }
 }

Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs

@@ -18,7 +18,7 @@ namespace Admin.Core.Repository
         public async Task<List<BaseOrderInfo>> GetOrderInfoData()
         {
            string sql = $"select DISTINCT o.* from (select r.*  from BASE_ORDERINFO  r left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE  where  MATERIAL_SUBCLASS='100') o  left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID ";
-            return await Db.Ado.SqlQueryAsync<BaseOrderInfo>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<BaseOrderInfo>(sql);
         }
 
         public async Task<bool> UpdatePrintName(BaseOrderInfo printName)

Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs

@@ -21,7 +21,7 @@ namespace Admin.Core.Repository
         {
             string sql = $"select distinct *  from BASE_BOMINFO a start with PARENT_ID in (select MATERIAL_CODE from BASE_ORDERINFO) connect by prior BOM_CODE = PARENT_ID";
             //string sql = $@"select * from （select distinct *  from BASE_BOMINFO a start with PARENT_ID =  '{parentId}' connect by prior BOM_CODE = PARENT_ID） t  where t.MATERIAL_TYPE='200'  or  t.MATERIAL_TYPE='500' ";
-            return await Db.Ado.SqlQueryAsync<OrderBomInfo>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<OrderBomInfo>(sql);
         }
 
        

Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs

@@ -25,7 +25,7 @@ namespace Admin.Core.Repository
                             FROM BASE_PRODUCTLINE BP
                             LEFT JOIN BASE_PROCESS_STATION BPS ON BPS.PARENT_ID LIKE '%' || BP.PRODUCT_LINE_CODE || '%'
                             WHERE BP.PRODUCT_LINE_CODE = '{code}'";
-            return await Db.Ado.SqlQueryAsync<ProductInfoView>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<ProductInfoView>(sql);
         }
 
         #region 获取班组数据
@@ -38,7 +38,7 @@ namespace Admin.Core.Repository
         {
             if (GetConnectionState() == false) return null;
             string sql = "SELECT * FROM VIEW_CURRENT_TEAM_TIME";
-            return await Db.Ado.SqlQueryAsync<CurrentTeamTimeView>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<CurrentTeamTimeView>(sql);
         }
 
         #endregion
@@ -54,7 +54,7 @@ namespace Admin.Core.Repository
             if (GetConnectionState() == false) return null;
             string sql =@$"SELECT BP.PLANT_CODE PLANT_CODE, BP.PARENT_ID PRODUCT_LINE_CODE, BPS.PROCESS_CODE, BP.PRODUCT_LINE_CODE STATION_CODE FROM BASE_PRODUCTLINE BP
             LEFT JOIN BASE_PROCESS_STATION BPS ON BPS.PARENT_ID LIKE '%' || BP.PRODUCT_LINE_CODE || '%' WHERE BP.PRODUCT_LINE_CODE = '{productLineCode}'";
-            return await Db.Ado.SqlQueryAsync<ProductLineInfoView>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<ProductLineInfoView>(sql);
         }
 
         #endregion
@@ -85,7 +85,7 @@ namespace Admin.Core.Repository
                               AND SPC.BEGIN_TIME <= CTT.END_TIME  and SPC.PRODUCTLINE_CODE='{productLineCode}'
                             GROUP BY ML.MATERIAL_SPECIFICATIONS,SPC.PRODUCTLINE_CODE";
 
-            return await Db.Ado.SqlQueryAsync<SheetMetalTypeDataView>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<SheetMetalTypeDataView>(sql);
         }
 
         #endregion
@@ -108,7 +108,7 @@ namespace Admin.Core.Repository
                         GROUP BY CTT.HOUR_TIME
                         ORDER BY CTT.HOUR_TIME";
             if (GetConnectionState() == false) return null;
-            return await Db.Ado.SqlQueryAsync<SheetMetaHourDataView>(sql);
+            return await Db.CopyNew().Ado.SqlQueryAsync<SheetMetaHourDataView>(sql);
         }
 
 

Admin.Core.Service/Service_New/BaseBomInfoServices.cs

@@ -36,7 +36,7 @@ namespace Admin.Core.Service
             {
                 List<WorkTime> list = null;
                 var _db = this.BaseDal.Db;
-                list = await _db.Ado.SqlQueryAsync<WorkTime>("SELECT  * FROM  VIEW_CURRENT_TEAM_TIME ORDER BY START_TIME");
+                list = await _db.CopyNew().Ado.SqlQueryAsync<WorkTime>("SELECT  * FROM  VIEW_CURRENT_TEAM_TIME ORDER BY START_TIME");
                 return list;
             }
             catch (Exception)

Admin.Core.Service/Service_New/CodeBindingRecordServices.cs

@@ -39,7 +39,7 @@ namespace Admin.Core.Service
             {
                 List<CodeBindCharts> list = null;
                 var _db = this.BaseDal.Db;
-                list = await _db.Ado.SqlQueryAsync<CodeBindCharts>("SELECT BOX_NAME as BoxName,COUNT(*) as Amount FROM CODE_BINDING WHERE PRODUCT_CODE IS NOT NULL GROUP BY BOX_NAME ");
+                list = await _db.CopyNew().Ado.SqlQueryAsync<CodeBindCharts>("SELECT BOX_NAME as BoxName,COUNT(*) as Amount FROM CODE_BINDING WHERE PRODUCT_CODE IS NOT NULL GROUP BY BOX_NAME ");
                 return list;
             }
             catch (Exception)

Admin.Core.Service/Service_New/ProductOffLineServices.cs

@@ -35,7 +35,7 @@ namespace Admin.Core.Service
             {
             var _db = baseRepository.Db;
             string sql = "SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.GET_BARCODE_DATA('"+barCode+ "') as result FROM DUAL";
-             var infos = await _db.Ado.SqlQueryAsync<BaseTest>(sql);
+             var infos = await _db.CopyNew().Ado.SqlQueryAsync<BaseTest>(sql);
             return infos.FirstOrDefault().result;
             }
             catch (Exception ex)
@@ -58,7 +58,7 @@ namespace Admin.Core.Service
             {
                 // 保存业务
                 var _db = baseRepository.Db;
-                var infos = await _db.Ado.SqlQueryAsync<BaseTest>($"SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.SAVE_BARCODE_INFO({Barcode},{Created_By},{Order_number},{Order_type})");
+                var infos = await _db.CopyNew().Ado.SqlQueryAsync<BaseTest>($"SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.SAVE_BARCODE_INFO({Barcode},{Created_By},{Order_number},{Order_type})");
                 return infos.FirstOrDefault().result;
             }
             catch (Exception ex)

Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs

@@ -168,6 +168,7 @@ namespace Admin.Core.Service.Service_New
                     if (hourData != null)
                     {
                         hourData = SetHourValue(hourData, item);
+                        hourData.UpdatedTime = DateTime.Now;
                         hourData.Fixturestatus = item.FixtureStatus;
                         _oldBoxFoamDataServices.UpdateAsync(hourData);
 
@@ -184,6 +185,7 @@ namespace Admin.Core.Service.Service_New
                 StationCode = item.StationCode,
                 Fixtureboxtype = item.FixtureBoxType,
                 MainId = item.FixtureCode,
+                UpdatedTime = DateTime.Now,
             };
             hourData = SetHourValue(hourData, item);
             _oldBoxFoamDataServices.AddAsync(hourData);

Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs

@@ -51,9 +51,9 @@ namespace Aucma.Core.BoxFoam.Business
                     try
                     {   
                         // 1-6夹具
-                        var plc1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
+                        var plc1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
                         //7-12夹具
-                        var plc2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
+                        var plc2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
                         // 泡前库箱型和数量
                         var plc3 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
 
@@ -108,7 +108,7 @@ namespace Aucma.Core.BoxFoam.Business
                     }
                     catch (Exception ex)
                     {
-                    Console.WriteLine(ex.ToString());
+                    Console.WriteLine($"箱体发泡线数据采集异常：{ex.Message}");
                     }              
                     Thread.Sleep(2000);
                 }

Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs

@@ -31,7 +31,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
 
         public async void InitData()
         {
-            var task =await _boxFoamPlanServices.QueryAsync();
+            var task =await _boxFoamPlanServices.QueryAsync(x=>x.ProductLineCode == "XC_002" && x.StationCode == "1005" && x.ShiftType == 1);
             if (task == null) return;
             task.OrderBy(d=>d.ObjId);
             foreach (var item in task)

Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs

@@ -44,7 +44,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
         {
             MaterialDataGrid.Clear();
             int i = 1;
-            string station = Appsettings.app("StoreInfo", "StationCode");
+            string station = Appsettings.app("StoreInfo", "BeforeStoreCode");
             var planlist = await _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station));
             var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station));
             foreach (var item in planlist)

Aucma.Core.BoxFoam/appsettings.json

@@ -226,7 +226,8 @@
       "EquipName": "foamMachinePlc",
       "PlcType": "Siemens",
       "Enabled": true,
-      "IP": "10.10.93.180",
+      //"IP": "10.10.93.180",
+      "IP": "127.0.0.1",
       "Port": 102
     }
   ],