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

任务类型

Browse Source
master
范 2 years ago
parent a06110d26b
commit a04d29f9ca
11 changed files with 996 additions and 861 deletions
Show Stats Download Patch File Download Diff File

156
src/Khd.Core.Wcs/Global/StaticTaskType.cs
Unescape Escape View File

@ -0,0 +1,156 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Khd.Core.Wcs.Global
{
public class StaticTaskType
{
/// <summary>
/// 二楼输送线到小包入口
/// </summary>
public const int SecondLineToSmallPackage = 51;
/// <summary>
/// 二楼废料工位到周转位
/// </summary>
public const int SecondWasteToTransit = 56;
/// <summary>
/// 二楼小包出口到库位
/// </summary>
public const int SecondSmallPackageToStorage = 49;
/// <summary>
/// 二楼周转位到提升机
/// </summary>
public const int SecondTransitToLift = 57;
/// <summary>
/// 二楼库位到提升机
/// </summary>
public const int SecondStorageToLift = 50;
/// <summary>
/// 二楼移库
/// </summary>
public const int SecondRemove = 55;
/// <summary>
/// 二楼提升机到废料工位
/// </summary>
public const int SecondLiftToWaste = 53;
/// <summary>
/// 二楼周转位到废料工位
/// </summary>
public const int SecondTransitToWaste = 54;
/// <summary>
/// 二楼提升机到周转位
/// </summary>
public const int SecondLiftToTransit = 58;
/// <summary>
/// 二楼周转位到小包入口
/// </summary>
public const int SecondTransitToSmallPackage = 59;
/// <summary>
/// 三楼移库
/// </summary>
public const int ThirdRemove = 67;
/// <summary>
/// 三楼原材料入库
/// </summary>
public const int ThirdRawIn = 39;
/// <summary>
/// 三楼原材料到翻转机
/// </summary>
public const int ThirdRawToFlip = 41;
/// <summary>
/// 三楼周转区到托盘收集架
/// </summary>
public const int ThirdTransitToBin = 40;
/// <summary>
/// 三楼翻转机到托盘收集架
/// </summary>
public const int ThirdFlipToBin = 42;
/// <summary>
/// 三楼托盘收集架到周转区
/// </summary>
public const int ThirdBinToTransit = 43;
/// <summary>
/// 三楼周转区到提升机
/// </summary>
public const int ThirdTransitToLift = 44;
/// <summary>
/// 五楼原材料入库
/// </summary>
public const int FiveRawIn = 47;
/// <summary>
/// 五楼原材料到拆分
/// </summary>
public const int FiveRawToSplit = 46;
/// <summary>
/// 五楼原材料拆分返库
/// </summary>
public const int FiveRawSplitReturn = 28;
/// <summary>
/// 五楼移库
/// </summary>
public const int FiveRemove = 66;
/// <summary>
/// 五楼原材料到背板安装
/// </summary>
public const int FiveRawToBack = 33;
/// <summary>
/// 五楼半成品入库
/// </summary>
public const int FiveHalfIn = 34;
/// <summary>
/// 五楼成品出库库
/// </summary>
public const int FiveProductOut = 38;
/// <summary>
/// 五楼辅料入库
/// </summary>
public const int FiveAccessoryIn = 29;
/// <summary>
/// 五楼辅料出库
/// </summary>
public const int FiveAccessoryOut = 30;
/// <summary>
/// 五楼辅料盘库
/// </summary>
public const int FiveAccessoryStorage = 100;
/// <summary>
/// 三楼接驳位转运空托盘到二楼
/// </summary>
public const int ThirdTransitToSecond = 101;
/// <summary>
/// 五楼辅料移库
/// </summary>
public const int FiveAccessoryRemove = 102;
}
}

36
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

