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,

53
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,21 +60,45 @@ 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 (StaticData.BigContainerCodes.Contains(rfid))
{
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == rfid);
if (mesBasePalletInfo != null)
{
MesBaseBarcodeInfo? mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.palletInfoCode == rfid).FirstOrDefault();
if (mesBaseBarcodeInfo != null)
{
mesBaseBarcodeInfo.palletInfoCode = 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)//入库,提升机任务是完成状态 if (wcsTask.taskStatus == 5)//入库,提升机任务是完成状态
{ {
@ -103,7 +127,8 @@ namespace Khd.Core.Wcs.Wcs
.Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();//深库位的托盘的物料等于当前任务的物料 .Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();//深库位的托盘的物料等于当前任务的物料
var bill = from a in mesBasePalletInfos 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 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 };//等于当前任务的物料的托盘的库位信息 select new { b };//等于当前任务的物料的托盘的库位信息
var outBill = from a in bill var outBill = from a in bill
from b in wmsBaseLocations from b in wmsBaseLocations
@ -113,7 +138,16 @@ namespace Khd.Core.Wcs.Wcs
&& b.locationStatus == "1" && b.locationStatus == "1"
&& string.IsNullOrEmpty(b.containerCode) && string.IsNullOrEmpty(b.containerCode)
select new { a, b };//在上面的基础上获取对应托盘的外侧库位的空库位信息 select new { a, b };//在上面的基础上获取对应托盘的外侧库位的空库位信息
if(mesBaseBarcodeInfo.completeFlag == "0")
{
outBill = outBill.OrderByDescending(t => t.b.locColumn).ToList();
wmsBaseLocations= wmsBaseLocations.OrderByDescending(t => t.locColumn).ToList();
}
else
{
outBill = outBill.OrderBy(t => t.b.locColumn).ToList();
wmsBaseLocations = wmsBaseLocations.OrderBy(t => t.locColumn).ToList();
}
WmsBaseLocation? wmsBaseLocation = null; WmsBaseLocation? wmsBaseLocation = null;
wmsBaseLocation ??= outBill.Where(t => !canNotIn.Contains(t.b.locationCode)).FirstOrDefault()?.b;//先找相同物料的外侧库位 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(t => t.locDeep == 1);//找不到再找深库位
@ -202,6 +236,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
if (ex is PlcException) if (ex is PlcException)

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