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

change-修改前保存

Browse Source
main
liuwf 3 months ago
parent 992a19b15b
commit 02b2e00965
11 changed files with 550 additions and 231 deletions
Show Stats Download Patch File Download Diff File

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

@ -546,6 +546,11 @@
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.Classes">
<summary>
班次标识（1=白班 2-夜班）
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.BaseTeamMembers.StartTime">
<summary>
开始时间

7
Admin.Core.Model/Model_New/BaseTeamMembers.cs
Unescape Escape View File

@ -71,6 +71,13 @@ namespace Admin.Core.Model.Model_New
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public string UpdatedTime { get; set; }
/// <summary>
/// 班次标识（1=白班 2-夜班）
/// </summary>
[SugarColumn(ColumnName = "CLASSES")]
public int Classes { get; set; }
/// <summary>
/// 开始时间
/// </summary>

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

@ -94,7 +94,7 @@ namespace Admin.Core.Service.Service_New
if (lastFixtureComplate != null)
{
if (item.FixtureOutPut != lastFixtureComplate.FixtureOutPut)
if (item.FixtureOutPut > lastFixtureComplate.FixtureOutPut)
{
item.RealOutPut = item.FixtureOutPut - lastFixtureComplate.FixtureOutPut;

577
Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs
Unescape Escape View File

@ -1,10 +1,13 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using Admin.Core.Service;
using Aucma.Core.BoxFoam.Config;
using Aucma.Core.HwPLc;
using log4net;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.JSInterop;
using System;
using System.Collections.Generic;
using System.Linq;
@ -12,6 +15,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
namespace Aucma.Core.BoxFoam.Business
{
@ -20,13 +24,24 @@ namespace Aucma.Core.BoxFoam.Business
/// </summary>
public class TeamSwitchBusiness
{
private static readonly Lazy<TeamSwitchBusiness> lazy = new Lazy<TeamSwitchBusiness>(() => new TeamSwitchBusiness());
private readonly log4net.ILog log = LogManager.GetLogger(typeof(TeamSwitchBusiness));
private AppConfig appConfig = AppConfig.Instance;
private readonly IBoxFoamPlanServices _boxFoamPlanServices;
private readonly IBoxFoamDataServices _oldBoxFoamDataServices;
private readonly IBoxFoamDataRecordServices _boxFoamDataRecordServices;
private readonly IBaseBomInfoServices? _baseBomInfoServices;
public List<TwoTime> listTime;
public static TeamSwitchBusiness Instansece
{
get
{
return lazy.Value;
}
}
public TeamSwitchBusiness()
{
_boxFoamPlanServices = App.ServiceProvider.GetService<IBoxFoamPlanServices>();
@ -40,201 +55,254 @@ namespace Aucma.Core.BoxFoam.Business
listTime = _baseBomInfoServices.getTwoTime().Result;
}
public void Init()
{
DayShiftInfoCut();
NightShiftInfoCut();
}
/// <summary>
/// 白班信息切换
/// 启动班组切换监听
/// </summary>
private void DayShiftInfoCut()
{
DateTime now = DateTime.Now;
DateTime scheduledTime;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].startTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
}
if (now > scheduledTime)
{
scheduledTime = scheduledTime.AddDays(1);
}
TimeSpan timeToGo = scheduledTime - now;
int dueTime = (int)timeToGo.TotalMilliseconds;
System.Timers.Timer timer = new System.Timers.Timer();
timer.Elapsed += DayShiftTimerCallback;
timer.AutoReset = true;
timer.Interval = dueTime;
timer.Start();
}
private void DayShiftTimerCallback(object sender, ElapsedEventArgs e)
public void startListen(List<BaseTeamMembers> teamList)
{
DateTime scheduledTime;
Console.WriteLine("切换为白班！");
UpdateShiftInfo(1);
#region 重新定义Timer，进行第二天执行
DateTime now = DateTime.Now;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].startTime;
}
else
Task.Run(() =>
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
}
if (now > scheduledTime)
{
scheduledTime = scheduledTime.AddDays(1);
}
TimeSpan timeToGo = scheduledTime - now;
int dueTime = (int)timeToGo.TotalMilliseconds;
System.Timers.Timer timer = (System.Timers.Timer)sender;
timer.Elapsed += DayShiftTimerCallback;
timer.AutoReset = true;
timer.Interval = dueTime;
timer.Start();
#endregion
}
/// <summary>
/// 夜班班组切换
/// </summary>
private void NightShiftInfoCut()
{
DateTime now = DateTime.Now;
DateTime scheduledTime;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].endTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
}
while (true)
{
try
{
if (teamList.Count == 1) //单班
{
if (appConfig.LoginDate != DateTime.Now.ToString("yyyy-MM-dd") || appConfig.TeamCode != teamList[0].TeamCode)
{
bool flag = UpdateShiftInfo(1);
if (flag)
{
appConfig.TeamCode = teamList[0].TeamCode;
appConfig.TeamName = teamList[0].TeamName;
appConfig.LoginDate = DateTime.Now.ToString("yyyy-MM-dd");
}
}
}
else if (teamList.Count == 2) //双班检测
{
var currentDate = DateTime.Now;
// 判断当前时间属于哪个班组
BaseTeamMembers currentTeam = GetCurrentTeam(teamList, currentDate, out int lastFlag);
if (lastFlag == 0) //正常班组时间内
{
bool inHalfFlag = IsInHalfHour(currentTeam, currentDate);
if (inHalfFlag)
{
if (currentTeam.TeamCode != appConfig.TeamCode || appConfig.LoginDate != DateTime.Now.ToString("yyyy-MM-dd"))
{//判断切班清产量
// 清空PLC数据
bool flag;
if (currentTeam.Classes == 1)
{
flag = UpdateShiftInfo(1);
}
else
{
flag = UpdateShiftInfo(2);
}
if (flag)
{
appConfig.TeamCode = currentTeam.TeamCode;
appConfig.TeamName = currentTeam.TeamName;
appConfig.LoginDate = DateTime.Now.ToString("yyyy-MM-dd");
}
}
}
}
}
}catch (Exception ex)
{
log.Error(ex);
}
finally
{
Thread.Sleep(1000*5);
}
if (now > scheduledTime)
{
scheduledTime = scheduledTime.AddDays(1);
}
TimeSpan timeToGo = scheduledTime - now;
int dueTime = (int)timeToGo.TotalMilliseconds;
System.Timers.Timer timer = new System.Timers.Timer();
timer.Elapsed += NightShiftTimerCallback;
timer.AutoReset = true;
timer.Interval = dueTime;
timer.Start();
}
});
}
private void NightShiftTimerCallback(object sender, ElapsedEventArgs e)
{
DateTime scheduledTime;
Console.WriteLine("切换为夜班！");
UpdateShiftInfo(2);
#region 重新定义Timer，进行第二天执行
DateTime now = DateTime.Now;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].endTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
}
if (now > scheduledTime)
{
scheduledTime = scheduledTime.AddDays(1);
}
TimeSpan timeToGo = scheduledTime - now;
int dueTime = (int)timeToGo.TotalMilliseconds;
System.Timers.Timer timer = (System.Timers.Timer)sender;
timer.Elapsed += NightShiftTimerCallback;
timer.AutoReset = true;
timer.Interval = dueTime;
timer.Start();
#endregion
}
//public void Init()
//{
// // DayShiftInfoCut();
// // NightShiftInfoCut();
//}
///// <summary>
///// 白班信息切换
///// </summary>
//private void DayShiftInfoCut()
//{
// DateTime now = DateTime.Now;
// DateTime scheduledTime;
// if (listTime == null)
// {
// listTime = _baseBomInfoServices.getTwoTime().Result;
// }
// if (listTime != null)
// {
// scheduledTime = listTime[0].startTime;
// }
// else
// {
// scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
// }
// if (now > scheduledTime)
// {
// scheduledTime = scheduledTime.AddDays(1);
// }
// TimeSpan timeToGo = scheduledTime - now;
// int dueTime = (int)timeToGo.TotalMilliseconds;
// System.Timers.Timer timer = new System.Timers.Timer();
// timer.Elapsed += DayShiftTimerCallback;
// timer.AutoReset = true;
// timer.Interval = dueTime;
// timer.Start();
//}
//private void DayShiftTimerCallback(object sender, ElapsedEventArgs e)
//{
// DateTime scheduledTime;
// Console.WriteLine("切换为白班！");
// UpdateShiftInfo(1);
// #region 重新定义Timer，进行第二天执行
// DateTime now = DateTime.Now;
// if (listTime == null)
// {
// listTime = _baseBomInfoServices.getTwoTime().Result;
// }
// if (listTime != null)
// {
// scheduledTime = listTime[0].startTime;
// }
// else
// {
// scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
// }
// if (now > scheduledTime)
// {
// scheduledTime = scheduledTime.AddDays(1);
// }
// TimeSpan timeToGo = scheduledTime - now;
// int dueTime = (int)timeToGo.TotalMilliseconds;
// System.Timers.Timer timer = (System.Timers.Timer)sender;
// timer.Elapsed += DayShiftTimerCallback;
// timer.AutoReset = true;
// timer.Interval = dueTime;
// timer.Start();
// #endregion
//}
///// <summary>
///// 夜班班组切换
///// </summary>
//private void NightShiftInfoCut()
//{
// DateTime now = DateTime.Now;
// DateTime scheduledTime;
// if (listTime == null)
// {
// listTime = _baseBomInfoServices.getTwoTime().Result;
// }
// if (listTime != null)
// {
// scheduledTime = listTime[0].endTime;
// }
// else
// {
// scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
// }
// if (now > scheduledTime)
// {
// scheduledTime = scheduledTime.AddDays(1);
// }
// TimeSpan timeToGo = scheduledTime - now;
// int dueTime = (int)timeToGo.TotalMilliseconds;
// System.Timers.Timer timer = new System.Timers.Timer();
// timer.Elapsed += NightShiftTimerCallback;
// timer.AutoReset = true;
// timer.Interval = dueTime;
// timer.Start();
//}
//private void NightShiftTimerCallback(object sender, ElapsedEventArgs e)
//{
// DateTime scheduledTime;
// Console.WriteLine("切换为夜班！");
// UpdateShiftInfo(2);
// #region 重新定义Timer，进行第二天执行
// DateTime now = DateTime.Now;
// if (listTime == null)
// {
// listTime = _baseBomInfoServices.getTwoTime().Result;
// }
// if (listTime != null)
// {
// scheduledTime = listTime[0].endTime;
// }
// else
// {
// scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
// }
// if (now > scheduledTime)
// {
// scheduledTime = scheduledTime.AddDays(1);
// }
// TimeSpan timeToGo = scheduledTime - now;
// int dueTime = (int)timeToGo.TotalMilliseconds;
// System.Timers.Timer timer = (System.Timers.Timer)sender;
// timer.Elapsed += NightShiftTimerCallback;
// timer.AutoReset = true;
// timer.Interval = dueTime;
// timer.Start();
// #endregion
//}
/// <summary>
/// 班组切换
/// </summary>
/// <param name="shiftType">班组类型：1-白班；2-夜班</param>
private void UpdateShiftInfo(int shiftType)
public bool UpdateShiftInfo(int shiftType)
{
log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑");
Console.WriteLine($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑");
try
{
#region 240325 liulb 添加清空夹具产量功能； Delete By wenjy 2024-03-30 删除清空产量逻辑
//下发PLC清空产量信号
//var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
//if (obj1 != null)
//{
// if (obj1.plc.IsConnected)
// {
// var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空
// Thread.Sleep(500);
// obj1.plc.WriteBool("M6.0", false);//数据清空后复位
// Console.WriteLine($"【{DateTime.Now}】班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}");
// log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}");
// }
//}
//var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
//if (obj2 != null)
//{
// if (obj2.plc.IsConnected)
// {
// bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空
// Thread.Sleep(500);
// obj2.plc.WriteBool("M6.0", false);//数据清空后复位
// Console.WriteLine($"【{DateTime.Now}】班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}");
// log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}");
// }
//}
#endregion
#region Add By wenjy 2024-03-30 10:56:00 清空PLC产量,写true保持500毫秒后写false
ClearPlcOutPut("1");
bool result = ClearPlcOutPut("1");
if (!result)
{ // plc状态不对，直接返回
return result;
}
Task.Run(() =>
{
Thread.Sleep(3000);
@ -332,10 +400,12 @@ namespace Aucma.Core.BoxFoam.Business
}
}
}
return true;
}
catch (Exception ex)
{
log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}");
return false;
}
}
@ -343,28 +413,169 @@ namespace Aucma.Core.BoxFoam.Business
/// 清空PLC产量数据
/// </summary>
/// <param name="value"></param>
private void ClearPlcOutPut(string value)
private bool ClearPlcOutPut(string value)
{
var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
if (obj1 != null)
try
{
if (obj1.plc.IsConnected)
bool result = false;
var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
if (obj1 != null && obj1.plc.IsConnected)
{
var flag = obj1.plc.WriteInt16("DB16.DBW40", value);//换班 数据清空
log.Warn($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
}
}
var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
if (obj2 != null)
{
if (obj2.plc.IsConnected)
else
{
return false;
}
var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
if (obj2 != null && obj2.plc.IsConnected)
{
bool flag = obj2.plc.WriteInt16("DB16.DBW40", value);//换班 数据清空
log.Warn($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
}
else
{
return false;
}
result = true;
return result;
}catch (Exception ex)
{
return false;
}
}
#region 班组时间判断算法
/// <summary>
/// lastFlag=0代表当前时间段属于某个班组，这个时候需要判断是否清除plc数据
/// lastFlag=1代表当前时间段不属于任意一个班组，属于中间值，这个时候登录无需清除plc数据
/// </summary>
/// <param name="teamList"></param>
/// <param name="currentDate"></param>
/// <returns></returns>
public BaseTeamMembers GetCurrentTeam(List<BaseTeamMembers> teamList, DateTime currentDate, out int lastFlag)
{
lastFlag = 0;
BaseTeamMembers currentTeam = null;
// 遍历所有班组
foreach (var team in teamList)
{
if (TryParseTime(team.StartTime, team.EndTime, out var startTime, out var endTime))
{
// 检查当前时间是否在班组的正常范围内
if (IsTimeInRange(currentDate.TimeOfDay, startTime, endTime))
{
return team;
}
}
}
currentTeam = IsTimeWithinEndTimeBuffer(currentDate.TimeOfDay, teamList);
lastFlag = 1;
// 如果没有匹配的班组，返回 null
return currentTeam;
}
private bool TryParseTime(string startTime, string endTime, out TimeSpan start, out TimeSpan end)
{
if (TimeSpan.TryParse(startTime, out start) && TimeSpan.TryParse(endTime, out end))
{
return true;
}
start = default;
end = default;
return false;
}
private bool IsTimeInRange(TimeSpan currentTime, TimeSpan startTime, TimeSpan endTime)
{
// 处理跨越两天的班组
if (startTime <= endTime)
{
return currentTime >= startTime && currentTime < endTime;
}
else
{
return currentTime >= startTime || currentTime < endTime;
}
}
private BaseTeamMembers IsTimeWithinEndTimeBuffer(TimeSpan currentTime, List<BaseTeamMembers> teamList)
{
// 计算当前时间与班组结束时间之间的时间差
TimeSpan.TryParse(teamList[0].EndTime, out TimeSpan endtime0);
TimeSpan.TryParse(teamList[1].EndTime, out TimeSpan endtime1);
TimeSpan timeDiff0;
TimeSpan timeDiff1;
if(currentTime>= endtime0)
{
timeDiff0 = currentTime - endtime0;
}
else
{
timeDiff0 = endtime0 - currentTime;
}
if (currentTime >= endtime1)
{
timeDiff1 = currentTime - endtime1;
}
else
{
timeDiff1 = endtime1 - currentTime;
}
if(timeDiff0 < timeDiff1)
{
return teamList[0];
}
else
{
return teamList[1];
}
}
/// <summary>
/// 是否在当前班次开班半小时以内
/// </summary>
/// <returns></returns>
public bool IsInHalfHour(BaseTeamMembers team, DateTime currentDate)
{
try
{
TimeSpan startTime = TimeSpan.Parse(team.StartTime);
TimeSpan halfHour = TimeSpan.FromMinutes(30);
//次日凌晨
if (team.Classes == 2 && currentDate.TimeOfDay < startTime)
{
return false;
}
if (currentDate.TimeOfDay - startTime <= halfHour)
{
return true;
}
return false;
}catch (Exception ex)
{
return false;
}
}
#endregion
}
}

