liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
dev
liuwf 1 year ago
parent 5346a64f0a 1895e529e1
commit 102f51ca52
12 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
Unescape Escape View File

@ -17,12 +17,12 @@ namespace Admin.Core.Repository
public async Task<List<BaseBomInfo>> GetBoxChildData(string parentId) 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' "; 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) 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' "; 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);
} }
} }
} }

2
Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs
Unescape Escape View File

@ -18,7 +18,7 @@ namespace Admin.Core.Repository
public async Task<List<BaseOrderInfo>> GetOrderInfoData() 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 "; 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) public async Task<bool> UpdatePrintName(BaseOrderInfo printName)

2
Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs
Unescape Escape View File

@ -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 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' "; //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);
} }

10
Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs
Unescape Escape View File

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

2
Admin.Core.Service/Service_New/BaseBomInfoServices.cs
Unescape Escape View File

@ -36,7 +36,7 @@ namespace Admin.Core.Service
{ {
List<WorkTime> list = null; List<WorkTime> list = null;
var _db = this.BaseDal.Db; 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; return list;
} }
catch (Exception) catch (Exception)

2
Admin.Core.Service/Service_New/CodeBindingRecordServices.cs
Unescape Escape View File

@ -39,7 +39,7 @@ namespace Admin.Core.Service
{ {
List<CodeBindCharts> list = null; List<CodeBindCharts> list = null;
var _db = this.BaseDal.Db; 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; return list;
} }
catch (Exception) catch (Exception)

4
Admin.Core.Service/Service_New/ProductOffLineServices.cs
Unescape Escape View File

@ -35,7 +35,7 @@ namespace Admin.Core.Service
{ {
var _db = baseRepository.Db; var _db = baseRepository.Db;
string sql = "SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.GET_BARCODE_DATA('"+barCode+ "') as result FROM DUAL"; 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; return infos.FirstOrDefault().result;
} }
catch (Exception ex) catch (Exception ex)
@ -58,7 +58,7 @@ namespace Admin.Core.Service
{ {
// 保存业务 // 保存业务
var _db = baseRepository.Db; 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; return infos.FirstOrDefault().result;
} }
catch (Exception ex) catch (Exception ex)

2
Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
Unescape Escape View File

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

6
Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs
Unescape Escape View File

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

2
Aucma.Core.BoxFoam/ViewModels/FoamPlanPageViewModel.cs
Unescape Escape View File

@ -31,7 +31,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
public async void InitData() 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; if (task == null) return;
task.OrderBy(d=>d.ObjId); task.OrderBy(d=>d.ObjId);
foreach (var item in task) foreach (var item in task)

2
Aucma.Core.BoxFoam/ViewModels/SplitPlanViewModel.cs
Unescape Escape View File

@ -44,7 +44,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
MaterialDataGrid.Clear(); MaterialDataGrid.Clear();
int i = 1; 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 planlist = await _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station));
var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)); var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station));
foreach (var item in planlist) foreach (var item in planlist)

3
Aucma.Core.BoxFoam/appsettings.json
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save