@ -193,7 +193,7 @@ namespace Khd.Core.Wcs.Wcs
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
isEmpty = "0", isEmpty = "0",
taskType = agvEquip.objid == 28 ? 66 : 55, taskType = agvEquip.objid == 28 ? StaticTaskType.FiveRemove : StaticTaskType.SecondRemove,
qty = 1, qty = 1,
}; };
fromLocationCode.locationStatus = "4"; fromLocationCode.locationStatus = "4";
@ -307,7 +307,7 @@ namespace Khd.Core.Wcs.Wcs
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
isEmpty = "0", isEmpty = "0",
taskType = agvEquip.objid == 28 ? 66 : 67, taskType = agvEquip.objid == 28 ? StaticTaskType.FiveRemove : StaticTaskType.ThirdRemove,
qty = 1, qty = 1,
}; };
fromLocationCode.locationStatus = "4"; fromLocationCode.locationStatus = "4";
@ -434,7 +434,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.materialId = mesBasePalletInfo.materialId; newTask.materialId = mesBasePalletInfo.materialId;
newTask.objid = StaticData.SnowId.NextId(); newTask.objid = StaticData.SnowId.NextId();
newTask.createTime = DateTime.Now; newTask.createTime = DateTime.Now;
newTask.taskType = 28; newTask.taskType = StaticTaskType.FiveRawSplitReturn;
newTask.useFlag = 1; newTask.useFlag = 1;
wmsBaseLocation.locationStatus = "2"; wmsBaseLocation.locationStatus = "2";
WmsRawInstockDetail wmsRawInstockDetail = new WmsRawInstockDetail WmsRawInstockDetail wmsRawInstockDetail = new WmsRawInstockDetail
@ -630,7 +630,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
serialNo = SystemData.GetSerialNo(dbContext), serialNo = SystemData.GetSerialNo(dbContext),
taskType = 43, taskType = StaticTaskType.ThirdBinToTransit,
nextPointId = agvEquip.objid, nextPointId = agvEquip.objid,
nextPointNo = agvEquip.equipNo, nextPointNo = agvEquip.equipNo,
endPointId = endEquip.objid, endPointId = endEquip.objid,
@ -668,7 +668,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
serialNo = SystemData.GetSerialNo(dbContext), serialNo = SystemData.GetSerialNo(dbContext),
taskType = 101, taskType = StaticTaskType.ThirdTransitToSecond,
nextPointId = agvEquip.objid, nextPointId = agvEquip.objid,
nextPointNo = agvEquip.equipNo, nextPointNo = agvEquip.equipNo,
currPointId = startEquip.objid, currPointId = startEquip.objid,
@ -700,7 +700,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
serialNo = SystemData.GetSerialNo(dbContext), serialNo = SystemData.GetSerialNo(dbContext),
taskType = 101, taskType = StaticTaskType.ThirdTransitToSecond,
nextPointId = agvEquip.objid, nextPointId = agvEquip.objid,
nextPointNo = agvEquip.equipNo, nextPointNo = agvEquip.equipNo,
currPointId = startEquip.objid, currPointId = startEquip.objid,
@ -842,7 +842,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
serialNo = SystemData.GetSerialNo(dbContext), serialNo = SystemData.GetSerialNo(dbContext),
taskType = 34, taskType = StaticTaskType.FiveHalfIn,
endPointId = wmsBaseLocation.locationId, endPointId = wmsBaseLocation.locationId,
endPointNo = wmsBaseLocation.locationCode, endPointNo = wmsBaseLocation.locationCode,
currPointId = endEquip.objid, currPointId = endEquip.objid,
@ -1041,7 +1041,7 @@ namespace Khd.Core.Wcs.Wcs
var RemoveTask = new WcsTask() var RemoveTask = new WcsTask()
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
taskType = 67, taskType = StaticTaskType.ThirdRemove,
containerNo = wmsRawStock1.palletInfoCode, containerNo = wmsRawStock1.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now.AddSeconds(-10), createTime = DateTime.Now.AddSeconds(-10),
@ -1120,7 +1120,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = wmsRawOutstock.rawOutstockId, orderId = wmsRawOutstock.rawOutstockId,
taskType = 41, taskType = StaticTaskType.ThirdRawToFlip,
containerNo = wmsRawStock.palletInfoCode, containerNo = wmsRawStock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
@ -1376,7 +1376,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.productOutstockId, orderId = item.productOutstockId,
taskType = 66, taskType = StaticTaskType.FiveRemove,
containerNo = wmsProductStock.palletInfoCode, containerNo = wmsProductStock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now.AddSeconds(-10), createTime = DateTime.Now.AddSeconds(-10),
@ -1446,7 +1446,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.productOutstockId, orderId = item.productOutstockId,
taskType = 38, taskType = StaticTaskType.FiveProductOut,
containerNo = stock.palletInfoCode, containerNo = stock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
@ -1627,7 +1627,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.productOutstockId, orderId = item.productOutstockId,
taskType = 55, taskType = StaticTaskType.SecondRemove,
containerNo = wmsBaseLocation.containerCode, containerNo = wmsBaseLocation.containerCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now.AddSeconds(-10), createTime = DateTime.Now.AddSeconds(-10),
@ -1679,7 +1679,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.productOutstockId, orderId = item.productOutstockId,
taskType = 50, taskType = StaticTaskType.SecondStorageToLift,
containerNo = stock.palletInfoCode, containerNo = stock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
@ -2067,7 +2067,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = wmsRawOutstock.rawOutstockId, orderId = wmsRawOutstock.rawOutstockId,
taskType = 30, taskType = StaticTaskType.FiveAccessoryOut,
containerNo = location.containerCode, containerNo = location.containerCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
@ -2277,7 +2277,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.rawOutstockId, orderId = item.rawOutstockId,
taskType = 66, taskType = StaticTaskType.FiveRemove,
containerNo = wmsRawStock.palletInfoCode, containerNo = wmsRawStock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now.AddSeconds(-10), createTime = DateTime.Now.AddSeconds(-10),
@ -2327,7 +2327,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.rawOutstockId, orderId = item.rawOutstockId,
taskType = endEquip.equipType == 12 ? 46 : 33,//如果是12那么就是原材料到柜体验收区,如果是13那么就是原材料到背板安装区 taskType = StaticTaskType.FiveRawToSplit,//如果是12那么就是原材料到柜体验收区,如果是13那么就是原材料到背板安装区
containerNo = location.containerCode, containerNo = location.containerCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,
@ -2467,7 +2467,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.rawOutstockId, orderId = item.rawOutstockId,
taskType = 66, taskType = StaticTaskType.FiveRemove,
containerNo = wmsRawStock.palletInfoCode, containerNo = wmsRawStock.palletInfoCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now.AddSeconds(-10), createTime = DateTime.Now.AddSeconds(-10),
@ -2522,7 +2522,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
objid = StaticData.SnowId.NextId(), objid = StaticData.SnowId.NextId(),
orderId = item.rawOutstockId, orderId = item.rawOutstockId,
taskType = endEquip.equipType == 12 ? 46 : 33,//如果是12那么就是原材料到柜体验收区,如果是13那么就是原材料到背板安装区 taskType = StaticTaskType.FiveRawToBack,//如果是12那么就是原材料到柜体验收区,如果是13那么就是原材料到背板安装区
containerNo = location.containerCode, containerNo = location.containerCode,
createBy = "WCS", createBy = "WCS",
createTime = DateTime.Now, createTime = DateTime.Now,

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

