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

20240728

Browse Source
master
范 1 year ago
parent f33d9dfb2e
commit 17e48822e6
6 changed files with 161 additions and 120 deletions
Show Stats Download Patch File Download Diff File

2
src/Khd.Core.Domain/Models/MesBaseBarcodeInfo.cs
Unescape Escape View File

@ -17,6 +17,8 @@ namespace Khd.Core.Domain.Models
[Table("mes_base_barcode_info")] [Table("mes_base_barcode_info")]
public class MesBaseBarcodeInfo public class MesBaseBarcodeInfo
{ {
[Column("complete_flag")]
public string completeFlag { get; set; }
[Column("purchase_order_id")] [Column("purchase_order_id")]
public int? PurchaseOrderId { get; set; } public int? PurchaseOrderId { get; set; }
[Key] [Key]

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

@ -64,6 +64,7 @@ namespace Khd.Core.Wcs.Global
public static List<BasePlc> basePlcs = new List<BasePlc>(); public static List<BasePlc> basePlcs = new List<BasePlc>();
public static List<PlcConfig> PlcConfigs { get; set; } public static List<PlcConfig> PlcConfigs { get; set; }
public static int DeleteLogDay { get; internal set; } public static int DeleteLogDay { get; internal set; }
public static List<string> BigContainerCodes = new List<string>(){ "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004" };
public static Dictionary<int, Dictionary<string, PlcPoint>> PlcPoints = new Dictionary<int, Dictionary<string, PlcPoint>>(); public static Dictionary<int, Dictionary<string, PlcPoint>> PlcPoints = new Dictionary<int, Dictionary<string, PlcPoint>>();
public static Dictionary<int, Plc.S7.Plc> PlcDic = new Dictionary<int, Plc.S7.Plc>(); public static Dictionary<int, Plc.S7.Plc> PlcDic = new Dictionary<int, Plc.S7.Plc>();

3
src/Khd.Core.Wcs/Wcs/FirstFloor.cs
Unescape Escape View File

@ -272,7 +272,6 @@ namespace Khd.Core.Wcs.Wcs
/// </summary> /// </summary>
private void FirstFloorLine() private void FirstFloorLine()
{ {
List<string> BigContainerCodes = new() { "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004" };
List<int?> Outtpyes = new() { 2, 4, 8, 6 }; List<int?> Outtpyes = new() { 2, 4, 8, 6 };
using var scope = _host.Services.CreateScope(); using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>(); using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
@ -304,7 +303,7 @@ namespace Khd.Core.Wcs.Wcs
if (task == null) if (task == null)
{ {
if (BigContainerCodes.Contains(RFID001Value)) if (StaticData.BigContainerCodes.Contains(RFID001Value))
{ {
var newTask = new WcsTask() var newTask = new WcsTask()
{ {

2
src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
Unescape Escape View File

@ -716,7 +716,7 @@ namespace Khd.Core.Wcs.Wcs
materialId = mesBasePalletInfo.materialId, materialId = mesBasePalletInfo.materialId,
qualityStatus = "0", qualityStatus = "0",
rawStockId = StaticData.SnowId.NextId(), rawStockId = StaticData.SnowId.NextId(),
completeFlag = item.fromFloorNo==4?"0":"1", completeFlag = mesBaseBarcodeInfo.completeFlag,
instockBatch = mesBaseBarcodeInfo.barcodeInfo, instockBatch = mesBaseBarcodeInfo.barcodeInfo,
updateBy = "WCS", updateBy = "WCS",
updateDate = DateTime.Now, updateDate = DateTime.Now,

261
src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
Unescape Escape View File

@ -8,6 +8,7 @@ using Masuit.Tools;
using Masuit.Tools.Logging; using Masuit.Tools.Logging;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System.Threading.Tasks;
using Z.EntityFramework.Plus; using Z.EntityFramework.Plus;
namespace Khd.Core.Wcs.Wcs namespace Khd.Core.Wcs.Wcs
@ -47,7 +48,6 @@ namespace Khd.Core.Wcs.Wcs
public void MonitorInLocatorPoint() public void MonitorInLocatorPoint()
{ {
List<string> BigContainerCodes = new() { "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004" };
List<int?> ITypes = new() { 1, 3, 5, 7 }; List<int?> ITypes = new() { 1, 3, 5, 7 };
using var scope = _host.Services.CreateScope(); using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>(); using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
@ -60,143 +60,178 @@ namespace Khd.Core.Wcs.Wcs
//入库任务 //入库任务
var rfid = StaticData.PlcDic[0].ReadRFID(LineRFID.plcpointAddress); var rfid = StaticData.PlcDic[0].ReadRFID(LineRFID.plcpointAddress);
var isSignal = StaticData.PlcDic[0].Read(LineSignal.plcpointAddress); var isSignal = StaticData.PlcDic[0].Read(LineSignal.plcpointAddress);
BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.equipType == 1 && t.floorNo == FloorNo);
if (rfid != null && isSignal != null) if (rfid != null && isSignal != null)
{ {
if (BigContainerCodes.Contains(rfid))
{
Thread.Sleep(1000);
continue;
}
//正常读到输送线信息 有到位信号,并且有托盘,获取条码信息 //正常读到输送线信息 有到位信号,并且有托盘,获取条码信息
if (Convert.ToInt32(isSignal) == 1)//五楼接驳位 if (Convert.ToInt32(isSignal) == 1)//五楼接驳位
{ {
//获取条码信息 //获取条码信息
BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.equipType == 1 && t.floorNo == FloorNo);
var wcsTask = dbContext.WcsTask.OrderBy(t => t.createTime) var wcsTask = dbContext.WcsTask.OrderBy(t => t.createTime)
.FirstOrDefault(t => t.containerNo == rfid && t.nextPointId == baseEquip.objid); .FirstOrDefault(t => t.containerNo == rfid && t.nextPointId == baseEquip.objid);
if (wcsTask != null) if (wcsTask != null)
{ {
if (wcsTask.taskStatus == 5)//入库,提升机任务是完成状态 if (StaticData.BigContainerCodes.Contains(rfid))
{ {
var wmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseFloor == FloorNo) MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == rfid);
.Where(t => t.activeFlag == "1") if (mesBasePalletInfo != null)
.Where(t => t.delFlag == "0")
.Where(t => t.locationScrapType == "1")
.Where(t => t.warehouseId == 511)
.Where(t => t.locationStatus == "1")
.ToList();
if (wmsBaseLocations.Count > 0)
{ {
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault(); MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
if (mesBasePalletInfo != null) if (mesBaseBarcodeInfo != null)
{ {
MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == mesBasePalletInfo.materialBarcode); mesBaseBarcodeInfo.palletInfoCode = null;
if (mesBaseBarcodeInfo != null) dbContext.Update(mesBaseBarcodeInfo);
}
mesBasePalletInfo.bindAmount = null;
mesBasePalletInfo.bindAmount = null;
mesBasePalletInfo.materialBarcode = null;
mesBasePalletInfo.materialCode = null;
mesBasePalletInfo.materialId = null;
mesBasePalletInfo.materialName = null;
mesBasePalletInfo.updateBy = "WCS";
mesBasePalletInfo.updateTime = DateTime.Now;
dbContext.Update(mesBasePalletInfo);
dbContext.Remove(wcsTask);
dbContext.WcsTaskLog.Where(t => t.objid == wcsTask.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
dbContext.SaveChanges();
}
continue;
}
else
{
if (wcsTask.taskStatus == 5)//入库,提升机任务是完成状态
{
var wmsBaseLocations = dbContext.WmsBaseLocation.Where(t => t.warehouseFloor == FloorNo)
.Where(t => t.activeFlag == "1")
.Where(t => t.delFlag == "0")
.Where(t => t.locationScrapType == "1")
.Where(t => t.warehouseId == 511)
.Where(t => t.locationStatus == "1")
.ToList();
if (wmsBaseLocations.Count > 0)
{
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
if (mesBasePalletInfo != null)
{ {
List<string> containerCodes = wmsBaseLocations MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == mesBasePalletInfo.materialBarcode);
.Where(t => t.locDeep == 1) if (mesBaseBarcodeInfo != null)
.Select(t => t.containerCode).ToList();//深库位的托盘
containerCodes.RemoveAll(t => string.IsNullOrEmpty(t));
List<MesBaseBarcodeInfo> mesBasePalletInfos = dbContext.MesBaseBarcodeInfo
.Where(t => t.materialId == wcsTask.materialId)
.Where(t => t.saleOrderId == mesBaseBarcodeInfo.saleOrderId)
.Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();//深库位的托盘的物料等于当前任务的物料
var bill = from a in mesBasePalletInfos
join b in wmsBaseLocations.Where(t => t.locDeep == 1 && wcsTask.fromFloorNo == 4 ? t.returnFlag == "1" : t.returnFlag == "0") on a.palletInfoCode equals b.containerCode
select new { b };//等于当前任务的物料的托盘的库位信息
var outBill = from a in bill
from b in wmsBaseLocations
where b.locDeep == 2
&& b.locRow == (a.b.locRow % 2 == 0 ? a.b.locRow - 1 : a.b.locRow + 1)
&& a.b.locColumn == b.locColumn
&& b.locationStatus == "1"
&& string.IsNullOrEmpty(b.containerCode)
select new { a, b };//在上面的基础上获取对应托盘的外侧库位的空库位信息
WmsBaseLocation? wmsBaseLocation = null;
wmsBaseLocation ??= outBill.Where(t => !canNotIn.Contains(t.b.locationCode)).FirstOrDefault()?.b;//先找相同物料的外侧库位
wmsBaseLocation ??= wmsBaseLocations.Where(t => !canNotIn.Contains(t.locationCode)).Where(t => string.IsNullOrEmpty(t.containerCode)).FirstOrDefault(t => t.locDeep == 1);//找不到再找深库位
wmsBaseLocation ??= wmsBaseLocations.Where(t => !canNotIn.Contains(t.locationCode)).Where(t => string.IsNullOrEmpty(t.containerCode)).FirstOrDefault();//找不到再找任意库位
//深浅库位问题？库位入库优先级等
var AgvEquip = StaticData.BaseEquip.First(t => t.objid == 28);//5楼叉车
if (wmsBaseLocations.Count > 0 && wmsBaseLocation != null)
{ {
if (wmsBaseLocation.locDeep == 1) List<string> containerCodes = wmsBaseLocations
.Where(t => t.locDeep == 1)
.Select(t => t.containerCode).ToList();//深库位的托盘
containerCodes.RemoveAll(t => string.IsNullOrEmpty(t));
List<MesBaseBarcodeInfo> mesBasePalletInfos = dbContext.MesBaseBarcodeInfo
.Where(t => t.materialId == wcsTask.materialId)
.Where(t => t.saleOrderId == mesBaseBarcodeInfo.saleOrderId)
.Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();//深库位的托盘的物料等于当前任务的物料
var bill = from a in mesBasePalletInfos
join b in wmsBaseLocations
.Where(t => t.locDeep == 1 && mesBaseBarcodeInfo.completeFlag == "0" ? t.returnFlag == "1" : t.returnFlag == "0") on a.palletInfoCode equals b.containerCode
select new { b };//等于当前任务的物料的托盘的库位信息
var outBill = from a in bill
from b in wmsBaseLocations
where b.locDeep == 2
&& b.locRow == (a.b.locRow % 2 == 0 ? a.b.locRow - 1 : a.b.locRow + 1)
&& a.b.locColumn == b.locColumn
&& b.locationStatus == "1"
&& string.IsNullOrEmpty(b.containerCode)
select new { a, b };//在上面的基础上获取对应托盘的外侧库位的空库位信息
if(mesBaseBarcodeInfo.completeFlag == "0")
{ {
bool hasLocation = wmsBaseLocations outBill = outBill.OrderByDescending(t => t.b.locColumn).ToList();
.Where(t => t.locRow == (wmsBaseLocation.locRow % 2 == 1 ? (wmsBaseLocation.locRow + 1) : (wmsBaseLocation.locRow - 1))) wmsBaseLocations= wmsBaseLocations.OrderByDescending(t => t.locColumn).ToList();
.Where(t => t.locColumn == wmsBaseLocation.locColumn)
.Any();
if (!hasLocation)
{
canNotIn.Add(wmsBaseLocation.locationCode);
Console.WriteLine(DateTime.Now + $":目标库位{canNotIn.Join(",")}的浅库位库位状态异常，无法入库");
_logger.Info($"目标库位{canNotIn.Join(",")}的浅库位库位状态异常，无法入库");
continue;
}
}
WcsTask newTask = CoreMapper.Map<WcsTask>(wcsTask);
newTask.taskStatus = 0;//创建状态
newTask.updateTime = DateTime.Now;
newTask.currPointId = baseEquip.objid;
newTask.currPointNo = baseEquip.equipNo;
newTask.nextPointId = AgvEquip.objid;
newTask.nextPointNo = AgvEquip.equipNo;
newTask.endPointId = wmsBaseLocation.locationId;
newTask.endPointNo = wmsBaseLocation.locationCode;
newTask.objid = StaticData.SnowId.NextId();
newTask.createTime = DateTime.Now;
newTask.taskType = 47;
if (newTask.fromFloorNo != 1)//如果不是一楼来的，需要通过接口确认入库（质检通过后，点击继续入库）
{
newTask.useFlag = 0;
} }
else else
{ {
newTask.useFlag = 1; outBill = outBill.OrderBy(t => t.b.locColumn).ToList();
wmsBaseLocations = wmsBaseLocations.OrderBy(t => t.locColumn).ToList();
} }
wmsBaseLocation.locationStatus = "2"; WmsBaseLocation? wmsBaseLocation = null;
dbContext.Update(wmsBaseLocation); wmsBaseLocation ??= outBill.Where(t => !canNotIn.Contains(t.b.locationCode)).FirstOrDefault()?.b;//先找相同物料的外侧库位
dbContext.Remove(wcsTask); wmsBaseLocation ??= wmsBaseLocations.Where(t => !canNotIn.Contains(t.locationCode)).Where(t => string.IsNullOrEmpty(t.containerCode)).FirstOrDefault(t => t.locDeep == 1);//找不到再找深库位
wmsBaseLocation ??= wmsBaseLocations.Where(t => !canNotIn.Contains(t.locationCode)).Where(t => string.IsNullOrEmpty(t.containerCode)).FirstOrDefault();//找不到再找任意库位
//深浅库位问题？库位入库优先级等
dbContext.Add(newTask); var AgvEquip = StaticData.BaseEquip.First(t => t.objid == 28);//5楼叉车
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); if (wmsBaseLocations.Count > 0 && wmsBaseLocation != null)
dbContext.Add(wcsTaskLog); {
dbContext.SaveChanges(); if (wmsBaseLocation.locDeep == 1)
canNotIn.Clear(); {
} bool hasLocation = wmsBaseLocations
else .Where(t => t.locRow == (wmsBaseLocation.locRow % 2 == 1 ? (wmsBaseLocation.locRow + 1) : (wmsBaseLocation.locRow - 1)))
{ .Where(t => t.locColumn == wmsBaseLocation.locColumn)
Console.WriteLine(DateTime.Now + ":五楼接驳位调度入库任务,未找到库位"); .Any();
_logger.Info("五楼接驳位调度入库任务,未找到库位"); if (!hasLocation)
{
canNotIn.Add(wmsBaseLocation.locationCode);
Console.WriteLine(DateTime.Now + $":目标库位{canNotIn.Join(",")}的浅库位库位状态异常，无法入库");
_logger.Info($"目标库位{canNotIn.Join(",")}的浅库位库位状态异常，无法入库");
continue;
}
}
WcsTask newTask = CoreMapper.Map<WcsTask>(wcsTask);
newTask.taskStatus = 0;//创建状态
newTask.updateTime = DateTime.Now;
newTask.currPointId = baseEquip.objid;
newTask.currPointNo = baseEquip.equipNo;
newTask.nextPointId = AgvEquip.objid;
newTask.nextPointNo = AgvEquip.equipNo;
newTask.endPointId = wmsBaseLocation.locationId;
newTask.endPointNo = wmsBaseLocation.locationCode;
newTask.objid = StaticData.SnowId.NextId();
newTask.createTime = DateTime.Now;
newTask.taskType = 47;
if (newTask.fromFloorNo != 1)//如果不是一楼来的，需要通过接口确认入库（质检通过后，点击继续入库）
{
newTask.useFlag = 0;
}
else
{
newTask.useFlag = 1;
}
wmsBaseLocation.locationStatus = "2";
dbContext.Update(wmsBaseLocation);
dbContext.Remove(wcsTask);
dbContext.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
dbContext.Add(wcsTaskLog);
dbContext.SaveChanges();
canNotIn.Clear();
}
else
{
Console.WriteLine(DateTime.Now + ":五楼接驳位调度入库任务,未找到库位");
_logger.Info("五楼接驳位调度入库任务,未找到库位");
}
} }
} }
} }
}
} }
else if (wcsTask.taskStatus == 6) //出库任务,小车任务是完成状态 else if (wcsTask.taskStatus == 6) //出库任务,小车任务是完成状态
{ {
BaseEquip nextEquip = StaticData.BaseEquip.First(t => t.equipType == 2);//提升机 BaseEquip nextEquip = StaticData.BaseEquip.First(t => t.equipType == 2);//提升机
dbContext.Remove(wcsTask); dbContext.Remove(wcsTask);
WcsTask newTask = CoreMapper.Map<WcsTask>(wcsTask); WcsTask newTask = CoreMapper.Map<WcsTask>(wcsTask);
newTask.objid = StaticData.SnowId.NextId(); newTask.objid = StaticData.SnowId.NextId();
newTask.serialNo = SystemData.GetSerialNo(dbContext); newTask.serialNo = SystemData.GetSerialNo(dbContext);
newTask.nextPointId = nextEquip.objid; newTask.nextPointId = nextEquip.objid;
newTask.nextPointNo = nextEquip.equipNo; newTask.nextPointNo = nextEquip.equipNo;
newTask.currPointId = baseEquip.objid; newTask.currPointId = baseEquip.objid;
newTask.currPointNo = baseEquip.equipNo; newTask.currPointNo = baseEquip.equipNo;
newTask.fromFloorNo = FloorNo; newTask.fromFloorNo = FloorNo;
newTask.taskType = 6;//成品出库 newTask.taskType = 6;//成品出库
newTask.floorNo = 1;//出库楼层 newTask.floorNo = 1;//出库楼层
newTask.taskStatus = 0; newTask.taskStatus = 0;
newTask.createTime = DateTime.Now; newTask.createTime = DateTime.Now;
dbContext.Add(newTask); dbContext.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
dbContext.WcsTaskLog.Add(wcsTaskLog); dbContext.WcsTaskLog.Add(wcsTaskLog);
dbContext.SaveChanges(); dbContext.SaveChanges();
}
} }
} }
} }

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

@ -55,7 +55,7 @@ namespace Khd.Core.Wcs.Wcs
if (Convert.ToInt32(isSignal) == 1)//托盘到位 if (Convert.ToInt32(isSignal) == 1)//托盘到位
{ {
WcsTask? wcsTask = dbContext.WcsTask.Where(t => t.nextPointId == 4).FirstOrDefault(); WcsTask? wcsTask = dbContext.WcsTask.Where(t => t.nextPointId == 4).FirstOrDefault();
if(wcsTask!= null) if (wcsTask != null)
{ {
if (wcsTask.taskStatus == 5)//提升机上来的 if (wcsTask.taskStatus == 5)//提升机上来的
{ {
@ -65,9 +65,9 @@ namespace Khd.Core.Wcs.Wcs
} }
else else
{ {
bool hasTask = dbContext.WcsTask.Where(t => t.currPointId == 4).Any(); bool hasTask = dbContext.WcsTask.Where(t => t.currPointId == 4 || (t.endPointId == 4 && t.taskStatus > 0)).Any();
BaseEquip lineEquip = StaticData.BaseEquip.First(t => t.objid == 4); BaseEquip lineEquip = StaticData.BaseEquip.First(t => t.objid == 4);
BaseEquip nextEquip = StaticData.BaseEquip.First(t=>t.objid==6); BaseEquip nextEquip = StaticData.BaseEquip.First(t => t.objid == 6);
if (!hasTask) if (!hasTask)
{ {
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault(); MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
@ -79,6 +79,10 @@ namespace Khd.Core.Wcs.Wcs
var TargetFloor = dbContext.WmsBaseWarehouse.Where(t => t.warehouseId == warehouseId).FirstOrDefault(); var TargetFloor = dbContext.WmsBaseWarehouse.Where(t => t.warehouseId == warehouseId).FirstOrDefault();
if (TargetFloor != null) if (TargetFloor != null)
{ {
if (TargetFloor.warehouseFloor == Floor)
{
continue;
}
var dic = StaticData.BaseDictionary.Where(t => t.dicKey == "TaskType" && t.agvType == "I" && t.dicField == TargetFloor.warehouseInstockType).FirstOrDefault(); var dic = StaticData.BaseDictionary.Where(t => t.dicKey == "TaskType" && t.agvType == "I" && t.dicField == TargetFloor.warehouseInstockType).FirstOrDefault();
if (dic != null) if (dic != null)
{ {

Write Preview
Loading…
Cancel
Save