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

new

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 608628be23 85ac6c05fc
commit 224e30debb
13 changed files with 253 additions and 139 deletions
Show Stats Download Patch File Download Diff File

24
Admin.Core.Common/Helper/StringChange.cs
Unescape Escape View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Common.Helper
{
public class StringChange
{
public static string bytesToHexStr(byte[] bytes, int iLen)//e.g. { 0x01, 0x01} ---> " 01 01"
{
string returnStr = "";
if (bytes != null)
{
for (int i = 0; i < iLen; i++)
{
returnStr += bytes[i].ToString("X2");
}
}
return returnStr;
}
}
}

164
Admin.Core.Model/Model_New/BoxLastShotRecord.cs
Unescape Escape View File

@ -12,152 +12,148 @@ namespace Admin.Core.Model
/// 获取发泡机最后一枪记录 /// 获取发泡机最后一枪记录
/// </summary> /// </summary>
[SugarTable("BOX_LASTSHOTRECORD", "AUCMA_SCADA")] [SugarTable("BOX_LASTSHOTRECORD", "AUCMA_SCADA")]
public class BoxLastShotRecord public class BoxLastShotRecord
{ {
/// <summary> /// <summary>
/// 主键 /// 主键
/// </summary> /// </summary>
[SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)] [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
public int ObjId { get; set; } public int ObjId { get; set; }
/// <summary>
/// 夹具类型
/// </summary>
[SugarColumn(ColumnName = "BOXFIXTURETYPE")]
public string BoxFixtureType { get; set; }
/// <summary> /// <summary>
/// 所属系统;1系统 2系统 /// 所属系统;1系统 2系统
/// </summary> /// </summary>
[SugarColumn(ColumnName = "SYSTEM")] [SugarColumn(ColumnName = "SYSTEM")]
public string System { get; set; } public string System { get; set; }
/// <summary> /// <summary>
/// 枪头 /// 枪编号；A1枪,B1枪,A2枪,B2枪
/// </summary> /// </summary>
[SugarColumn(ColumnName = "GUNHEAD")] [SugarColumn(ColumnName = "GUN_CODE")]
public string GunHead { get; set; } public string GunCode { get; set; }
/// <summary> /// <summary>
/// 工位号 /// 产线编号
/// </summary> /// </summary>
[SugarColumn(ColumnName = "STATIONNUMBER")] [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")]
public string StationNumber { get; set; } public string ProductLineCode { get; set; }
/// <summary> /// <summary>
/// POL注料压力 /// 枪POL注料温度
/// </summary> /// </summary>
[SugarColumn(ColumnName = "POL_INJECTIONPRESSURE")] [SugarColumn(ColumnName = "POL_TEMP")]
public string PolInjectionpressure { get; set; } public string PolTemp { get; set; }
/// <summary> /// <summary>
/// ISO注料压力 /// 枪POL注料压力
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ISO_INJECTIONPRESSURE")] [SugarColumn(ColumnName = "POL_HP")]
public string IsoInjectionpressure { get; set; } public string PolHp { get; set; }
/// <summary> /// <summary>
/// POL注料温度 /// 枪POL注料流量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "POL_INJECTIONTEMPERATURE")] [SugarColumn(ColumnName = "POL_VOL")]
public string PolInjectiontemperature { get; set; } public string PolVol { get; set; }
/// <summary> /// <summary>
/// ISO注料温度 /// 枪POL原料用量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ISO_INJECTIONTEMPERATURE")] [SugarColumn(ColumnName = "POL_USAGE")]
public string IsoInjectiontemperature { get; set; } public string PolUsage { get; set; }
/// <summary> /// <summary>
/// 中压循环时间 /// 枪ISO注料温度
/// </summary> /// </summary>
[SugarColumn(ColumnName = "MEDIUMPRESSURECYCLETIME")] [SugarColumn(ColumnName = "ISO_TEMP")]
public string MediumPressureCycleTime { get; set; } public string IsoTemp { get; set; }
/// <summary> /// <summary>
/// 高压循环时间 /// 枪ISO注料压力
/// </summary> /// </summary>
[SugarColumn(ColumnName = "HIGHPRESSURECYCLETIME")] [SugarColumn(ColumnName = "ISO_HP")]
public string HighPressureCycleTime { get; set; } public string IsoHp { get; set; }
/// <summary> /// <summary>
/// 设定注料重量 ///枪ISO注料流量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "SETINJECTIONWEIGHT")] [SugarColumn(ColumnName = "ISO_VOL")]
public string SetInjectionWeight { get; set; } public string IsoVol { get; set; }
/// <summary> /// <summary>
/// 设定注料料比 /// 枪ISO原料用量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "INJECTIONMATERIALRATIO")] [SugarColumn(ColumnName = "ISO_USAGE")]
public string InjectionMaterialRatio { get; set; } public string IsoUsage { get; set; }
/// <summary> /// <summary>
/// 实际注料重量 /// 枪注料工位号
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ACTUALINJECTIONWEIGHT")] [SugarColumn(ColumnName = "POUR_NU")]
public string ActualInjectionWeight { get; set; } public string PourNu { get; set; }
/// <summary> /// <summary>
/// 实际注料料比 /// 枪设定注料时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ACTUALINJECTIONMATERIALRATIO")] [SugarColumn(ColumnName = "SET_TIME")]
public string ActualInjectionMaterialRatio { get; set; } public string SetTime { get; set; }
/// <summary> /// <summary>
/// 枪头POL注料压力 /// 枪设定注料重量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "INJECPRESSUREOFPOLGUNHEAD")] [SugarColumn(ColumnName = "SET_WEIGHT")]
public string InjecPressureOfPOLGunHead { get; set; } public string SetWeight { get; set; }
/// <summary> /// <summary>
/// 枪头ISO注料压力 /// 枪设定注料比例
/// </summary> /// </summary>
[SugarColumn(ColumnName = "INJECPRESSUREOFISOGUNHEAD")] [SugarColumn(ColumnName = "SET_RATIO")]
public string InjecPressureOfISOGunHead { get; set; } public string SetRatio { get; set; }
/// <summary> /// <summary>
/// 枪头POL注料温度 /// 枪实际注料重量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "POLINJECTEMPERATUREOFGUNHEAD")] [SugarColumn(ColumnName = "POUR_WEIGHT")]
public string POLInjecTemperatureOfGunHead { get; set; } public string PourWeight { get; set; }
/// <summary> /// <summary>
/// 枪头ISO注料温度 /// 枪实际注料比例
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ISOINJECTEMPERATUREOFGUNHEAD")] [SugarColumn(ColumnName = "POUR_RATIO")]
public string ISOInjecTemperatureOfGunHead { get; set; } public string PourRatio { get; set; }
/// <summary> /// <summary>
/// POL注料流量 /// 枪中压循环时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "POLINJECFLOWRATE")] [SugarColumn(ColumnName = "MP_TIME")]
public string POLInjecFlowRate { get; set; } public string MpTime { get; set; }
/// <summary> /// <summary>
/// ISO注料流量 /// 枪高压循环时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "ISOINJECFLOWRATE")] [SugarColumn(ColumnName = "HP_TIME")]
public string ISOInjecFlowRate { get; set; } public string HpTime { get; set; }
/// <summary> /// <summary>
/// 液压压力 /// 枪液压压力
/// </summary> /// </summary>
[SugarColumn(ColumnName = "HYDRAULICPRESSURE")] [SugarColumn(ColumnName = "HYDR_PRESS")]
public string HydraulicPressure { get; set; } public string HydrPress { get; set; }
/// <summary> /// <summary>
/// 液压温度 /// 枪液压温度
/// </summary> /// </summary>
[SugarColumn(ColumnName = "HYDRAULICTEMPERATURE")] [SugarColumn(ColumnName = "HYDR_TEMP")]
public string HydraulicTemperature { get; set; } public string HydrTemp { get; set; }
/// <summary> /// <summary>
/// 小活塞开枪时间 /// 枪开枪时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "SMALLPISTONFIRINGTIME")] [SugarColumn(ColumnName = "MIXPIST_ON")]
public string SmallPistonFiringTime { get; set; } public string MixpistOn { get; set; }
/// <summary> /// <summary>
/// 小活塞关枪时间 /// 枪关枪时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "SMALLPISTONGUNSHUTDOWNTIME")] [SugarColumn(ColumnName = "MIXPIST_OFF")]
public string SmallPistonGunShutdownTime { get; set; } public string MixpistOff { get; set; }
/// <summary> /// <summary>
/// 注料状态 /// 枪总产量
/// </summary> /// </summary>
[SugarColumn(ColumnName = "INJECTIONSTATUS")] [SugarColumn(ColumnName = "TOTAL_YIELD")]
public DateTime InjectionStatus { get; set; } public string TotalYield { get; set; }
/// <summary> /// <summary>
/// 最后一次时间 /// 枪注料结束信号
/// </summary> /// </summary>
[SugarColumn(ColumnName = "LAST_TIME")] [SugarColumn(ColumnName = "POUR_END")]
public DateTime LastTime { get; set; } public string PourEnd { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[SugarColumn(ColumnName = "CREATETIME")] [SugarColumn(ColumnName = "CREATE_TIME")]
public DateTime Createtime { get; set; } public DateTime CreateTime { get; set; }
} }
} }

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