11
Aucma.Core.BoxFoam/Config/AppConfig.cs
Unescape Escape View File

@ -83,5 +83,16 @@ namespace Aucma.Core.BoxFoam.Config
}
/// <summary>
/// 班组登录日期，用以判断是否当天第一次登录
/// </summary>
public string LoginDate
{
get { return iniHelper.IniReadValue("system", "LoginDate"); }
set { iniHelper.IniWriteValue("system", "LoginDate", value); }
}
}
}

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

@ -327,6 +327,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
InternalTemperature.Clear();
OutsideTemperature.Clear();
StatusColor.Clear();
Totle = list.Sum(x => x.Yield);
foreach (var item in list)
{
if (item.Status == 1) StatusColor.Add("Green");
@ -337,9 +338,9 @@ namespace Aucma.Core.BoxFoam.ViewModels
// if (!string.IsNullOrEmpty(item.OutsideTemperature.ToString())) OutsideTemperature.Add(item.OutsideTemperature.ToString());
if (!string.IsNullOrEmpty(item.ProductionCycle.ToString())) Beat.Add(item.ProductionCycle.ToString());
totalAmount = totalAmount + item.Yield;
// totalAmount = totalAmount + item.Yield;
}
Totle = totalAmount;
// Totle = totalAmount;
}
catch(Exception ex)
{

117
Aucma.Core.BoxFoam/ViewModels/LoginPageViewModel.cs
Unescape Escape View File

@ -17,17 +17,21 @@ using NPOI.Util.Collections;
using Aucma.Core.BoxFoam.Config;
using Aucma.Core.BoxFoam.Models;
using Aucma.Core.BoxFoam.Views;
using System.Collections.Generic;
using System.Linq;
using Aucma.Core.BoxFoam.Business;
namespace Aucma.Core.BoxFoam.ViewModels
{
public partial class LoginPageViewModel : ObservableObject
{
private TeamSwitchBusiness teamSwitchBusiness = TeamSwitchBusiness.Instansece;
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LoginPageViewModel));
protected readonly IBaseTeamMembersServices _baseTeamMembersServices;
private AppConfig appConfig = AppConfig.Instance;
public LoginPageViewModel() {
_baseTeamMembersServices = App.ServiceProvider.GetService<IBaseTeamMembersServices>();
AddTeamData();
// AddTeamData();
}
#region 登录
@ -38,7 +42,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
/// <param name="userName">用户名</param>
/// <param name="passWord">密码</param>
/// <param name="isTeamChanged">是否切班</param>
public void Login(BaseTeamMembers team, string userName, string passWord,object parameter,bool isTeamChanged)
public void Login(string userName, string passWord,object parameter)
{
try
{
@ -59,10 +63,97 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
if (result.code == 200)
{
#region 根据系统班组启用状态判断单双班
List<BaseTeamMembers> teamList = _baseTeamMembersServices.Query(x=> x.ProductLineCode==appConfig.ProductlineCode && x.TeamCode.Contains(appConfig.TeamConfig) && x.IsFlag==0).ToList();
switch (teamList.Count)
{
case 0:
{
MessageBox.Show("登录失败,未查询到班组！", "系统提醒");
return;
}
case 1:// 单班处理
{
if ( appConfig.LoginDate!=DateTime.Now.ToString("yyyy-MM-dd") || appConfig.TeamCode != teamList[0].TeamCode)
{ //当天该班组第一次登录处理
// 清空PLC数据
bool flag = teamSwitchBusiness.UpdateShiftInfo(1);
//if (!flag)
//{
// MessageBox.Show("登录失败！切换班组清空PLC数据失败，请检查PLC状态", "系统提醒");
// return;
//}
if (flag)
{
appConfig.LoginDate = DateTime.Now.ToString("yyyy-MM-dd");
}
}
appConfig.TeamCode = teamList[0].TeamCode;
appConfig.TeamName = teamList[0].TeamName;
} break;
case 2: // 双班处理
{
#region 根据当前时间及白夜班上班时间判断班次
// 获取当前时间
var currentDate = DateTime.Now;
// 判断当前时间属于哪个班组
BaseTeamMembers currentTeam = teamSwitchBusiness.GetCurrentTeam(teamList, currentDate,out int lastFlag);
if (currentTeam == null)
{
MessageBox.Show($"登录失败,未查询到当前时间属于哪个班组！", "系统提醒");
return;
}
if (lastFlag == 0)
{
bool inHalfFlag = teamSwitchBusiness.IsInHalfHour(currentTeam, currentDate);
if (inHalfFlag)
{
if (currentTeam.TeamCode != appConfig.TeamCode || appConfig.LoginDate != DateTime.Now.ToString("yyyy-MM-dd"))
{//判断切班清产量
// 清空PLC数据
bool flag;
if (currentTeam.Classes == 1)
{
flag = teamSwitchBusiness.UpdateShiftInfo(1);
}
else
{
flag = teamSwitchBusiness.UpdateShiftInfo(2);
}
if (flag)
{
appConfig.LoginDate = DateTime.Now.ToString("yyyy-MM-dd");
}
////if (!flag)
////{
//// MessageBox.Show("登录失败！切换班组清空PLC数据失败，请检查PLC状态", "系统提醒");
//// return;
////}
}
}
}
appConfig.TeamCode = currentTeam.TeamCode;
appConfig.TeamName = currentTeam.TeamName;
appConfig.LoginDate = DateTime.Now.ToString("yyyy-MM-dd");
#endregion
}
break;
default:
{
MessageBox.Show($"登录失败,查询到{teamList.Count}个班组！", "系统提醒");
return;
}
}
#endregion
// 存储账号信息
appConfig.TeamCode = team.TeamCode;
appConfig.TeamName = team.TeamName;
appConfig.Account = userName;
teamSwitchBusiness.startListen(teamList);
//跳转
var window = parameter as LoginPageView;
@ -70,13 +161,9 @@ namespace Aucma.Core.BoxFoam.ViewModels
window.Hide();
MainWindow indexPage = MainWindow.Instance;
indexPage.Show();
if (isTeamChanged)
{
// TODO 调用委托处理班组切换方法
}
log.Info($"班组:{appConfig.TeamName}、用户:{appConfig.Account}登录,是否切班:{isTeamChanged}");
// window.Close();
log.Info($"班组:{appConfig.TeamName}、用户:{appConfig.Account}登录");
}
else
{
@ -89,6 +176,10 @@ namespace Aucma.Core.BoxFoam.ViewModels
log.Error($"登录异常:{ex.Message}");
}
}
#endregion
#region 关闭当前界面
@ -137,5 +228,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
#endregion
}
}
}