@ -46,7 +46,6 @@ namespace Khd.Core.Wcs.Wcs
{ {
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>();
List<int?> taskType = new() { 1, 3, 5, 7 };
BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.objid == agvID); BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.objid == agvID);
while (true) while (true)
{ {
@ -68,7 +67,7 @@ namespace Khd.Core.Wcs.Wcs
if (item.taskStatus == 0)//下发任务 if (item.taskStatus == 0)//下发任务
{ {
BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType); BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType);
if (item.taskType == 38)//出库任务 if (item.taskType == StaticTaskType.FiveProductOut)//出库任务
{ {
BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 5); BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 5);
if (lineEquip.equipStatus == 0) if (lineEquip.equipStatus == 0)
@ -127,7 +126,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else if (item.taskType == 33)//原材料到背板安装 else if (item.taskType == StaticTaskType.FiveRawToBack)//原材料到背板安装
{ {
BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == 30); BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == 30);
RequestAGVTaskDto agvTask = new() RequestAGVTaskDto agvTask = new()
@ -167,7 +166,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 34)//背板安装到半成品 else if (item.taskType == StaticTaskType.FiveHalfIn)//背板安装到半成品
{ {
BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 30); BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 30);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -207,7 +206,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 46)//原材料到拆分区 else if (item.taskType == StaticTaskType.FiveRawToSplit)//原材料到拆分区
{ {
BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 29); BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 29);
RequestAGVTaskDto agvTask = new() RequestAGVTaskDto agvTask = new()
@ -247,7 +246,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 28)//拆分区返库 else if (item.taskType == StaticTaskType.FiveRawSplitReturn)//拆分区返库
{ {
BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 29); BaseEquip currentEquip = StaticData.BaseEquip.First(t => t.objid == 29);
RequestAGVTaskDto agvTask = new() RequestAGVTaskDto agvTask = new()
@ -288,7 +287,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 47)//原材料入库 else if (item.taskType == StaticTaskType.FiveRawIn)//原材料入库
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == 5); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == 5);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -328,7 +327,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 66)//移库 else if (item.taskType == StaticTaskType.FiveRemove)//移库
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
{ {
@ -369,7 +368,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else else
{
{ {
if (item.taskStatus == 3) if (item.taskStatus == 3)
{ {
@ -413,7 +411,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else if (item.taskStatus == 5) else if (item.taskStatus == 5)
{ {
if (item.taskType == 66)//移库 if (item.taskType == StaticTaskType.FiveRemove)//移库
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -473,7 +471,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Error(ex.Message + "\n" + ex.StackTrace); _logger.Error(ex.Message + "\n" + ex.StackTrace);
} }
} }
else if (item.taskType == 38)//出库 else if (item.taskType == StaticTaskType.FiveProductOut)//出库
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -516,7 +514,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
} }
} }
else if (item.taskType == 33)//原材料到背板安装 else if (item.taskType == StaticTaskType.FiveRawToBack)//原材料到背板安装
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -548,7 +546,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 34)//半成品入库 else if (item.taskType == StaticTaskType.FiveHalfIn)//半成品入库
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -609,7 +607,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else if (item.taskType == 46)//原材料到柜体拆分 else if (item.taskType == StaticTaskType.FiveRawToSplit)//原材料到柜体拆分
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -641,7 +639,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 28)//柜体拆分到原材料 else if (item.taskType == StaticTaskType.FiveRawSplitReturn)//柜体拆分到原材料
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -711,7 +709,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else if (item.taskType == 47)//原材料入库 else if (item.taskType == StaticTaskType.FiveRawIn)//原材料入库
{ {
Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼AGV线程完成任务" + item.currPointNo + "," + item.endPointNo);
_logger.Info("五楼Agv完成任务成功：" + item.ToJsonString()); _logger.Info("五楼Agv完成任务成功：" + item.ToJsonString());
@ -780,7 +778,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
}
break; break;
} }
} }

4
src/Khd.Core.Wcs/Wcs/FiveFloorBearAgv.cs
Unescape Escape View File

@ -103,8 +103,6 @@ namespace Khd.Core.Wcs.Wcs
else else
{ {
//if (item.useFlag == 1)//接料位-工位默认为1，工位到接料位需Mes通知 //if (item.useFlag == 1)//接料位-工位默认为1，工位到接料位需Mes通知
{
{
if (item.taskStatus == 4)//通知捡料完成 if (item.taskStatus == 4)//通知捡料完成
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -154,8 +152,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
}
}
break; break;
} }
} }

51
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
Unescape Escape View File