@ -34,7 +34,8 @@ namespace Admin.Core.Service
try try
{ {
var _db = baseRepository.Db; var _db = baseRepository.Db;
var infos = await _db.Ado.SqlQueryAsync<BaseTest>($"SELECT ILS_TMPRD.ILS_SORT_BARCODE_PKG.GET_BARCODE_DATA({barCode}) 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);
return infos.FirstOrDefault().result; return infos.FirstOrDefault().result;
} }
catch (Exception ex) catch (Exception ex)

6
Admin.Core.Tasks/Admin.Core.Tasks.csproj
Unescape Escape View File

@ -16,4 +16,10 @@
<ProjectReference Include="..\Aucma.Core.Scanner\Aucma.Core.Scanner.csproj" /> <ProjectReference Include="..\Aucma.Core.Scanner\Aucma.Core.Scanner.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HwCommunication">
<HintPath>..\dll\HwCommunication.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

12
Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs
Unescape Escape View File

@ -8,6 +8,10 @@ using Admin.Core.Model;
using System.Linq; using System.Linq;
using Admin.Core.Model.Model_New; using Admin.Core.Model.Model_New;
using Aucma.Core.HwPLc; using Aucma.Core.HwPLc;
using HwCommunication.Core;
using Admin.Core.Common.Helper;
using System.Collections;
using System.Text;
/// <summary> /// <summary>
/// 发泡数据采集 /// 发泡数据采集
@ -29,19 +33,23 @@ namespace Admin.Core.Tasks
_SysTasksQzService = SysTasksQzService; _SysTasksQzService = SysTasksQzService;
_boxFoamDataServices = boxFoamDataServices; _boxFoamDataServices = boxFoamDataServices;
_oldBoxFoamDataServices = oldBoxFoamDataServices; _oldBoxFoamDataServices = oldBoxFoamDataServices;
} }
public async Task Execute(IJobExecutionContext context) public async Task Execute(IJobExecutionContext context)
{ {
await ExecuteJob(context, async () => await Run(context)); // await ExecuteJob(context, async () => await Run(context));
await ExecuteJob(context, async () => await BoxFoamDataRun(context)); // await ExecuteJob(context, async () => await BoxFoamDataRun(context));
} }
public async Task Run(IJobExecutionContext context) public async Task Run(IJobExecutionContext context)
{ {
await SaveData(); await SaveData();
} }
public async Task BoxFoamDataRun(IJobExecutionContext context) public async Task BoxFoamDataRun(IJobExecutionContext context)
{ {
await SaveOldBoxFoamData(); await SaveOldBoxFoamData();

16
Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamLastData_Quartz.cs
Unescape Escape View File

@ -8,6 +8,11 @@ using Admin.Core.Model;
using System.Linq; using System.Linq;
using Admin.Core.Model.Model_New; using Admin.Core.Model.Model_New;
using Aucma.Core.HwPLc; using Aucma.Core.HwPLc;
using Admin.Core.Common.Helper;
using HwCommunication.Core;
using System.Text;
using Admin.Core.Service;
using Admin.Core.Common;
/// <summary> /// <summary>
/// 箱体发泡 最后一枪数据采集 /// 箱体发泡 最后一枪数据采集
@ -18,6 +23,12 @@ namespace Admin.Core.Tasks
{ {
public delegate Task RefreshBoxFoamDataDelegate(); public delegate Task RefreshBoxFoamDataDelegate();
public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent; public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent;
/// <summary>
/// 刷新最后一枪数据
/// </summary>
public delegate void RefreshLastShotDataDelegate(BoxLastShotRecord record);
public static event RefreshLastShotDataDelegate RefreshLastShotDataDelegateEvent;
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(Job_BoxFoamData_Quartz)); private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(Job_BoxFoamData_Quartz));
private readonly IBoxFoamDataServices _boxFoamDataServices; private readonly IBoxFoamDataServices _boxFoamDataServices;
private readonly IBoxFoamDataServices _oldBoxFoamDataServices; private readonly IBoxFoamDataServices _oldBoxFoamDataServices;
@ -28,14 +39,17 @@ namespace Admin.Core.Tasks
_SysTasksQzService = SysTasksQzService; _SysTasksQzService = SysTasksQzService;
_boxFoamDataServices = boxFoamDataServices; _boxFoamDataServices = boxFoamDataServices;
_oldBoxFoamDataServices = oldBoxFoamDataServices; _oldBoxFoamDataServices = oldBoxFoamDataServices;
_lastShotRecordServices = boxLastShotRecordServices;
} }
public async Task Execute(IJobExecutionContext context) public async Task Execute(IJobExecutionContext context)
{ {
await ExecuteJob(context, async () => await Run(context)); await ExecuteJob(context, async () => await Run(context));
await ExecuteJob(context, async () => await BoxFoamDataRun(context));
} }
public async Task Run(IJobExecutionContext context) }
public async Task Run(IJobExecutionContext context)
{ {
await SaveData(); await SaveData();
} }

