baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240808

Browse Source
master
范 2 years ago
parent c3d671b033
commit ba01bb482d
5 changed files with 351 additions and 317 deletions
Show Stats Download Patch File Download Diff File

5
src/Khd.Core.Wcs/MainCentralControl.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Khd.Core.EntityFramework;
using Khd.Core.Domain.Models;
using Khd.Core.EntityFramework;
using Khd.Core.Library;
using Khd.Core.Wcs.Global;
using Khd.Core.Wcs.Wcs;
@ -36,6 +37,8 @@ namespace Khd.Core.Wcs
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
try
{
dbContext.WmsBaseLocation.Update(t => new Dictionary<string, WmsBaseLocation>() { { "1", new WmsBaseLocation { locationStatus="1" } } });
StaticData.BasePlcpointList = dbContext.BasePlcpoint.Where(t => t.isDelete == 0).ToList();//设备交互用
StaticData.basePlcs = dbContext.BasePlc.ToList();//陈工Agv和设备信息推送
StaticData.BaseEquip = dbContext.BaseEquip.ToList();//设备信息

40
src/Khd.Core.Wcs/TaskTypeEnum.cs
Unescape Escape View File

@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Khd.Core.Wcs
{
public enum TaskTypeEnum:int
{
/// <summary>
/// 五楼原材料拆分
/// </summary>
FIVE_RAW_SPLIT= 46,
/// <summary>
/// 五楼原材料拆分返库
/// </summary>
FIVE_RAW_SPLIT_RETURN= 28,
/// <summary>
/// 五楼原材料入库
/// </summary>
FIVE_RAW_IN=47,
/// <summary>
/// 五楼成品出库
/// </summary>
FIVE_PRODUCK_OUT=38,
/// <summary>
/// 五楼原材料到背板安装
/// </summary>
FIVE_RAW_TO_BACK=33,
/// <summary>
/// 五楼半成品入库
/// </summary>
FIVE_PRODUCK_HALF_IN=34,
/// <summary>
/// 五楼移库
/// </summary>
FIVE_MOVE=66,
}
}

1
src/Khd.Core.Wcs/Wcs/SecondFloorLine.cs
Unescape Escape View File

@ -7,7 +7,6 @@ using Khd.Core.Wcs.Global;
using Masuit.Tools;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Z.EntityFramework.Plus;
namespace Khd.Core.Wcs.Wcs
{

228
src/Khd.Core.Wcs/Wcs/SystemTimer.cs
Unescape Escape View File

@ -13,7 +13,7 @@ namespace Khd.Core.Wcs.Wcs
{
public class SystemTimer
{
private readonly LoggerUtils _logger = new LoggerUtils();
private readonly LoggerUtils _logger = new ();
private readonly IHost host;
public SystemTimer(IHost host)
@ -70,8 +70,7 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时清除日志文件
/// </summary>
/// <param name="obj"></param>
private void DeleteLogsLogic(object? obj)
private void DeleteLogsLogic()
{
while (true)
{
@ -108,8 +107,7 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 删除任务
/// </summary>
/// <param name="obj"></param>
private void DeleteTaskLogic(object? obj)
private void DeleteTaskLogic()
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
@ -188,7 +186,10 @@ namespace Khd.Core.Wcs.Wcs
}
}
private void PlcHearBeat220Logic(object? obj)
/// <summary>
/// 定时发送心跳包
/// </summary>
private void PlcHearBeat220Logic()
{
BasePlcpoint HeartBeat30 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "putTray");
while (true)
@ -216,8 +217,7 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时发送心跳包
/// </summary>
/// <param name="obj"></param>
private void PlcHeartBeat30Logic(object? obj)
private void PlcHeartBeat30Logic()
{
BasePlcpoint HeartBeat30 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "HeartBeat30");
bool heartBeatCount = false;
@ -247,8 +247,7 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时发送心跳包
/// </summary>
/// <param name="obj"></param>
private void PlcHeartBeat31Logic(object? obj)
private void PlcHeartBeat31Logic()
{
BasePlcpoint HeartBeat31 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "CTUHeart");
bool heartBeatCount = false;
@ -285,8 +284,7 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时更新基础设备信息
/// </summary>
/// <param name="obj"></param>
private void BaseEquipLogic(object? obj)
private void BaseEquipLogic()
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
@ -318,110 +316,28 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时同步消息
/// </summary>
/// <param name="obj"></param>
private void MessageSynchronousLogic(object? obj)
private void MessageSynchronousLogic()
{
while (true)
{
try
{
try
{
FiveAgvStatusLogic();
}
catch
{
}
try
{
SecondAgvLogic();
}
catch
{
}
try
{
ThirdAgvLogic();
}
catch
{
}
try
{
SendTrayMessage();
}
catch
{
}
try
{
HositerLogic();
}
catch
{
}
try
{
CtuLineLogic();
}
catch
{
}
try
{
FiveAgvLogic();
}
catch
{
}
try
{
FiveBearAgvLogic();
}
catch
{
}
try
{
CtuCmdLogic();
}
catch
{
}
try
{
UpdatePlcPointValue();
}
catch
{
}
}
catch (Exception ex)
{
if (ex is PlcException)
{
}
else
{
_logger.Error(ex.Message + "\n" + ex.StackTrace);
}
}
Thread.Sleep(1000);
BasePlcPointUpdateLogic();
Thread.Sleep(3000);
}
}
/// <summary>
/// 五楼AGV状态
/// </summary>
private void FiveAgvStatusLogic()
{
try
@ -456,7 +372,48 @@ namespace Khd.Core.Wcs.Wcs
}
}
/// <summary>
/// 获取Plc的值
/// </summary>
private void BasePlcPointUpdateLogic()
{
try
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
List<Plc.S7.Plc> plcs = StaticData.PlcDic.Values.ToList();
foreach (var item in StaticData.BasePlcpointList.Where(t => !string.IsNullOrEmpty(t.plcpointAddress)))
{
if (!string.IsNullOrEmpty(item.plcpointAddress))
{
try
{
if (item.plcpointNo.Contains("RFID"))
item.definefield1 = plcs.Where(t => t.IP == item.definefield3).First().ReadRFID(item.plcpointAddress)?.ToString();
else
item.definefield1 = plcs.Where(t => t.IP == item.definefield1).First().Read(item.plcpointAddress)?.ToString();
}
catch
{
}
}
}
dbContext.UpdateRange(StaticData.BasePlcpointList.Where(t => !string.IsNullOrEmpty(t.plcpointAddress)));
dbContext.SaveChanges();
}
catch
{
}
}
/// <summary>
/// 托盘库
/// </summary>
private void SendTrayMessage()
{
try
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
@ -487,7 +444,15 @@ namespace Khd.Core.Wcs.Wcs
StaticData.PlcDic[2].WriteToPoint(basePlc.Address, value, basePlc.type);
StaticData.PlcDic[2].WriteToPoint(basePlc2.Address, baseEquip.emptyCount.ToString(), basePlc2.type);
}
catch
{
}
}
/// <summary>
/// 修改Plc点位信息
/// </summary>
private void UpdatePlcPointValue()
{
try
@ -510,7 +475,6 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时更新三楼AGV信息
/// </summary>
/// <param name="dbContext"></param>
private void ThirdAgvLogic()
{
try
@ -550,7 +514,6 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时更新二楼AGV信息
/// </summary>
/// <param name="dbContext"></param>
private void SecondAgvLogic()
{
try
@ -590,25 +553,25 @@ namespace Khd.Core.Wcs.Wcs
/// <summary>
/// 定时更新五楼AGV信息
/// </summary>
/// <param name="dbContext"></param>
private void FiveAgvLogic()
{
try
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
var baseEquip = StaticData.BaseEquip.First(t => t.objid == 10);
var baseEquip = StaticData.BaseEquip.First(t => t.objid == 28);
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var basePlcs = StaticData.basePlcs.Where(t => t.Station == "5楼AGV").ToList();
List<int?> type = new List<int?>() { 27, 28, 34, 35, 37, 38, 46, 47 };
var wcsCmds = dbContext.WcsCmd.Where(t => type.Contains(t.cmdType)).ToList();
var wcsCmds = dbContext.WcsTask.Where(t => t.nextPointId == 28).ToList();
if (wcsCmds.Count > 0)
{
WcsCmd wcsCmd = wcsCmds.First();
var wcsCmd = wcsCmds.First();
var endPlc = basePlcs.Where(t => t.Name.Contains("目的地")).First();
StaticData.PlcDic[2].WriteToPoint(endPlc.Address, wcsCmd.nextPointId.ToString(), endPlc.type);
var startPlc = basePlcs.First(t => t.Name.Contains("起始点"));
StaticData.PlcDic[2].WriteToPoint(startPlc.Address, wcsCmd.currPointId.ToString(), startPlc.type);
var cmdPlc = basePlcs.First(t => t.Name.Contains("任务代号"));
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.cmdType).ToPlc;
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.taskType).ToPlc;
StaticData.PlcDic[2].WriteToPoint(cmdPlc.Address, cmdType, cmdPlc.type);
}
else
@ -658,28 +621,33 @@ namespace Khd.Core.Wcs.Wcs
StaticData.PlcDic[2].WriteToPoint(Ylc.Address, cardStatus.PosY.ToString(), Ylc.type);
}
}
catch
{
}
}
/// <summary>
/// 定时更新五楼背负式AGV信息
/// </summary>
/// <param name="dbContext"></param>
private void FiveBearAgvLogic()
{
try
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
var baseEquip = StaticData.BaseEquip.First(t => t.objid == 10);
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var basePlcs = StaticData.basePlcs.Where(t => t.Station == "5楼背负式").ToList();
var wcsCmds = dbContext.WcsCmd.Where(t => t.cmdType == 32 || t.cmdType == 48).ToList();
var wcsCmds = dbContext.WcsTask.Where(t => t.nextPointId == 10).ToList();
if (wcsCmds.Count > 0)
{
WcsCmd wcsCmd = wcsCmds.First();
var wcsCmd = wcsCmds.First();
var endPlc = basePlcs.Where(t => t.Name.Contains("目的地")).First();
StaticData.PlcDic[2].WriteToPoint(endPlc.Address, wcsCmd.nextPointId.ToString(), endPlc.type);
var startPlc = basePlcs.First(t => t.Name.Contains("起始点"));
StaticData.PlcDic[2].WriteToPoint(startPlc.Address, wcsCmd.currPointId.ToString(), startPlc.type);
var cmdPlc = basePlcs.First(t => t.Name.Contains("任务代号"));
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.cmdType).ToPlc;
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.taskType).ToPlc;
StaticData.PlcDic[2].WriteToPoint(cmdPlc.Address, cmdType, cmdPlc.type);
}
else
@ -692,25 +660,31 @@ namespace Khd.Core.Wcs.Wcs
StaticData.PlcDic[2].WriteToPoint(cmdPlc.Address, "0", cmdPlc.type);
}
}
catch
{
}
}
/// <summary>
/// 定时更新五楼CTU信息
/// </summary>
/// <param name="dbContext"></param>
private void CtuCmdLogic()
{
try
{
using var scope = host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
var baseEquip = StaticData.BaseEquip.First(t => t.objid == 11);
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
var basePlcs = StaticData.basePlcs.Where(t => t.Station == "5楼CTU").ToList();
var wcsCmds = dbContext.WcsCmd.Where(t => t.cmdType == 29 || t.cmdType == 30 || t.cmdType == 31).ToList();
var wcsCmds = dbContext.WcsTask.Where(t => t.nextPointId == 11).ToList();
if (wcsCmds.Count > 0)
{
var wcsCmd = wcsCmds.First();
List<long?> startList = new List<long?>();
List<long?> endList = new List<long?>();
if (wcsCmd.cmdType != 30)
if (wcsCmd.taskType != 30)
{
startList.Add(wcsCmd.currPointId);
endList.AddRange(wcsCmds.Select(t => t.nextPointId).ToList());
@ -732,7 +706,7 @@ namespace Khd.Core.Wcs.Wcs
var startPlc = basePlcs.First(t => t.Name.Contains("起始点"));
StaticData.PlcDic[2].WriteToPoint(startPlc.Address, wcsCmd.currPointId.ToString(), startPlc.type);
var cmdPlc = basePlcs.First(t => t.Name.Contains("任务代号"));
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.cmdType).ToPlc;
string cmdType = StaticData.BaseDictionary.First(t => t.objid == wcsCmd.taskType).ToPlc;
StaticData.PlcDic[2].WriteToPoint(cmdPlc.Address, cmdType, cmdPlc.type);
}
@ -749,11 +723,18 @@ namespace Khd.Core.Wcs.Wcs
StaticData.PlcDic[2].WriteToPoint(cmdPlc.Address, "0", cmdPlc.type);
}
}
catch
{
}
}
/// <summary>
/// 定时更新五楼U型线信息
/// </summary>
private void CtuLineLogic()
{
try
{
var basePlcpoints = StaticData.BasePlcpointList.ToList();
var basePlcs = StaticData.basePlcs.ToList();
@ -790,13 +771,19 @@ namespace Khd.Core.Wcs.Wcs
}
}
}
catch
{
}
}
/// <summary>
/// 提升机和接驳位信息同步
/// </summary>
private void HositerLogic()
{
try
{
var basePlcpoints = StaticData.BasePlcpointList.ToList();
var basePlcs = StaticData.basePlcs.ToList();
var bill = from a in basePlcpoints
@ -832,6 +819,11 @@ namespace Khd.Core.Wcs.Wcs
}
}
}
catch
{
}
}
}
}

6
src/Khd.Core.Wcs/appsettings.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"ConnectionStrings": {
//"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
//"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
//"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
// "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
},
@ -43,7 +43,7 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Error",
"Microsoft": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
}

Write Preview
Loading…
Cancel
Save