@ -120,7 +120,7 @@ namespace Khd.Core.Wcs.Wcs
nextPointNo = ctuEquip.equipNo, nextPointNo = ctuEquip.equipNo,
endPointId = wmsBaseLocation.locationId, endPointId = wmsBaseLocation.locationId,
endPointNo = wmsBaseLocation.agvPositionCode, endPointNo = wmsBaseLocation.agvPositionCode,
taskType = 29, taskType = StaticTaskType.FiveAccessoryIn,
taskStatus = 0, taskStatus = 0,
useFlag = 1, useFlag = 1,
floorNo = 5, floorNo = 5,
@ -147,7 +147,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else else
{ {
if (task.taskType == 30) if (task.taskType == StaticTaskType.FiveAccessoryOut)
{ {
dbContext.WcsTask.Where(t => t.objid == task.objid).Delete(); dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
//根据rfid找到库位 //根据rfid找到库位
@ -168,7 +168,7 @@ namespace Khd.Core.Wcs.Wcs
useFlag = 1, useFlag = 1,
endPointId = wmsBaseLocation.locationId, endPointId = wmsBaseLocation.locationId,
endPointNo = wmsBaseLocation.agvPositionCode, endPointNo = wmsBaseLocation.agvPositionCode,
taskType = 29, taskType = StaticTaskType.FiveAccessoryIn,
taskStatus = 0, taskStatus = 0,
floorNo = 5, floorNo = 5,
containerNo = rfid.ToString(), containerNo = rfid.ToString(),
@ -188,7 +188,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (task.taskType == 100) else if (task.taskType == StaticTaskType.FiveAccessoryStorage)
{ {
WmsInventoryCheck? wmsInventoryCheck = dbContext.WmsInventoryCheck.Where(t => t.InventoryCheckId == task.orderId).FirstOrDefault(); WmsInventoryCheck? wmsInventoryCheck = dbContext.WmsInventoryCheck.Where(t => t.InventoryCheckId == task.orderId).FirstOrDefault();
if (wmsInventoryCheck != null) if (wmsInventoryCheck != null)
@ -219,7 +219,7 @@ namespace Khd.Core.Wcs.Wcs
useFlag = 1, useFlag = 1,
endPointId = wmsBaseLocation.locationId, endPointId = wmsBaseLocation.locationId,
endPointNo = wmsBaseLocation.agvPositionCode, endPointNo = wmsBaseLocation.agvPositionCode,
taskType = 29, taskType = StaticTaskType.FiveAccessoryIn,
taskStatus = 0, taskStatus = 0,
floorNo = 5, floorNo = 5,
containerNo = rfid.ToString(), containerNo = rfid.ToString(),
@ -253,21 +253,6 @@ namespace Khd.Core.Wcs.Wcs
{ {
StaticData.PlcDic[1].WriteToPoint(CtuLineWaring.plcpointAddress, false, CtuLineWaring.plcpointLength.ToString()); StaticData.PlcDic[1].WriteToPoint(CtuLineWaring.plcpointAddress, false, CtuLineWaring.plcpointLength.ToString());
} }
//else if (receiveMaterial != null && Convert.ToInt32(receiveMaterial) == 0)
//{
// lock (SystemData.outStockLock)
// {
// WcsOutstockLock wcsOutstockLock = dbContext.WcsOutstockLock.Where(t => t.warehouseId == 512).First();
// bool haveTask = dbContext.WcsTask.Where(t => t.nextPointId == 11).Any();
// if (!haveTask && wcsOutstockLock.boxStatus == 1)
// {
// wcsOutstockLock.boxStatus = 0;
// wcsOutstockLock.qty = 0;
// dbContext.Update(wcsOutstockLock);
// dbContext.SaveChanges();
// }
// }
//}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -380,7 +365,7 @@ namespace Khd.Core.Wcs.Wcs
item.updateTime = DateTime.Now; item.updateTime = DateTime.Now;
if (item.taskStatus == 0)//CTU会同时生成多个任务，生成就下发？ if (item.taskStatus == 0)//CTU会同时生成多个任务，生成就下发？
{ {
if (item.taskType == 30 || item.taskType == 100 || item.taskType == 102)//出库任务 if (item.taskType == StaticTaskType.FiveAccessoryOut || item.taskType == StaticTaskType.FiveAccessoryStorage || item.taskType == StaticTaskType.FiveAccessoryRemove)//出库任务
{ {
BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId);
WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation.First(t => t.locationId == item.currPointId); WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation.First(t => t.locationId == item.currPointId);
@ -421,9 +406,9 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("CTU下发出库任务失败：" + reponseMessage?.message); _logger.Info("CTU下发出库任务失败：" + reponseMessage?.message);
} }
} }
else if (item.taskType == 29)//入库任务 else if (item.taskType == StaticTaskType.FiveAccessoryIn)//入库任务
{ {
bool haveOut = taskList.Where(t => t.taskType == 30).Where(t => t.taskStatus != 6).Any(); bool haveOut = taskList.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut).Where(t => t.taskStatus != 6).Any();
if (!haveOut && CtuWaitLogic()) if (!haveOut && CtuWaitLogic())
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
@ -460,8 +445,8 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Update(item); dbContext.Update(item);
lock (SystemData.outStockLock) lock (SystemData.outStockLock)
{ {
bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == 30).Any(); bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == StaticTaskType.FiveAccessoryOut).Any();
int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == 29).Count(); int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == StaticTaskType.FiveAccessoryIn).Count();
if ((!hasTask && item.ud3 == "1") || (taskCount >= 6))//如果CTU当前任务数量很多，取消预执行任务,或者出库的任务都生成了入库任务 if ((!hasTask && item.ud3 == "1") || (taskCount >= 6))//如果CTU当前任务数量很多，取消预执行任务,或者出库的任务都生成了入库任务
{ {
ExecuteInTask(baseEquip); ExecuteInTask(baseEquip);
@ -477,11 +462,10 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else else
{
{ {
if (item.taskStatus == 3) if (item.taskStatus == 3)
{ {
if (item.taskType == 30 || item.taskType == 100 || item.taskType == 102) if (item.taskType == StaticTaskType.FiveAccessoryOut || item.taskType == StaticTaskType.FiveAccessoryStorage || item.taskType == StaticTaskType.FiveAccessoryRemove)
{ {
var canOut = StaticData.PlcDic[1].Read(isput.plcpointAddress); var canOut = StaticData.PlcDic[1].Read(isput.plcpointAddress);
if (canOut != null && Convert.ToInt64(canOut) == 0) if (canOut != null && Convert.ToInt64(canOut) == 0)
@ -508,7 +492,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
if (item.taskType == 29) if (item.taskType == StaticTaskType.FiveAccessoryIn)
{ {
var agvTask = new var agvTask = new
{ {
@ -537,7 +521,7 @@ namespace Khd.Core.Wcs.Wcs
{ {
_logger.Info("五楼CTU线程完成任务" + item.objid); _logger.Info("五楼CTU线程完成任务" + item.objid);
Console.WriteLine(DateTime.Now + ":五楼CTU线程完成任务" + item.currPointNo + "," + item.endPointNo); Console.WriteLine(DateTime.Now + ":五楼CTU线程完成任务" + item.currPointNo + "," + item.endPointNo);
if (item.taskType == 30)//出库任务 if (item.taskType == StaticTaskType.FiveAccessoryOut)//出库任务
{ {
WmsRawOutstockDetail? wmsRawOutstockDetail = dbContext.WmsRawOutstockDetail.FirstOrDefault(t => t.taskCode == item.objid.ToString()); WmsRawOutstockDetail? wmsRawOutstockDetail = dbContext.WmsRawOutstockDetail.FirstOrDefault(t => t.taskCode == item.objid.ToString());
if (wmsRawOutstockDetail != null) if (wmsRawOutstockDetail != null)
@ -555,13 +539,13 @@ namespace Khd.Core.Wcs.Wcs
dbContext.WmsRawOutstockDetail.Where(t => t.locationCode == wmsBaseLocation.locationCode).Update(t => new WmsRawOutstockDetail { executeStatus = "2" }); dbContext.WmsRawOutstockDetail.Where(t => t.locationCode == wmsBaseLocation.locationCode).Update(t => new WmsRawOutstockDetail { executeStatus = "2" });
dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask() { taskStatus = 6 }); dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask() { taskStatus = 6 });
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 });
int wcsTaskCount = dbContext.WcsTask.Where(t => t.taskType == 30 && t.taskStatus != 6).Count(); int wcsTaskCount = dbContext.WcsTask.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut && t.taskStatus != 6).Count();
if (wcsTaskCount == 0) if (wcsTaskCount == 0)
{ {
StaticData.PlcDic[1].WriteToPoint(this.canReceive.plcpointAddress, "1", this.canReceive.plcpointLength?.ToString()); StaticData.PlcDic[1].WriteToPoint(this.canReceive.plcpointAddress, "1", this.canReceive.plcpointLength?.ToString());
} }
} }
else if (item.taskType == 29)//入库任务 else if (item.taskType == StaticTaskType.FiveAccessoryIn)//入库任务
{ {
WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation
.First(t => t.locationId == item.endPointId && t.warehouseFloor == 5); .First(t => t.locationId == item.endPointId && t.warehouseFloor == 5);
@ -572,7 +556,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 });
} }
else if (item.taskType == 100 || item.taskType == 102)//出库任务 else if (item.taskType == StaticTaskType.FiveAccessoryStorage || item.taskType == StaticTaskType.FiveAccessoryRemove)//出库任务
{ {
WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation
.First(t => t.locationId == item.currPointId && t.warehouseFloor == 5); .First(t => t.locationId == item.currPointId && t.warehouseFloor == 5);
@ -582,7 +566,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask() { taskStatus = 6 }); dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask() { taskStatus = 6 });
dbContext.SaveChanges(); dbContext.SaveChanges();
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 6 });
int wcsTaskCount = dbContext.WcsTask.Where(t => (t.taskType == 30 || t.taskType == 100 || item.taskType == 102) && t.taskStatus != 6).Count(); int wcsTaskCount = dbContext.WcsTask.Where(t => (item.taskType == StaticTaskType.FiveAccessoryOut || item.taskType == StaticTaskType.FiveAccessoryStorage || item.taskType == StaticTaskType.FiveAccessoryRemove) && t.taskStatus != 6).Count();
if (wcsTaskCount == 0) if (wcsTaskCount == 0)
{ {
StaticData.PlcDic[1].WriteToPoint(this.canReceive.plcpointAddress, "1", this.canReceive.plcpointLength?.ToString()); StaticData.PlcDic[1].WriteToPoint(this.canReceive.plcpointAddress, "1", this.canReceive.plcpointLength?.ToString());
@ -592,7 +576,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
if (ex is PlcException) if (ex is PlcException)

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

@ -50,6 +50,7 @@ namespace Khd.Core.Wcs.Wcs
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>();
List<string> canNotIn = new(); List<string> canNotIn = new();
string lastRFID = string.Empty;
while (true) while (true)
{ {
try try
@ -72,6 +73,10 @@ namespace Khd.Core.Wcs.Wcs
{ {
if (StaticData.BigContainerCodes.Contains(rfid)) if (StaticData.BigContainerCodes.Contains(rfid))
{ {
if (rfid == lastRFID)
{
continue;
}
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == rfid); MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == rfid);
if (mesBasePalletInfo != null) if (mesBasePalletInfo != null)
{ {
@ -93,8 +98,8 @@ namespace Khd.Core.Wcs.Wcs
dbContext.Remove(wcsTask); dbContext.Remove(wcsTask);
dbContext.WcsTaskLog.Where(t => t.objid == wcsTask.objid).Update(t => new WcsTaskLog { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == wcsTask.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
dbContext.SaveChanges(); dbContext.SaveChanges();
lastRFID = rfid;
} }
continue;
} }
else//小托盘 else//小托盘
{ {
@ -185,7 +190,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.endPointNo = wmsBaseLocation.locationCode; newTask.endPointNo = wmsBaseLocation.locationCode;
newTask.objid = StaticData.SnowId.NextId(); newTask.objid = StaticData.SnowId.NextId();
newTask.createTime = DateTime.Now; newTask.createTime = DateTime.Now;
newTask.taskType = 47; newTask.taskType = StaticTaskType.FiveRawIn;
if (newTask.fromFloorNo != 1)//如果不是一楼来的，需要通过接口确认入库（质检通过后，点击继续入库） if (newTask.fromFloorNo != 1)//如果不是一楼来的，需要通过接口确认入库（质检通过后，点击继续入库）
{ {
newTask.useFlag = 0; newTask.useFlag = 0;

44
src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
Unescape Escape View File

@ -67,7 +67,7 @@ namespace Khd.Core.Wcs.Wcs
if (item.taskStatus == 0)//下发任务 if (item.taskStatus == 0)//下发任务
{ {
BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType); BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType);
if (item.taskType == 51)//输送线-小包入口 if (item.taskType == StaticTaskType.SecondLineToSmallPackage)//输送线-小包入口
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
{ {
@ -106,7 +106,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 56)//废料工位-库位 else if (item.taskType == StaticTaskType.SecondWasteToTransit)//废料工位-库位
{ {
var endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId); var endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -147,7 +147,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 49)//小包出口-库位 else if (item.taskType == StaticTaskType.SecondSmallPackageToStorage)//小包出口-库位
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -187,7 +187,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("二楼Agv下发任务失败" + item.taskType + result); _logger.Info("二楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 57)//周转位-提升机 else if (item.taskType == StaticTaskType.SecondTransitToLift)//周转位-提升机
{ {
var startPoint = StaticData.BaseEquip.First(t => t.objid == item.currPointId); var startPoint = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -227,7 +227,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 50)//库位-提升机 else if (item.taskType == StaticTaskType.SecondStorageToLift)//库位-提升机
{ {
var startPoint = dbContext.WmsBaseLocation.First(t => t.locationId == item.currPointId); var startPoint = dbContext.WmsBaseLocation.First(t => t.locationId == item.currPointId);
lineEquip = dbContext.BaseEquip.First(t => t.objid == 2); lineEquip = dbContext.BaseEquip.First(t => t.objid == 2);
@ -273,7 +273,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 55)//2F移库 else if (item.taskType == StaticTaskType.SecondRemove)//2F移库
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
{ {
@ -313,7 +313,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 53)//提升机-废料工位 else if (item.taskType == StaticTaskType.SecondLiftToWaste)//提升机-废料工位
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
{ {
@ -352,7 +352,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 54)//周转位-废料工位 else if (item.taskType == StaticTaskType.SecondTransitToWaste)//周转位-废料工位
{ {
var wasteEquipLocation = StaticData.BaseEquip.FirstOrDefault(t => t.objid == item.currPointId); var wasteEquipLocation = StaticData.BaseEquip.FirstOrDefault(t => t.objid == item.currPointId);
if (wasteEquipLocation != null) if (wasteEquipLocation != null)
@ -395,7 +395,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 58)//提升机到周转位 else if (item.taskType == StaticTaskType.SecondLiftToTransit)//提升机到周转位
{ {
var endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId); var endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -435,7 +435,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 59)//周转位-小包入口 else if (item.taskType == StaticTaskType.SecondTransitToSmallPackage)//周转位-小包入口
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
@ -478,7 +478,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
else else
{
{ {
if (item.taskStatus == 3) if (item.taskStatus == 3)
{ {
@ -560,7 +559,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else if (item.taskStatus == 5) else if (item.taskStatus == 5)
{ {
if (item.taskType == 51) if (item.taskType == StaticTaskType.SecondLineToSmallPackage)
{ {
if (true) if (true)
{ {
@ -588,7 +587,7 @@ namespace Khd.Core.Wcs.Wcs
lineEquip.equipStatus = 0; lineEquip.equipStatus = 0;
dbContext.Update(lineEquip); dbContext.Update(lineEquip);
} }
if (item.taskType == 49) if (item.taskType == StaticTaskType.SecondSmallPackageToStorage)
{ {
//WmsProductInstock? wmsProductInstock = dbContext.WmsProductInstock.FirstOrDefault(t => t.productInstockId == item.orderId); //WmsProductInstock? wmsProductInstock = dbContext.WmsProductInstock.FirstOrDefault(t => t.productInstockId == item.orderId);
//if (wmsProductInstock != null) //if (wmsProductInstock != null)
@ -647,7 +646,7 @@ namespace Khd.Core.Wcs.Wcs
//} //}
} }
} }
else if (item.taskType == 50)//成品出库 else if (item.taskType == StaticTaskType.SecondStorageToLift)//成品出库
{ {
WmsProductOutstock? wmsProductOutstock = dbContext.WmsProductOutstock.FirstOrDefault(t => t.productOutstockId == item.orderId); WmsProductOutstock? wmsProductOutstock = dbContext.WmsProductOutstock.FirstOrDefault(t => t.productOutstockId == item.orderId);
if (wmsProductOutstock != null) if (wmsProductOutstock != null)
@ -681,7 +680,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 58)//空托盘入周转位 else if (item.taskType == StaticTaskType.SecondLiftToTransit)//空托盘入周转位
{ {
BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == item.endPointId);
endEquip.equipStatus = 1; endEquip.equipStatus = 1;
@ -692,7 +691,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 53)//提升机到废料口 else if (item.taskType == StaticTaskType.SecondLiftToWaste)//提升机到废料口
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
startEquip.equipStatus = 0; startEquip.equipStatus = 0;
@ -707,7 +706,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 51)//输送线到小包入口 else if (item.taskType == StaticTaskType.SecondLineToSmallPackage)//输送线到小包入口
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
startEquip.equipStatus = 0; startEquip.equipStatus = 0;
@ -717,7 +716,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 54)//周转位到废料口 else if (item.taskType == StaticTaskType.SecondTransitToWaste)//周转位到废料口
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
startEquip.equipStatus = 0; startEquip.equipStatus = 0;
@ -734,7 +733,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 55)//移库 else if (item.taskType == StaticTaskType.SecondRemove)//移库
{ {
using var transaction = dbContext.Database.BeginTransaction(); using var transaction = dbContext.Database.BeginTransaction();
try try
@ -773,7 +772,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Error(ex.Message + "\n" + ex.StackTrace); _logger.Error(ex.Message + "\n" + ex.StackTrace);
} }
} }
else if (item.taskType == 56)//废料区到周转区 else if (item.taskType == StaticTaskType.SecondWasteToTransit)//废料区到周转区
{ {
wasteEquip.emptyCount = 0; wasteEquip.emptyCount = 0;
wasteEquip.equipStatus = 0; wasteEquip.equipStatus = 0;
@ -787,7 +786,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 57)//周转位-提升机 else if (item.taskType == StaticTaskType.SecondTransitToLift)//周转位-提升机
{ {
BaseEquip emptyEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip emptyEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
emptyEquip.emptyCount = 0; emptyEquip.emptyCount = 0;
@ -801,7 +800,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
_logger.Info("二楼AGV线程完成任务" + item.objid); _logger.Info("二楼AGV线程完成任务" + item.objid);
} }
else if (item.taskType == 59)//周转区-小包入口 else if (item.taskType == StaticTaskType.SecondTransitToSmallPackage)//周转区-小包入口
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
startEquip.equipStatus = 0; startEquip.equipStatus = 0;
@ -815,7 +814,6 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
}
break; break;
} }
} }

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

@ -85,7 +85,7 @@ namespace Khd.Core.Wcs.Wcs
fromFloorNo = 2, fromFloorNo = 2,
isEmpty = "1", isEmpty = "1",
qty = baseEquip.emptyCount,//托盘的数量 qty = baseEquip.emptyCount,//托盘的数量
taskType = 59,//任务类型 taskType = StaticTaskType.SecondTransitToSmallPackage,//任务类型
}; };
dbContext.Add(wcsTask); dbContext.Add(wcsTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTask);
@ -96,7 +96,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else//二楼周转区没有空托盘 else//二楼周转区没有空托盘
{ {
baseEquip = dbContext.BaseEquip.FirstOrDefault(t => t.equipType == 15 && t.emptyCount == SystemData.maxTray && t.equipStatus == 1);//三楼三个周转区是否存在空托盘 baseEquip = dbContext.BaseEquip.FirstOrDefault(t => t.equipType == 15 && t.emptyCount == SystemData.maxTray);//三楼三个周转区是否存在空托盘
if (baseEquip != null)//如果三楼有空托盘 if (baseEquip != null)//如果三楼有空托盘
{ {
BaseEquip ThirdLineEquip = dbContext.BaseEquip.First(t => t.objid == 3);//三楼接驳位 BaseEquip ThirdLineEquip = dbContext.BaseEquip.First(t => t.objid == 3);//三楼接驳位
@ -114,7 +114,7 @@ namespace Khd.Core.Wcs.Wcs
fromFloorNo = 3, fromFloorNo = 3,
isEmpty = "1", isEmpty = "1",
qty = SystemData.maxTray, qty = SystemData.maxTray,
taskType = 101, taskType = StaticTaskType.ThirdTransitToSecond,
currPointId = baseEquip.objid, currPointId = baseEquip.objid,
currPointNo = baseEquip.equipNo, currPointNo = baseEquip.equipNo,
nextPointId = ThirdAgvEquip.objid, nextPointId = ThirdAgvEquip.objid,
@ -165,7 +165,7 @@ namespace Khd.Core.Wcs.Wcs
fromFloorNo = 1, fromFloorNo = 1,
isEmpty = "1", isEmpty = "1",
qty = startEquip.emptyCount, qty = startEquip.emptyCount,
taskType = 53, taskType = StaticTaskType.SecondLiftToWaste,
}; };
dbContext.Add(wcsTaskManual); dbContext.Add(wcsTaskManual);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTaskManual); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTaskManual);
@ -205,7 +205,7 @@ namespace Khd.Core.Wcs.Wcs
fromFloorNo = 1, fromFloorNo = 1,
isEmpty = "1", isEmpty = "1",
qty = 1, qty = 1,
taskType = 53, taskType = StaticTaskType.SecondLiftToWaste,
}; };
dbContext.Add(wcsTaskManual); dbContext.Add(wcsTaskManual);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTaskManual); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(wcsTaskManual);
@ -310,7 +310,7 @@ namespace Khd.Core.Wcs.Wcs
floorNo = 2, floorNo = 2,
fromFloorNo = 2, fromFloorNo = 2,
isEmpty = "0", isEmpty = "0",
taskType = 49, taskType = StaticTaskType.SecondSmallPackageToStorage,
qty = 1, qty = 1,
}; };
SystemData.LockOutLocation(wmsBaseLocation, dbContext); SystemData.LockOutLocation(wmsBaseLocation, dbContext);

14
src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
Unescape Escape View File

@ -97,7 +97,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.endPointId = inEquip.objid;//终点为小包入口 newTask.endPointId = inEquip.objid;//终点为小包入口
newTask.endPointNo = inEquip.equipNo; newTask.endPointNo = inEquip.equipNo;
newTask.taskType = 51;//提升机到小包入口的任务类型 newTask.taskType = StaticTaskType.SecondLineToSmallPackage;//提升机到小包入口的任务类型
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -124,7 +124,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.endPointId = endEquip.objid;//终点为周转位 newTask.endPointId = endEquip.objid;//终点为周转位
newTask.endPointNo = endEquip.equipNo; newTask.endPointNo = endEquip.equipNo;
newTask.taskType = 58;//提升机到周转位的任务类型 newTask.taskType = StaticTaskType.SecondLiftToTransit;//提升机到周转位的任务类型
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -155,7 +155,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.endPointId = inEquip.objid; newTask.endPointId = inEquip.objid;
newTask.endPointNo = inEquip.equipNo; newTask.endPointNo = inEquip.equipNo;
newTask.taskType = 51;//到小包入口 newTask.taskType = StaticTaskType.SecondLineToSmallPackage;//到小包入口
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -182,7 +182,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.endPointId = endEquip.objid; newTask.endPointId = endEquip.objid;
newTask.endPointNo = endEquip.equipNo; newTask.endPointNo = endEquip.equipNo;
newTask.taskType = 58;//到周转位 newTask.taskType = StaticTaskType.SecondLiftToTransit;//到周转位
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -209,7 +209,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.containerNo = rfid; newTask.containerNo = rfid;
newTask.currPointId = lineEquip.objid; newTask.currPointId = lineEquip.objid;
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.taskType = 53; newTask.taskType = StaticTaskType.SecondLiftToWaste;
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -236,7 +236,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = lineEquip.equipNo; newTask.currPointNo = lineEquip.equipNo;
newTask.endPointId = endEquip.objid; newTask.endPointId = endEquip.objid;
newTask.endPointNo = endEquip.equipNo; newTask.endPointNo = endEquip.equipNo;
newTask.taskType = 58; newTask.taskType = StaticTaskType.SecondLiftToTransit;
newTask.useFlag = 1; newTask.useFlag = 1;
dbContext.WcsTask.Add(newTask); dbContext.WcsTask.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask); WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
@ -251,7 +251,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else if (wcsTask.taskStatus == 8)//小车任务完成 else if (wcsTask.taskStatus == 8)//小车任务完成
{ {
if (wcsTask.taskType == 50 && wcsTask.containerNo == rfid)//50是成品出库 if (wcsTask.taskType == StaticTaskType.SecondStorageToLift && wcsTask.containerNo == rfid)//50是成品出库
{ {
BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == 1); BaseEquip endEquip = StaticData.BaseEquip.First(t => t.objid == 1);
dbContext.WcsTask.Remove(wcsTask); dbContext.WcsTask.Remove(wcsTask);

36
src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
Unescape Escape View File

@ -97,7 +97,7 @@ namespace Khd.Core.Wcs.Wcs
var getTrayValue = StaticData.PlcDic[2].Read(getTrayPoint.plcpointAddress); var getTrayValue = StaticData.PlcDic[2].Read(getTrayPoint.plcpointAddress);
if (getTrayValue != null && Convert.ToBoolean(getTrayValue)) if (getTrayValue != null && Convert.ToBoolean(getTrayValue))
{ {
var task = dbContext.WcsTask.Where(t => t.IsDelete == 0 || t.IsDelete == null).Where(t => t.taskType == 42 && t.useFlag == 0).FirstOrDefault(); var task = dbContext.WcsTask.Where(t => t.IsDelete == 0 || t.IsDelete == null).Where(t => t.taskType == StaticTaskType.ThirdFlipToBin && t.useFlag == 0).FirstOrDefault();
if (task != null) if (task != null)
{ {
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == 35); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == 35);
@ -106,7 +106,7 @@ namespace Khd.Core.Wcs.Wcs
//if (endEquip.emptyCount != (SystemData.maxTray / 2) && endEquip.emptyCount != SystemData.maxTray) //if (endEquip.emptyCount != (SystemData.maxTray / 2) && endEquip.emptyCount != SystemData.maxTray)
if (endEquip.emptyCount < SystemData.maxTray) if (endEquip.emptyCount < SystemData.maxTray)
{ {
task.taskType = 42; task.taskType = StaticTaskType.ThirdFlipToBin;
task.useFlag = 1; task.useFlag = 1;
task.taskStatus = 0; task.taskStatus = 0;
task.isEmpty = "1"; task.isEmpty = "1";
@ -160,7 +160,7 @@ namespace Khd.Core.Wcs.Wcs
if (item.taskStatus == 0) if (item.taskStatus == 0)
{ {
BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType); BaseDictionary baseDictionary = StaticData.BaseDictionary.First(t => t.objid == item.taskType);
if (item.taskType == 67)//移库 if (item.taskType == StaticTaskType.ThirdRemove)//移库
{ {
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
{ {
@ -199,7 +199,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("五楼Agv下发任务失败" + item.taskType + result); _logger.Info("五楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 39)//提升机-库位 else if (item.taskType == StaticTaskType.ThirdRawIn)//提升机-库位
{ {
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == 3); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == 3);
var agvTask = new RequestAGVTaskDto var agvTask = new RequestAGVTaskDto
@ -239,7 +239,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("三楼Agv下发任务失败" + item.taskType + result); _logger.Info("三楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 41)//库位-翻转机 else if (item.taskType == StaticTaskType.ThirdRawToFlip)//库位-翻转机
{ {
BasePlcpoint basePlcpoint = StaticData.BasePlcpointList.First(t => t.plcpointNo == "putTray"); BasePlcpoint basePlcpoint = StaticData.BasePlcpointList.First(t => t.plcpointNo == "putTray");
var callMaterial = StaticData.PlcDic[2].Read(basePlcpoint.plcpointAddress); var callMaterial = StaticData.PlcDic[2].Read(basePlcpoint.plcpointAddress);
@ -293,7 +293,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 40)//周转位-收集架 else if (item.taskType == StaticTaskType.ThirdTransitToBin)//周转位-收集架
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId);
@ -335,7 +335,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("三楼Agv下发任务失败" + item.taskType + result); _logger.Info("三楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 42)//翻转机-收集架 else if (item.taskType == StaticTaskType.ThirdFlipToBin)//翻转机-收集架
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId);
@ -377,7 +377,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("三楼Agv下发任务失败" + item.taskType + result); _logger.Info("三楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 43)//收集架-周转区 else if (item.taskType == StaticTaskType.ThirdBinToTransit)//收集架-周转区
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId);
@ -420,7 +420,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Info("三楼Agv下发任务失败" + item.taskType + result); _logger.Info("三楼Agv下发任务失败" + item.taskType + result);
} }
} }
else if (item.taskType == 44)//周转区-提升机 else if (item.taskType == StaticTaskType.ThirdTransitToLift)//周转区-提升机
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 3); BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 3);
@ -468,7 +468,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 101)//三楼空托盘转运到二楼 else if (item.taskType == StaticTaskType.ThirdTransitToSecond)//三楼空托盘转运到二楼
{ {
BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 3); BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == 3);
BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = StaticData.BaseEquip.First(t => t.objid == item.currPointId);
@ -569,7 +569,7 @@ namespace Khd.Core.Wcs.Wcs
lineEquip.equipStatus = 0; lineEquip.equipStatus = 0;
dbContext.Update(lineEquip); dbContext.Update(lineEquip);
} }
if (item.taskType == 67)//移库 if (item.taskType == StaticTaskType.ThirdRemove)//移库
{ {
using var transaction = dbContext.Database.BeginTransaction(); using var transaction = dbContext.Database.BeginTransaction();
try try
@ -607,7 +607,7 @@ namespace Khd.Core.Wcs.Wcs
_logger.Error(ex.Message + "\n" + ex.StackTrace); _logger.Error(ex.Message + "\n" + ex.StackTrace);
} }
} }
if (item.taskType == 39)//入库 if (item.taskType == StaticTaskType.ThirdRawIn)//入库
{ {
WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation
.First(t => t.locationId == item.endPointId && t.warehouseFloor == 3); .First(t => t.locationId == item.endPointId && t.warehouseFloor == 3);
@ -669,7 +669,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 40)//周转区-收集架，暂不使用 else if (item.taskType == StaticTaskType.ThirdTransitToBin)//周转区-收集架，暂不使用
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId);
@ -687,7 +687,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
else if (item.taskType == 41)//原材料出库 else if (item.taskType == StaticTaskType.ThirdRawToFlip)//原材料出库
{ {
WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation WmsBaseLocation wmsBaseLocation = dbContext.WmsBaseLocation
.First(t => t.locationId == item.currPointId); .First(t => t.locationId == item.currPointId);
@ -724,7 +724,7 @@ namespace Khd.Core.Wcs.Wcs
wcsTask.objid = StaticData.SnowId.NextId(); wcsTask.objid = StaticData.SnowId.NextId();
wcsTask.taskStatus = 0; wcsTask.taskStatus = 0;
wcsTask.useFlag = 0; wcsTask.useFlag = 0;
wcsTask.taskType = 42; wcsTask.taskType = StaticTaskType.ThirdFlipToBin;
wcsTask.createBy = "WCS"; wcsTask.createBy = "WCS";
wcsTask.createTime = DateTime.Now; wcsTask.createTime = DateTime.Now;
dbContext.Remove(item); dbContext.Remove(item);
@ -735,7 +735,7 @@ namespace Khd.Core.Wcs.Wcs
} }
} }
} }
else if (item.taskType == 42)//翻转机就到收集架 else if (item.taskType == StaticTaskType.ThirdFlipToBin)//翻转机就到收集架
{ {
MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == item.containerNo); MesBasePalletInfo? mesBasePalletInfo = dbContext.MesBasePalletInfo.FirstOrDefault(t => t.palletInfoCode == item.containerNo);
if (mesBasePalletInfo != null) if (mesBasePalletInfo != null)
@ -772,7 +772,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
else if (item.taskType == 43)//收集架-周转区 else if (item.taskType == StaticTaskType.ThirdBinToTransit)//收集架-周转区
{ {
BaseEquip emptyEquip = dbContext.BaseEquip.First(t => t.objid == 35); BaseEquip emptyEquip = dbContext.BaseEquip.First(t => t.objid == 35);
BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId); BaseEquip endEquip = dbContext.BaseEquip.First(t => t.objid == item.endPointId);
@ -789,7 +789,7 @@ namespace Khd.Core.Wcs.Wcs
dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 }); dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog { taskStatus = 6 });
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
else if (item.taskType == 44 || item.taskType == 101)//周转区-提升机 else if (item.taskType == StaticTaskType.ThirdTransitToLift || item.taskType == StaticTaskType.ThirdTransitToSecond)//周转区-提升机
{ {
BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId); BaseEquip startEquip = dbContext.BaseEquip.First(t => t.objid == item.currPointId);
BaseEquip lineEquip = StaticData.BaseEquip.First(t => t.objid == 3); BaseEquip lineEquip = StaticData.BaseEquip.First(t => t.objid == 3);

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

@ -137,7 +137,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.nextPointNo = AgvEquip.equipNo; newTask.nextPointNo = AgvEquip.equipNo;
newTask.endPointId = wmsBaseLocation.locationId; newTask.endPointId = wmsBaseLocation.locationId;
newTask.endPointNo = wmsBaseLocation.locationCode; newTask.endPointNo = wmsBaseLocation.locationCode;
newTask.taskType = 39; newTask.taskType = StaticTaskType.ThirdRawIn;
newTask.useFlag = 1; newTask.useFlag = 1;
wmsBaseLocation.locationStatus = "2"; wmsBaseLocation.locationStatus = "2";
SystemData.LockOutLocation(wmsBaseLocation, dbContext); SystemData.LockOutLocation(wmsBaseLocation, dbContext);

Write Preview
Loading…
Cancel
Save