57
Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
Unescape Escape View File

@ -108,7 +108,8 @@ namespace Aucma.Core.BoxFoam.Business
private static int AAA = 1; private static int AAA = 1;
public void init() public void init()
{ {
allSpaces = _baseSpaceInfoServices.Query(x => x.StoreCode == storeCode); allSpaces = _baseSpaceInfoServices.Query(x => x.StoreCode == storeCode);
foreach (var space in allSpaces) foreach (var space in allSpaces)
{ {
@ -117,13 +118,13 @@ namespace Aucma.Core.BoxFoam.Business
Task.Run(() => Task.Run(() =>
{ {
Thread.Sleep(5000); Thread.Sleep(5000);
// test(); // test();
// 获取任务下发plc // 获取任务下发plc
StartPassDown(); // StartPassDown();
// InStore("B23600083025024860011"); // InStore("B23600083025024860011");
}); });
startTimer(); // startTimer();
} }
public async void test() public async void test()
@ -146,7 +147,7 @@ namespace Aucma.Core.BoxFoam.Business
/// <returns></returns> /// <returns></returns>
public void RealInstoreFinish(object? sender, ElapsedEventArgs e) public void RealInstoreFinish(object? sender, ElapsedEventArgs e)
{ {
var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
if (obj != null && obj.plc.IsConnected) if (obj != null && obj.plc.IsConnected)
{ {
foreach (SpaceAddress spaceAddress in spaceAddresses) foreach (SpaceAddress spaceAddress in spaceAddresses)
@ -168,13 +169,17 @@ namespace Aucma.Core.BoxFoam.Business
} }
public void StartPassDown() public async void StartPassDown()
{ {
while (true) Task.Run(() =>
{ {
PassDown(); while (true)
Thread.Sleep(1000); {
} PassDown();
Thread.Sleep(200000);
}
});
} }
@ -405,7 +410,7 @@ namespace Aucma.Core.BoxFoam.Business
public BaseSpaceInfo ReadSpaceInfoByPlc(BaseSpaceInfo spaceInfo) public BaseSpaceInfo ReadSpaceInfoByPlc(BaseSpaceInfo spaceInfo)
{ {
var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
if (obj != null && obj.plc.IsConnected) if (obj != null && obj.plc.IsConnected)
{ {
SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.StoreCode, spaceInfo.SpaceCode); SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.StoreCode, spaceInfo.SpaceCode);
@ -440,15 +445,16 @@ namespace Aucma.Core.BoxFoam.Business
try try
{ {
SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(storeCode, taskInfo.SpaceCode); SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(storeCode, taskInfo.SpaceCode);
var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
if (obj != null && obj.plc.IsConnected) if (obj != null && obj.plc.IsConnected)
{ {
//写入货道号
obj.plc.WriteInt16("DB200.0", taskInfo.SpaceCode.Substring(7,1));
//写入应答字 //写入应答字
obj.plc.WriteInt16("DB200.2", "1"); obj.plc.WriteInt16("DB200.2", "1");
//写入货道物料类型 //写入货道物料类型
obj.plc.WriteString(spaceAddress.materialType, taskInfo.MaterialType); obj.plc.WriteString(spaceAddress.materialType, taskInfo.MaterialType);
//写入货道号
obj.plc.WriteInt16("DB200.0", taskInfo.SpaceCode.Substring(7,1));
//写入完成后读取反馈号进行复位 //写入完成后读取反馈号进行复位
ReadShellAnswer_InStore(taskInfo); ReadShellAnswer_InStore(taskInfo);
result = true; result = true;
@ -466,14 +472,14 @@ namespace Aucma.Core.BoxFoam.Business
} }
/// <summary> /// <summary>
/// 读取泡后入库应答 /// 读取泡前入库应答
/// </summary> /// </summary>
private void ReadShellAnswer_InStore(RealTaskInfo taskInfo) private void ReadShellAnswer_InStore(RealTaskInfo taskInfo)
{ {
lock (string.Empty) lock (string.Empty)
{ {
bool isFlag = true; bool isFlag = true;
var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
try try
{ {
Task.Run(() => Task.Run(() =>
@ -483,17 +489,18 @@ namespace Aucma.Core.BoxFoam.Business
do do
{ {
//读取PLC反馈号，上位机清空写入的入库内容 //读取PLC反馈号，上位机清空写入的入库内容
if (obj.plc.ReadInt16("DB200.86") == 1) if (obj.plc.ReadInt16("DB200.86") == 2)
{ {
obj.plc.WriteInt16("DB200.86", "0");
//-------------plc清 //-------------plc清
//写入货道号 //写入货道号
// obj.plc.WriteString("D110", string.Empty); obj.plc.WriteInt16("DB200.0", "0");
//写入应答字 // 写入应答字
// obj.plc.WriteInt16("D112", "0"); obj.plc.WriteInt16("DB200.2", "0");
//写入货道物料类型 //写入货道物料类型
// obj.plc.WriteInt16(spaceAddress.materialType, taskInfo.MaterialType); // obj.plc.WriteInt16(spaceAddress.materialType, taskInfo.MaterialType);
//---------------------- //----------------------
obj.plc.WriteInt16("DB200.86", "0");
isFlag = false; isFlag = false;
InStoreAnswer(taskInfo.TaskCode); InStoreAnswer(taskInfo.TaskCode);
// TaskInfos.Add(taskInfo); // TaskInfos.Add(taskInfo);
@ -579,7 +586,7 @@ namespace Aucma.Core.BoxFoam.Business
// lock (string.Empty) // lock (string.Empty)
// { // {
// bool isFlag = true; // bool isFlag = true;
// var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("发泡Plc")); // var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc"));
// try // try
// { // {

59
Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs
Unescape Escape View File

@ -1,7 +1,9 @@
using Admin.Core.Common; using Admin.Core.Common;
using Admin.Core.IService; using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.ViewModels; using Admin.Core.Model.ViewModels;
using Admin.Core.Service; using Admin.Core.Service;
using Admin.Core.Tasks;
using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.Models;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -20,9 +22,48 @@ namespace Aucma.Core.BoxFoam.ViewModels
public FoamMachinesPageViewModel() public FoamMachinesPageViewModel()
{ {
Job_BoxFoamLastData_Quartz.RefreshLastShotDataDelegateEvent += RefreshData;
_boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>(); _boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
//Task.WaitAll(LoadData()); //Task.WaitAll(LoadData());
} }
public void RefreshData(BoxLastShotRecord record)
{
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
{
string system = string.Empty;
if (record.System == "1") {
system = "1系统";
// PolFlow1 = record.POLInjecFlowRate;
// IsoFlow1 = record.ISOInjecFlowRate;
// PoleTmperature1 = record.POLInjecTemperatureOfGunHead;
// IsoTemperature1 = record.ISOInjecTemperatureOfGunHead;
}
if (record.System == "2") { system = "2系统"; }
LastShotRecordDataGrid.Add(new LastShotRecordModel()
{
No = LastShotRecordDataGrid.Count+1,
System = system,
GunHead = record.GunCode,
// StationNumber = record.StationNumber,
PolInjectionpressure = record.PolHp,
IsoInjectionpressure = record.IsoHp,
PolInjectiontemperature = record.PolTemp,
IsoInjectiontemperature = record.IsoTemp,
LastTime = record.CreateTime,
Createtime = record.CreateTime
});
}));
}
#region 加载DataGrid数据 #region 加载DataGrid数据
private async Task LoadData() private async Task LoadData()
{ {
@ -33,7 +74,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
int i = 1; int i = 1;
var list = await _boxLastShotRecordServices.QueryAsync(); var list = await _boxLastShotRecordServices.QueryAsync();
if (list == null) return; if (list == null) return;
list.OrderByDescending(d => d.LastTime); list.OrderByDescending(d => d.CreateTime);
foreach (var item in list.Take(50)) foreach (var item in list.Take(50))
{ {
string system = string.Empty; string system = string.Empty;
@ -43,14 +84,14 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
No = i, No = i,
System = system, System = system,
GunHead=item.GunHead, GunHead=item.GunCode,
StationNumber=item.StationNumber, // StationNumber=item.StationNumber,
PolInjectionpressure = item.PolInjectionpressure, PolInjectionpressure = item.PolHp,
IsoInjectionpressure = item.IsoInjectionpressure, IsoInjectionpressure = item.IsoHp,
PolInjectiontemperature = item.PolInjectiontemperature, PolInjectiontemperature = item.PolTemp,
IsoInjectiontemperature = item.IsoInjectiontemperature, IsoInjectiontemperature = item.IsoTemp,
LastTime = item.LastTime, LastTime = item.CreateTime,
Createtime = item.Createtime Createtime = item.CreateTime
}); });
i++; i++;
}; };

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

@ -98,17 +98,17 @@
"ID": 1, "ID": 1,
"Name": "InstoreJob", "Name": "InstoreJob",
"JobGroup": "DEFAULT", "JobGroup": "DEFAULT",
"Cron": "*/1 * * * * ?", "Cron": "*/20 * * * * ?",
"AssemblyName": "Admin.Core.Tasks", "AssemblyName": "Admin.Core.Tasks",
"ClassName": "Job_BoxFoamInStoreTask_Quartz", "ClassName": "Job_BoxFoamLastData_Quartz",
"Remark": "入库任务监控", "Remark": "最后一枪数据采集",
"RunTimes": 3881, "RunTimes": 3881,
"BeginTime": "2023-04-23 11:08:50.000", "BeginTime": "2023-04-23 11:08:50.000",
"EndTime": "2180-12-01 16:45:30.000", "EndTime": "2180-12-01 16:45:30.000",
"TriggerType": 1, "TriggerType": 1,
"IntervalSecond": 5, "IntervalSecond": 5,
"CycleRunTimes": 1, "CycleRunTimes": 1,
"IsStart": false, "IsStart": true,
"JobParams": null, "JobParams": null,
"DelFlag": false, "DelFlag": false,
"CreateBy": "admin", "CreateBy": "admin",
@ -186,7 +186,7 @@
"Enabled": true "Enabled": true
}, },
"QuartzNetJob": { "QuartzNetJob": {
"Enabled": false "Enabled": true
}, },
"Scanner": { //扫码器 "Scanner": { //扫码器
"Enabled": true "Enabled": true
@ -197,12 +197,21 @@
} }
}, },
"PLCServer": [ "PLCServer": [
{ {
"Id": 1, "Id": 1,
"EquipName": "OldTypePlc4", "EquipName": "泡前库Plc",
"IP": "10.10.93.154", "PlcType": "Siemens",
"Port": 5002 "Enabled": true,
"IP": "10.10.93.41",
"Port": 102
},
{
"Id": 2,
"EquipName": "Plc1",
"PlcType": "Siemens",
"Enabled": true,
"IP": "127.0.0.1",
"Port": 102
} }
], ],
"StoreInfo": { "StoreInfo": {

7
Aucma.Core.HwPLc/Impl/SiemensPlc.cs
Unescape Escape View File

@ -128,9 +128,10 @@ namespace Aucma.Core.HwPLc
if (read.IsSuccess) if (read.IsSuccess)
{ {
byte[] code = new byte[read.Content.Length - 2]; byte[] code = new byte[read.Content.Length - 2];
Array.Copy(read.Content, 2, code, 0, 24); //Array.Copy(read.Content, 2, code, 0, 24);
string scode = Encoding.ASCII.GetString(code, 0, code.Length); //string scode = Encoding.ASCII.GetString(code, 0, code.Length);
bytes = code; //bytes = code;
bytes = read.Content;
} }
} }
catch (Exception ex) catch (Exception ex)

11
Aucma.Core.ProductOffLine/Business/offLineBusiness.cs
Unescape Escape View File

@ -8,8 +8,12 @@ using Aucma.Core.ProductOffLine;
using Aucma.Core.ProductOffLine.Models; using Aucma.Core.ProductOffLine.Models;
using log4net; using log4net;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Logging; using Microsoft.IdentityModel.Logging;
using Microsoft.VisualBasic.ApplicationServices;
using NetTaste; using NetTaste;
using NPOI.SS.Formula.Functions;
using Oracle.ManagedDataAccess.Client;
using RestSharp; using RestSharp;
using StackExchange.Redis; using StackExchange.Redis;
using System; using System;
@ -99,8 +103,11 @@ namespace Aucma.Core.ProductOffLine.Business
public async void test() public async void test()
{ {
// string result = await _productOffLineServices.QueryChecked("16160030000000910780");
// Console.WriteLine(result);
string result = await _productOffLineServices.QueryChecked("1531000AP0098DCU0481");
Console.WriteLine(result);
// string tt = "Y@1104@16160030000000910780@000010034895@@ @000000@000000009000004899@BCD-160C,家电下乡@@BCD-160C@皓月白-家电下乡@161601300@160@1-00版@家电下乡产品@默认@2010-09-01"; // string tt = "Y@1104@16160030000000910780@000010034895@@ @000000@000000009000004899@BCD-160C,家电下乡@@BCD-160C@皓月白-家电下乡@161601300@160@1-00版@家电下乡产品@默认@2010-09-01";
//Task.Run(() => //Task.Run(() =>
//{ //{

4
Aucma.Core.ProductOffLine/appsettings.json
Unescape Escape View File

@ -82,7 +82,7 @@
"Enabled": true, "Enabled": true,
"HitRate": 50, "HitRate": 50,
//"Connection": "Data Source=localhost;Initial Catalog=Hsdb;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"Connection": "Data Source=localhost;Initial Catalog=Hsdb;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
"Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_scada;Password=aucma;", "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=ORCLCDB)));User ID=C##aucma_scada;Password=aucma;",
"ProviderName": "System.Data.SqlClient" "ProviderName": "System.Data.SqlClient"
}, },
{ {
@ -90,7 +90,7 @@
"DBType": 3, "DBType": 3,
"Enabled": true, "Enabled": true,
"HitRate": 40, "HitRate": 40,
"Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_mes;Password=aucma;", "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=ORCLCDB)));User ID=c##aucma_mes;Password=aucma;",
"ProviderName": "System.Data.SqlClient" "ProviderName": "System.Data.SqlClient"
}, },
{ {

2
Aucma.Core.RunPlc/RunPlcService.cs
Unescape Escape View File

@ -48,7 +48,7 @@ namespace Aucma.Core.RunPlc
if (allPlcServices == null) return Task.CompletedTask; if (allPlcServices == null) return Task.CompletedTask;
var list = allPlcServices.FindAll(d => d.PlcType == "Melsec" && d.Enabled == true); var list = allPlcServices.FindAll(d => d.PlcType == "Melsec" && d.Enabled == true);
foreach (var item in allPlcServices) foreach (var item in list)
{ {
PlcModel model = new PlcModel(); PlcModel model = new PlcModel();
model.Id = item.Id; model.Id = item.Id;

Write Preview
Loading…
Cancel
Save