20
Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -53,8 +53,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
//await ClearProduct();
});
TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();
teamSwitchBusiness.Init();//切换班组清空发泡产量
//TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();
//teamSwitchBusiness.Init();//切换班组清空发泡产量
//实时更新界面时间
DispatcherTimer timer = new DispatcherTimer();
timer.Interval = new TimeSpan(0, 0, 1); //间隔1秒
@ -239,15 +239,15 @@ namespace Aucma.Core.BoxFoam.ViewModels
if (MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
{
appConfig.TeamCode = "";
appConfig.TeamName = "";
// appConfig.TeamCode = "";
// appConfig.TeamName = "";
appConfig.Account = "";
window.Hide();
//跳转到登录页
LoginPageView login = LoginPageView.Instance;
login.Show();
// window.Close();
System.Environment.Exit(0);
//window.Hide();
////跳转到登录页
//LoginPageView login = LoginPageView.Instance;
//login.Show();
// window.Close();
}
}

8
Aucma.Core.BoxFoam/Views/LoginPageView.xaml
Unescape Escape View File

@ -28,10 +28,10 @@
</StackPanel>
</UniformGrid>
<UniformGrid Grid.Row="1" Margin="0 10">
<Border BorderThickness="4" CornerRadius="5" x:Name="DialogHost" Width="400" Height="450" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Border BorderThickness="4" CornerRadius="5" x:Name="DialogHost" Width="400" Height="350" VerticalAlignment="Center" HorizontalAlignment="Center" >
<StackPanel Background="White">
<ComboBox Margin="0 50 0 0"
<ComboBox Margin="0 50 0 0" Visibility="Collapsed"
x:Name="selectTeamComboBox"
Width="300"
BorderThickness="1"
@ -41,7 +41,7 @@
DisplayMemberPath="TeamName"
ItemsSource="{Binding TeamMembersList}"
Style="{StaticResource MaterialDesignOutlinedComboBox}" />
<ComboBox Margin="0 10 0 0"
<ComboBox Margin="0 10 0 0" Visibility="Collapsed"
x:Name="IsChanged"
Width="300"
BorderThickness="1"
@ -51,7 +51,7 @@
<ComboBoxItem Content="不切班"/>
<ComboBoxItem Content="切班"/>
</ComboBox>
<TextBox Margin="0 10 0 0"
<TextBox Margin="0 70 0 0"
x:Name="txtUserName"
Width="300"
FontSize="18"

