From 5966721912ae10f1bc2ee0e8961fc230bb94db1a Mon Sep 17 00:00:00 2001 From: wenjy Date: Mon, 8 Jan 2024 18:15:28 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=96=B0=E7=BA=BF=E9=97=A8?= =?UTF-8?q?=E4=BD=93=E5=8F=91=E6=B3=A1=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repository_New/BaseBomInfoRepository.cs | 4 ++-- .../Repository_New/BaseOrderInfoRepository.cs | 2 +- .../Repository_New/OrderBomInfoRepository.cs | 2 +- .../Repository_New/SysUserInfoRepository.cs | 10 +++++----- Admin.Core.Service/Service_New/BaseBomInfoServices.cs | 2 +- .../Service_New/CodeBindingRecordServices.cs | 2 +- Admin.Core.Service/Service_New/OffLineInfoServices.cs | 2 +- .../Service_New/ProductOffLineServices.cs | 4 ++-- .../RecordBoxFoamFixtureComplateServices.cs | 2 ++ Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs | 6 +++--- Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs | 2 +- Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs | 2 +- Aucma.Core.BoxFoam/appsettings.json | 3 ++- 13 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs index aa34bd00..5821e456 100644 --- a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs @@ -17,12 +17,12 @@ namespace Admin.Core.Repository public async Task> 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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } public async Task> 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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } } } \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs index 6ed120a2..6e2f371e 100644 --- a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs @@ -18,7 +18,7 @@ namespace Admin.Core.Repository public async Task> 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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } public async Task UpdatePrintName(BaseOrderInfo printName) diff --git a/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs index 496eddd4..f9dad961 100644 --- a/Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs +++ b/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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } diff --git a/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs b/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs index fef83246..4b990b88 100644 --- a/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs +++ b/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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(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(sql); + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } diff --git a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs index dba594f4..caee6479 100644 --- a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs @@ -36,7 +36,7 @@ namespace Admin.Core.Service { List list = null; var _db = this.BaseDal.Db; - list = await _db.Ado.SqlQueryAsync("SELECT * FROM VIEW_CURRENT_TEAM_TIME ORDER BY START_TIME"); + list = await _db.CopyNew().Ado.SqlQueryAsync("SELECT * FROM VIEW_CURRENT_TEAM_TIME ORDER BY START_TIME"); return list; } catch (Exception) diff --git a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs index bdfb1896..f39ad444 100644 --- a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs +++ b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs @@ -39,7 +39,7 @@ namespace Admin.Core.Service { List list = null; var _db = this.BaseDal.Db; - list = await _db.Ado.SqlQueryAsync("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("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) diff --git a/Admin.Core.Service/Service_New/OffLineInfoServices.cs b/Admin.Core.Service/Service_New/OffLineInfoServices.cs index 00a0ff75..c3719889 100644 --- a/Admin.Core.Service/Service_New/OffLineInfoServices.cs +++ b/Admin.Core.Service/Service_New/OffLineInfoServices.cs @@ -26,7 +26,7 @@ namespace Admin.Core.Service { List list = null; var _db = this.BaseDal.Db; - list = await _db.Ado.SqlQueryAsync($"WITH AllHours AS (SELECT TO_CHAR(to_date('{startTime}', 'YYYY-MM-DD HH24:MI:SS') + (LEVEL-1)/24, 'YYYY-MM-DD HH24') AS Hour FROM dual CONNECT BY LEVEL <= 12)SELECT AllHours.Hour AS HourlyTime, COUNT(PRODUCT_OFFLINE.PRODUCT_SCANTIME) AS Amount FROM AllHours LEFT JOIN AUCMA_SCADA.PRODUCT_OFFLINE ON AllHours.Hour = TO_CHAR(PRODUCT_OFFLINE.PRODUCT_SCANTIME, 'YYYY-MM-DD HH24') AND PRODUCT_OFFLINE.PRODUCT_SCANTIME >= TO_DATE('{startTime}', 'YYYY-MM-DD HH24:MI:SS') AND PRODUCT_OFFLINE.PRODUCT_SCANTIME <= TO_DATE('{endTime}', 'YYYY-MM-DD HH24:MI:SS') GROUP BY AllHours.Hour ORDER BY AllHours.Hour"); + list = await _db.CopyNew().Ado.SqlQueryAsync($"WITH AllHours AS (SELECT TO_CHAR(to_date('{startTime}', 'YYYY-MM-DD HH24:MI:SS') + (LEVEL-1)/24, 'YYYY-MM-DD HH24') AS Hour FROM dual CONNECT BY LEVEL <= 12)SELECT AllHours.Hour AS HourlyTime, COUNT(PRODUCT_OFFLINE.PRODUCT_SCANTIME) AS Amount FROM AllHours LEFT JOIN AUCMA_SCADA.PRODUCT_OFFLINE ON AllHours.Hour = TO_CHAR(PRODUCT_OFFLINE.PRODUCT_SCANTIME, 'YYYY-MM-DD HH24') AND PRODUCT_OFFLINE.PRODUCT_SCANTIME >= TO_DATE('{startTime}', 'YYYY-MM-DD HH24:MI:SS') AND PRODUCT_OFFLINE.PRODUCT_SCANTIME <= TO_DATE('{endTime}', 'YYYY-MM-DD HH24:MI:SS') GROUP BY AllHours.Hour ORDER BY AllHours.Hour"); return list; } catch (Exception) diff --git a/Admin.Core.Service/Service_New/ProductOffLineServices.cs b/Admin.Core.Service/Service_New/ProductOffLineServices.cs index 1642410d..cf9a69dd 100644 --- a/Admin.Core.Service/Service_New/ProductOffLineServices.cs +++ b/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(sql); + var infos = await _db.CopyNew().Ado.SqlQueryAsync(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($"SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.SAVE_BARCODE_INFO({Barcode},{Created_By},{Order_number},{Order_type})"); + var infos = await _db.CopyNew().Ado.SqlQueryAsync($"SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.SAVE_BARCODE_INFO({Barcode},{Created_By},{Order_number},{Order_type})"); return infos.FirstOrDefault().result; } catch (Exception ex) diff --git a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs index 61298937..72b38b78 100644 --- a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs +++ b/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); diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs index c2ff274b..f6ebf3cf 100644 --- a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs +++ b/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); } diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs index 5498f639..773aba1a 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs +++ b/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) diff --git a/Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs index 860fa402..6be3e6da 100644 --- a/Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs +++ b/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) diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index 18c9ccaa..618ab19c 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/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 } ],