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 67c30fae09
commit 72bc19724e
4 changed files with 83 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -4446,6 +4446,26 @@
工位
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.ProductLineInfoView.PlantCode">
<summary>
公司
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.ProductLineInfoView.ProductlineCode">
<summary>
产线编码
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.ProductLineInfoView.ProcessCode">
<summary>
工序
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.ProductLineInfoView.StationCode">
<summary>
工位
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.WorkTime">
<summary>
条码绑定扫描类型统计

33
Admin.Core.Model/ViewModels/ProductLineInfoView.cs
Unescape Escape View File

@ -0,0 +1,33 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.ViewModels
{
public class ProductLineInfoView
{
/// <summary>
/// 公司
/// </summary>
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; }
}
}

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

@ -37,7 +37,22 @@ namespace Admin.Core.Repository
string sql = "SELECT * FROM VIEW_CURRENT_TEAM_TIME";
return await Db.Ado.SqlQueryAsync<CurrentTeamTimeView>(sql);
}
#endregion
#region 获取班组数据
/// <summary>
/// 获取班组数据
/// </summary>
/// <returns></returns>
/// <exception cref="System.NotImplementedException"></exception>
public async Task<List<ProductLineInfoView>> GetProductLineInfo(string productLineCode)
{
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);
}
#endregion
}
}

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

@ -19,12 +19,7 @@ using System.Windows.Shapes;
using System.Timers;
using Aucma.Core.BoxFoam.Models;
using Admin.Core.Model;
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
{
@ -274,8 +269,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
#endregion
#region 夹具节拍
private ObservableCollection<int> _beat = new ObservableCollection<int>();
public ObservableCollection<int> Beat
private ObservableCollection<string> _beat = new ObservableCollection<string>();
public ObservableCollection<string> Beat
{
get => _beat;
set => SetProperty(ref _beat, value);
@ -308,7 +303,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
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);
if (!string.IsNullOrEmpty(item.ProductionCycle.ToString())) Beat.Add(item.ProductionCycle.ToString());
totalAmount = totalAmount + item.Yield;
}
@ -334,16 +329,16 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
string productLineCode = Appsettings.app("StationInfo", "ProductLineCode");
DateTime now = DateTime.Now;
CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
if (time != null)
{
//DateTime now = DateTime.Now;
//CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
//if (time != null)
//{
ExecHourDataAsync(productLineCode);
}
else
{
ShiftChangeAsync(productLineCode);
}
//}
//else
//{
// //ShiftChangeAsync(productLineCode);
//}
}
catch (Exception ex)
@ -386,6 +381,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
plan.CompleteAmount = plan.CompleteAmount + complateAmount;
if (complateAmount>0)
{
//保存历史记录
BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory();
history.PlantCode = bfd.PlantCode;
@ -398,7 +394,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
history.ModeInternaltemperature = bLis[j].InternalTemperature;
history.ModeOutsidetemperature = bLis[j].InternalTemperature;
history.UpdatedTime = DateTime.Now;
//事务合并
await _boxFoamDataRealTimeHistoryServices.AddAsync(history);
await _boxFoamPlanServices.UpdateAsync(plan);
}

Write Preview
Loading…
Cancel
Save