19
Aucma.Core.BoxFoam/Views/LoginPageView.xaml.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Admin.Core.Model.Model_New;
using Aucma.Core.BoxFoam.Business;
using Aucma.Core.BoxFoam.Common;
using Aucma.Core.BoxFoam.ViewModels;
using System;
@ -26,6 +27,7 @@ namespace Aucma.Core.BoxFoam.Views
public static LoginPageView Instance => _instance.Value;
LoginPageViewModel loginViewModel = new LoginPageViewModel();
public LoginPageView()
{
@ -43,20 +45,9 @@ namespace Aucma.Core.BoxFoam.Views
private void loginBtn_Click(object sender, RoutedEventArgs e)
{
bool isTeamChanged ;
string userName = txtUserName.Text;
string passWord = txtPassword.Password;
BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;
if (teamMembers==null)
{
MessageBox.Show("请选择班组！","系统提醒");
return;
}
if (string.IsNullOrEmpty(IsChanged.Text))
{
MessageBox.Show("请选择是否切班！", "系统提醒");
return;
}
// 非空校验,账号密码正则校验
if (string.IsNullOrWhiteSpace(userName))
{
@ -68,12 +59,10 @@ namespace Aucma.Core.BoxFoam.Views
MessageBox.Show("密码不可为空！", "系统提醒");
return;
}
isTeamChanged = "切班" == IsChanged.Text ? true : false;
// 登录校验
txtUserName.Text = "";
txtPassword.Password = "";
IsChanged.Text = "";
loginViewModel.Login(teamMembers,userName, passWord,this,isTeamChanged);
loginViewModel.Login(userName, passWord,this);
}

10
Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs
Unescape Escape View File

@ -22,10 +22,12 @@ namespace Aucma.Core.BoxFoam.Views
private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
this.Hide();
//跳转到登录页
LoginPageView login = LoginPageView.Instance;
login.Show();
if (MessageBox.Show("确定要退出吗？", "提示", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
System.Environment.Exit(0);
//this.Hide();
////跳转到登录页
//LoginPageView login = LoginPageView.Instance;
//login.Show();
}
}
}

Write Preview
Loading…
Cancel
Save