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 9b3fa2899a
commit 3d27a45e8e
9 changed files with 343 additions and 21 deletions
Show Stats Download Patch File Download Diff File

105
Admin.Core.Api/Admin.Core.Model.xml
Unescape Escape View File

@ -1246,11 +1246,26 @@
夹具序号
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTime.PlantCode">
<summary>
公司
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTime.ProductlineCode">
<summary>
产线编码
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTime.ProcessCode">
<summary>
工序
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTime.StationCode">
<summary>
工位
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTime.FixtureBoxtype">
<summary>
夹具箱型
@ -1436,6 +1451,96 @@
更新时间
</summary>
</member>
<member name="T:Admin.Core.Model.BoxFoamDataRealTimeHistory">
<summary>
夹具历史数据
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.ObjId">
<summary>
主键
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.PlantCode">
<summary>
公司
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.ProductlineCode">
<summary>
产线编码
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.ProcessCode">
<summary>
工序
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.StationCode">
<summary>
工位
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.FixtureBoxtype">
<summary>
夹具箱型
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.FixtureStatus">
<summary>
夹具状态
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.FixtureProductioncapacity">
<summary>
夹具产量
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.FixtureCuringtimesettingvalue">
<summary>
夹具固化时间设定值
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.FixtureActualtime">
<summary>
夹具固化时间显示值
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.ModeInternaltemperature">
<summary>
模具内温度
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.ModeOutsidetemperature">
<summary>
模具外温度
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.Beat">
<summary>
节拍
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BoxFoamDataRealTimeHistory.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="T:Admin.Core.Model.BoxFoamPlan">
<summary>
发泡计划

12
Admin.Core.IRepository/IRepository_New/IBoxFoamDataRealTimeHistoryRepository.cs
Unescape Escape View File

@ -0,0 +1,12 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
namespace Admin.Core.IRepository
{
/// <summary>
/// IBoxFoamDataRealTimeHistoryRepository
/// </summary>
public interface IBoxFoamDataRealTimeHistoryRepository : IBaseRepository<BoxFoamDataRealTime>
{
}
}

15
Admin.Core.IService/IService_New/IBoxFoamDataRealTimeHistoryServices.cs
Unescape Escape View File

@ -0,0 +1,15 @@
using Admin.Core.IService;
using Admin.Core.Model;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Admin.Core.IService
{
/// <summary>
/// IBoxFoamDataRealTimeHistoryServices
/// </summary>
public interface IBoxFoamDataRealTimeHistoryServices : IBaseServices<BoxFoamDataRealTimeHistory>
{
}
}

17
Admin.Core.Model/Model_New/BoxFoamDataRealTime.cs
Unescape Escape View File

@ -23,12 +23,27 @@ namespace Admin.Core.Model
/// </summary>
[SugarColumn(ColumnName = "SERIALNUMBER")]
public int SerialNumber { get; set; }
/// <summary>
/// 公司
/// </summary>
[SugarColumn(ColumnName = "PLANT_CODE")]
public string PlantCode { get; set; }
/// <summary>
/// 产线编码
/// </summary>
[SugarColumn(ColumnName = "PRODUCTLINE_CODE")]
public string ProductlineCode { get; set; }
/// <summary>
/// 工序
/// </summary>
[SugarColumn(ColumnName = "PROCESS_CODE")]
public string ProcessCode { get; set; }
/// <summary>
/// 工位
/// </summary>
[SugarColumn(ColumnName = "STATION_CODE")]
public string StationCode { get; set; }
/// <summary>
/// 夹具箱型
/// </summary>

115
Admin.Core.Model/Model_New/BoxFoamDdataRealTimeHistory.cs
Unescape Escape View File

