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

20240727

Browse Source
master
范 2 years ago
parent e7ec40a522
commit df44a56389
5 changed files with 144 additions and 95 deletions
Show Stats Download Patch File Download Diff File

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

@ -60,6 +60,7 @@ namespace Khd.Core.Wcs
StaticData.PlcDic.TryAdd(plcConfig.Code, plc); StaticData.PlcDic.TryAdd(plcConfig.Code, plc);
} }
} }
//创建定时器
SystemTimer systemTimer = new SystemTimer(_host); SystemTimer systemTimer = new SystemTimer(_host);
systemTimer.Start(); systemTimer.Start();
//创建任务 //创建任务

90
src/Khd.Core.Wcs/Wcs/FourthFloorPoint.cs
Unescape Escape View File

@ -1,6 +1,7 @@
using Khd.Core.Domain.Models; using Khd.Core.Domain.Models;
using Khd.Core.EntityFramework; using Khd.Core.EntityFramework;
using Khd.Core.Library; using Khd.Core.Library;
using Khd.Core.Library.Mapper;
using Khd.Core.Plc.S7; using Khd.Core.Plc.S7;
using Khd.Core.Wcs.Global; using Khd.Core.Wcs.Global;
using Masuit.Tools.Logging; using Masuit.Tools.Logging;
@ -51,70 +52,71 @@ namespace Khd.Core.Wcs.Wcs
var isSignal = StaticData.PlcDic[0].Read(LineSignal.plcpointAddress); var isSignal = StaticData.PlcDic[0].Read(LineSignal.plcpointAddress);
if (rfid != null && isSignal != null) if (rfid != null && isSignal != null)
{ {
if (Convert.ToInt32(isSignal) == 1)//托盘到位 if (Convert.ToInt32(isSignal) == 1)//托盘到位
{ {
BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.floorNo == 5 && t.equipType == 1); WcsTask? wcsTask = dbContext.WcsTask.Where(t => t.nextPointId == 4).FirstOrDefault();
var wcsTask = dbContext.WcsTask.FirstOrDefault(t => t.containerNo == rfid && t.nextPointId == baseEquip.objid); if(wcsTask!= null)
if (wcsTask != null)//如果不是null
{ {
int? floor = 0; if (wcsTask.taskStatus == 5)//提升机上来的
var wmsProductOutstock = dbContext.WmsProductOutstock.FirstOrDefault(t => t.saleOrderId == wcsTask.orderId);
if (wmsProductOutstock != null)
{ {
var endEquip = StaticData.BaseEquip.FirstOrDefault(t => t.equipNo == wmsProductOutstock.endStationCode); dbContext.Remove(wcsTask);
if (endEquip != null) dbContext.SaveChanges();
{
floor = endEquip.floorNo;
} }
} }
else else
{ {
var wmsRawOutstock = dbContext.WmsRawOutstock.FirstOrDefault(t => t.rawOutstockId == wcsTask.orderId); bool hasTask = dbContext.WcsTask.Where(t => t.currPointId == 4).Any();
if (wmsRawOutstock != null) BaseEquip lineEquip = StaticData.BaseEquip.First(t => t.objid == 4);
BaseEquip nextEquip = StaticData.BaseEquip.First(t=>t.objid==6);
if (!hasTask)
{ {
var endEquip = StaticData.BaseEquip.FirstOrDefault(t => t.equipNo == wmsRawOutstock.endStationCode); MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
if (endEquip != null) if (mesBasePalletInfo != null)
{ {
floor = endEquip.floorNo; var warehouseId = dbContext.WmsWarehouseMaterial.Where(t => t.storageType == "1" && t.storageId == mesBasePalletInfo.materialId).FirstOrDefault()?.warehouseId;
} if (warehouseId != null)
}
}
if (floor == 0)
{ {
Console.WriteLine($"{DateTime.Now}:4楼接驳位未找到目的地楼层"); var TargetFloor = dbContext.WmsBaseWarehouse.Where(t => t.warehouseId == warehouseId).FirstOrDefault();
_logger.Info("4楼接驳位未找到目的地楼层"); if (TargetFloor != null)
Thread.Sleep(1000);
continue;
}
BaseEquip nextEquip = StaticData.BaseEquip.First(t => t.equipType == 2);//提升机
wcsTask.nextPointId = nextEquip.objid;
wcsTask.nextPointNo = nextEquip.equipNo;
wcsTask.currPointId = baseEquip.objid;
wcsTask.currPointNo = baseEquip.equipNo;
wcsTask.fromFloorNo = 4;
wcsTask.taskType = 6;//成品出库
wcsTask.floorNo = floor;//出库到一楼
wcsTask.taskStatus = 0;
wcsTask.updateTime = DateTime.Now;
dbContext.Update(wcsTask);
dbContext.WcsTaskLog.Where(t => t.objid == wcsTask.objid)
.Update(t => new WcsTaskLog
{ {
var dic = StaticData.BaseDictionary.Where(t => t.dicKey == "TaskType" && t.agvType == "I" && t.dicField == TargetFloor.warehouseInstockType).FirstOrDefault();
if (dic != null)
{
var newTask = new WcsTask()
{
objid = StaticData.SnowId.NextId(),
serialNo = SystemData.GetSerialNo(dbContext),
taskType = Convert.ToInt32(dic.dicValue),
taskStatus = 0,
containerNo = rfid,
materialBarcode = mesBasePalletInfo.materialBarcode,
materialId = mesBasePalletInfo.materialId,
qty = Convert.ToInt32(mesBasePalletInfo.bindAmount),
currPointId = lineEquip.objid,
currPointNo = lineEquip.equipNo,
nextPointId = nextEquip.objid, nextPointId = nextEquip.objid,
nextPointNo = nextEquip.equipNo, nextPointNo = nextEquip.equipNo,
currPointId = baseEquip.objid, endPointId = warehouseId,
currPointNo = baseEquip.equipNo,
fromFloorNo = 4, fromFloorNo = 4,
floorNo = floor, floorNo = TargetFloor.warehouseFloor,
taskStatus = 0, useFlag = 1,
updateTime = DateTime.Now, createBy = "一楼接驳位",
}); createTime = DateTime.Now,
remark = "一楼创建入库任务"
};
dbContext.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
dbContext.Add(wcsTaskLog);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
} }
} }
}
}
}
}
}
catch (Exception ex) catch (Exception ex)
{ {
if (ex is PlcException) if (ex is PlcException)

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

@ -63,9 +63,50 @@ namespace Khd.Core.Wcs.Wcs
IsBackground = true IsBackground = true
}; };
deleteTaskThread.Start(); deleteTaskThread.Start();
var deleteLogsThread = new Thread(DeleteLogsLogic)
{
Name = "DeleteLogsThread",
IsBackground = true
};
deleteLogsThread.Start();
Console.WriteLine($"{DateTime.Now}: SystemTimer started"); Console.WriteLine($"{DateTime.Now}: SystemTimer started");
} }
private void DeleteLogsLogic(object? obj)
{
while (true)
{
try
{
//获取当前程序运行目录下的logs文件夹
string logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logs");
string[] strings = Directory.GetDirectories(logPath);
foreach (string s in strings)
{
string? dirName = Path.GetFileName(s);
if (dirName != null)
{
if (DateTime.TryParse(dirName, out DateTime dt))
{
if (dt < DateTime.Now.AddDays(-5))
{
Directory.Delete(s, true);
_logger.Info($"日志{dirName}已删除");
}
}
}
}
}
catch
{
}
Thread.Sleep(1000 * 60 * 60 * 23);
}
}
private void DeleteTaskLogic(object? obj) private void DeleteTaskLogic(object? obj)
{ {
using var scope = host.Services.CreateScope(); using var scope = host.Services.CreateScope();

8
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -2323,11 +2323,9 @@ namespace Khd.Core.Wpf.Form
{ {
if (item.Value.IP == ex.Message) if (item.Value.IP == ex.Message)
{ {
MessageBox.Show("PLC断开连接，正在重连!");
SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Slot, item.Value.Rack); SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Slot, item.Value.Rack);
SystemData.PlcDic[item.Key].Open(); SystemData.PlcDic[item.Key].Open();
BasePlcpoint basePlcpoint = SystemData.BasePlcpoints.First(t => t.plcpointNo == "canReceive");
SystemData.PlcDic[1].WriteToPoint(basePlcpoint.plcpointAddress, "1", basePlcpoint.plcpointLength.ToString());
MessageBox.Show("一键收料发送成功");
break; break;
} }
} }
@ -2399,6 +2397,7 @@ namespace Khd.Core.Wpf.Form
{ {
if (item.Value.IP == ex.Message) if (item.Value.IP == ex.Message)
{ {
MessageBox.Show("PLC断开连接，正在重连!");
SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot);
SystemData.PlcDic[item.Key].Open(); SystemData.PlcDic[item.Key].Open();
} }
@ -2439,6 +2438,7 @@ namespace Khd.Core.Wpf.Form
{ {
if (item.Value.IP == ex.Message) if (item.Value.IP == ex.Message)
{ {
MessageBox.Show("PLC断开连接，正在重连!");
SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot);
SystemData.PlcDic[item.Key].Open(); SystemData.PlcDic[item.Key].Open();
} }
@ -2485,6 +2485,7 @@ namespace Khd.Core.Wpf.Form
{ {
if (item.Value.IP == ex.Message) if (item.Value.IP == ex.Message)
{ {
MessageBox.Show("PLC断开连接，正在重连!");
SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot);
SystemData.PlcDic[item.Key].Open(); SystemData.PlcDic[item.Key].Open();
} }
@ -2526,6 +2527,7 @@ namespace Khd.Core.Wpf.Form
{ {
if (item.Value.IP == ex.Message) if (item.Value.IP == ex.Message)
{ {
MessageBox.Show("PLC断开连接，正在重连!");
SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot);
SystemData.PlcDic[item.Key].Open(); SystemData.PlcDic[item.Key].Open();
} }

35
src/Khd.Core.Wpf/TaskForm/AddTask.xaml.cs
Unescape Escape View File

@ -9,6 +9,7 @@ using Microsoft.Extensions.Hosting;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -73,21 +74,25 @@ namespace Khd.Core.Wpf.TaskForm
{ {
using var scope = _host.Services.CreateScope(); using var scope = _host.Services.CreateScope();
var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>(); var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
if (StartPoint.SelectedItem is EquipMessage startEquip && EndPoint.SelectedItem is EquipMessage endEquip && !string.IsNullOrEmpty(EmptyCount.SelectedItem?.ToString())) if (StartPoint.SelectedItem is EquipMessage startEquip && EndPoint.SelectedItem is EquipMessage endEquip)
{ {
if (startEquip.equipType == 1) if (startEquip.equipType == 1)
{
BasePlcpoint linesignal = SystemData.BasePlcpoints.First(t => t.plcpointNo == $"linesignal0{startEquip.floorNo}");
var linesignalValue = SystemData.PlcDic[0].Read(linesignal.plcpointAddress);
if (linesignalValue != null && Convert.ToInt32(linesignalValue) == 1)
{ {
BasePlcpoint basePlcpoint = SystemData.BasePlcpoints.First(t => t.plcpointNo == $"RFID00{startEquip.floorNo}"); BasePlcpoint basePlcpoint = SystemData.BasePlcpoints.First(t => t.plcpointNo == $"RFID00{startEquip.floorNo}");
string? rfid = SystemData.PlcDic[0].ReadRFID(basePlcpoint.plcpointAddress); string? rfid = SystemData.PlcDic[0].ReadRFID(basePlcpoint.plcpointAddress);
if (!string.IsNullOrEmpty(rfid))
{
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault(); MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
if (mesBasePalletInfo != null)
{
WcsTask? task = dbContext.WcsTask.FirstOrDefault(t => t.containerNo == rfid); WcsTask? task = dbContext.WcsTask.FirstOrDefault(t => t.containerNo == rfid);
if (task == null) if (task == null)
{ {
int qty = 1;
if (int.TryParse(EmptyCount.SelectedIndex.ToString(), out int emptyCount))
{
qty = emptyCount + 1;
}
BaseEquip baseEquip = baseEquips.First(t => t.equipType == 2);//提升机 BaseEquip baseEquip = baseEquips.First(t => t.equipType == 2);//提升机
WcsTask wcsTask = new() WcsTask wcsTask = new()
{ {
@ -101,14 +106,14 @@ namespace Khd.Core.Wpf.TaskForm
endPointNo = endEquip.equipNo, endPointNo = endEquip.equipNo,
fromFloorNo = startEquip.floorNo, fromFloorNo = startEquip.floorNo,
floorNo = endEquip.floorNo, floorNo = endEquip.floorNo,
materialBarcode = mesBasePalletInfo.materialBarcode, materialBarcode = mesBasePalletInfo?.materialBarcode,
materialId = mesBasePalletInfo.materialId, materialId = mesBasePalletInfo?.materialId,
taskStatus = 0, taskStatus = 0,
createBy = "人工", createBy = "人工",
createTime = DateTime.Now, createTime = DateTime.Now,
equipmentNo = startEquip.equipNo, equipmentNo = startEquip.equipNo,
useFlag = 0, useFlag = 0,
qty = Convert.ToInt32(EmptyCount.SelectedIndex)+1, qty = qty,
isEmpty = "1" isEmpty = "1"
}; };
dbContext.Add(wcsTask); dbContext.Add(wcsTask);
@ -123,12 +128,7 @@ namespace Khd.Core.Wpf.TaskForm
} }
else else
{ {
MessageBox.Show("未找到该托盘信息！"); MessageBox.Show("未检测到起始地楼层的到位信号");
}
}
else
{
MessageBox.Show("未读取到RFID");
} }
} }
this.Close(); this.Close();
@ -143,10 +143,13 @@ namespace Khd.Core.Wpf.TaskForm
if (ex is PlcException) if (ex is PlcException)
{ {
try try
{
MessageBox.Show("PLC断开连接，正在重连");
Task.Run(() =>
{ {
SystemData.PlcDic[0] = new Plc.S7.Plc(SystemData.PlcDic[0].CPU, SystemData.PlcDic[0].IP, SystemData.PlcDic[0].Port, SystemData.PlcDic[0].Rack, SystemData.PlcDic[0].Slot); SystemData.PlcDic[0] = new Plc.S7.Plc(SystemData.PlcDic[0].CPU, SystemData.PlcDic[0].IP, SystemData.PlcDic[0].Port, SystemData.PlcDic[0].Rack, SystemData.PlcDic[0].Slot);
SystemData.PlcDic[0].Open(); SystemData.PlcDic[0].Open();
AddTaskBtn_Click(AddTaskBtn, null); });
} }
catch catch
{ {

Write Preview
Loading…
Cancel
Save