@ -0,0 +1,115 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model
{
/// <summary>
/// 夹具历史数据
/// </summary>
[SugarTable("BOX_FOAMDATAREALTIME_HISTORY", "AUCMA_SCADA")]
public class BoxFoamDataRealTimeHistory
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// 公司
/// </summary>
[SugarColumn(ColumnName = "PLANT_CODE")]
public string PlantCode { get; set; }
/// <summary>
/// 产线编码
/// </summary>
[SugarColumn(ColumnName = "PRODUCTLINE_CODE")]
public string ProductlineCode { get; set; }
/// <summary>
/// 工序
/// </summary>
[SugarColumn(ColumnName = "PROCESS_CODE")]
public string ProcessCode { get; set; }
/// <summary>
/// 工位
/// </summary>
[SugarColumn(ColumnName = "STATION_CODE")]
public string StationCode { get; set; }
/// <summary>
/// 夹具箱型
/// </summary>
[SugarColumn(ColumnName = "FIXTURE_BOXTYPE")]
public string FixtureBoxtype { get; set; }
/// <summary>
/// 夹具状态
/// </summary>
[SugarColumn(ColumnName = "FIXTURE_STATUS")]
public string FixtureStatus { get; set; }
/// <summary>
/// 夹具产量
/// </summary>
[SugarColumn(ColumnName = "FIXTURE_PRODUCTIONCAPACITY")]
public float FixtureProductioncapacity { get; set; }
/// <summary>
/// 夹具固化时间设定值
/// </summary>
[SugarColumn(ColumnName = "FIXTURE_CURINGTIMESETTINGVALUE")]
public string FixtureCuringtimesettingvalue { get; set; }
/// <summary>
/// 夹具固化时间显示值
/// </summary>
[SugarColumn(ColumnName = "FIXTURE_ACTUALTIME")]
public string FixtureActualtime { get; set; }
/// <summary>
/// 模具内温度
/// </summary>
[SugarColumn(ColumnName = "MODE_INTERNALTEMPERATURE")]
public string ModeInternaltemperature { get; set; }
/// <summary>
/// 模具外温度
/// </summary>
[SugarColumn(ColumnName = "MODE_OUTSIDETEMPERATURE")]
public string ModeOutsidetemperature { get; set; }
/// <summary>
/// 节拍
/// </summary>
[SugarColumn(ColumnName = "BEAT")]
public string Beat { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public DateTime UpdatedTime { get; set; }
}
}

15
Admin.Core.Repository/Repository_New/BoxFoamDataRealTimeHistoryRepository.cs
Unescape Escape View File

@ -0,0 +1,15 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
namespace Admin.Core.Repository
{
/// <summary>
/// OrderBomInfoRepository
/// </summary>
public class BoxFoamDataRealTimeHistoryRepository : BaseRepository<BoxFoamDataRealTime>, IBoxFoamDataRealTimeHistoryRepository
{
public BoxFoamDataRealTimeHistoryRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

26
Admin.Core.Service/Service_New/BoxFoamDataRealTimeHistoryServices.cs
Unescape Escape View File

@ -0,0 +1,26 @@
using Admin.Core.IRepository;
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using log4net;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.IdentityModel.Logging;
using NPOI.SS.Formula.Functions;
using NPOI.XSSF.UserModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Admin.Core.Service
{
public class BoxFoamDataRealTimeHistoryServices : BaseServices<BoxFoamDataRealTimeHistory>, IBoxFoamDataRealTimeHistoryServices
{
private readonly IBaseRepository<BoxFoamDataRealTimeHistory> _dal;
public BoxFoamDataRealTimeHistoryServices(IBaseRepository<BoxFoamDataRealTimeHistory> dal)
{
this._dal = dal;
}
}
}

1
Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs
Unescape Escape View File

@ -2,7 +2,6 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Aucma.Core.HwPLc;
using HwCommunication.Core;
using NetTaste;
using NPOI.Util;
using System;

58
Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs
Unescape Escape View File

@ -23,6 +23,8 @@ using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using System.Threading;
using Aucma.Core.HwPLc;
using Castle.Core.Internal;
using Admin.Core.Repository;
namespace Aucma.Core.BoxFoam.ViewModels
{
@ -35,6 +37,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
private readonly ISysUserInfoServices _sysUserInfoServices;
private readonly IBoxFoamDataRecordServices _boxFoamDataRecordServices;
private readonly IBoxFoamDataRealTimeServices? _boxFoamDataRealTimeServices;
private readonly IBoxFoamDataRealTimeHistoryServices _boxFoamDataRealTimeHistoryServices;
System.Timers.Timer timer2 = new System.Timers.Timer(2000);
int totalAmount = 0;
@ -45,7 +49,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
_boxFoamDataRealTimeServices = App.ServiceProvider.GetService<IBoxFoamDataRealTimeServices>();
_boxFoamDataRecordServices = App.ServiceProvider.GetService<IBoxFoamDataRecordServices>();
_currentTeamTimeServices = App.ServiceProvider.GetService<ICurrentTeamTimeServices>();
// _boxFoamDataServices = App.ServiceProvider.GetService<IBoxFoamDataServices>();
_boxFoamDataRealTimeHistoryServices = App.ServiceProvider.GetService<IBoxFoamDataRealTimeHistoryServices>();
// _boxFoamDataServices = App.ServiceProvider.GetService<IBoxFoamDataServices>();
CollectionFoamLine.RefreshBoxFoamDataDelegateEvent += InitData;
timer2.Elapsed += new System.Timers.ElapsedEventHandler(RealTimeFoamingTask); //到达时间的时候执行事件；
@ -299,12 +304,11 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
if (item.Status == 1) StatusColor.Add("Green");
if (item.Status == 0) StatusColor.Add("Red");
FixtureName.Add(item.FixtureBoxType);
Production.Add(item.Yield.ToString());
InternalTemperature.Add(item.InternalTemperature.ToString());
OutsideTemperature.Add(item.OutsideTemperature.ToString());
Beat.Add(item.ProductionCycle);
if (!string.IsNullOrEmpty(item.FixtureBoxType)) FixtureName.Add(item.FixtureBoxType);
if (!string.IsNullOrEmpty(item.Yield.ToString())) Production.Add(item.Yield.ToString());
if (!string.IsNullOrEmpty(item.InternalTemperature.ToString())) InternalTemperature.Add(item.InternalTemperature.ToString());
if (!string.IsNullOrEmpty(item.OutsideTemperature.ToString())) OutsideTemperature.Add(item.OutsideTemperature.ToString());
if (!string.IsNullOrEmpty(item.ProductionCycle.ToString())) Beat.Add(item.ProductionCycle);
totalAmount = totalAmount + item.Yield;
}
@ -380,7 +384,24 @@ namespace Aucma.Core.BoxFoam.ViewModels
SaveClampData(productLineCode, fixtureStatus);
}
plan.CompleteAmount = plan.CompleteAmount + complateAmount;
await _boxFoamPlanServices.UpdateAsync(plan);
if (complateAmount>0)
{
BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory();
history.PlantCode = bfd.PlantCode;
history.ProductlineCode = bfd.ProductlineCode;
history.ProcessCode = bfd.ProcessCode;
history.StationCode= bfd.StationCode;
history.FixtureProductioncapacity = bLis[j].Yield;
history.FixtureCuringtimesettingvalue = bLis[j].PlanCuringTime.ToString();
history.FixtureActualtime = bLis[j].RealCuringTime.ToString();
history.ModeInternaltemperature = bLis[j].InternalTemperature;
history.ModeOutsidetemperature = bLis[j].InternalTemperature;
history.UpdatedTime = DateTime.Now;
await _boxFoamDataRealTimeHistoryServices.AddAsync(history);
await _boxFoamPlanServices.UpdateAsync(plan);
}
}
else
{
@ -403,16 +424,14 @@ namespace Aucma.Core.BoxFoam.ViewModels
private async void ShiftChangeAsync(string productLineCode)
{
//切换班组计划
//var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
//if (currentTeamTimeList.Count == 0) return;
//var list= await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode);
////更新计划表操作
//CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
//currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
//currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
//currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
if (currentTeamTimeList.Count == 0) return;
var list = await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode);
//更新计划表操作
CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
//可以使用Mapping 映射
@ -442,7 +461,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
// record.CreateTime = DateTime.Now;
//});
//int result = await _boxFoamDataRecordServices.AddAsync(recordList);
//if (result > 0)
//{
@ -452,6 +471,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
// //清空 当班计划
// await _oldBoxFoamDataServices.DeletesAsync(list);
// await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
//}
}

Write Preview
Loading…
Cancel
Save