需要增加一个仓位:

INSERT INTO `wcs_yongfeng_cp`.`i_pose` ( `wcName`, `wcType`, `wcTypeName`, `wcRoadWay`, `Xpose`, `Ypose`, `Zpose`, `Station`, `IsOut`, `TypeIn`, `TypeOut`, `Note`) VALUES ( 'WareCell', 'WareCell', '虚拟仓位', 1, 0, 0, 0, 0, 0, NULL, NULL, '虚拟仓位');
This commit is contained in:
bnala committed 2025-06-07 18:37:26 +08:00
1 parent 100d410159
commit 2610605aa6
6 files changed
+60 -34

No files matched your search

+8 -8
View File
@@ -55,21 +55,21 @@
{
任务创建 = 10,
下发堆垛机取货任务 = 20,
堆垛机取货 = 20,
响应堆垛机取货完成 = 21,
堆垛机取货完成 = 21,
下发堆垛机放货任务 = 22,
堆垛机放货 = 22,
响应堆垛机放货完成 = 25,
堆垛机放货完成 = 25,
响应出入口地址请求 = 40,
出入口地址请求 = 40,
响应出入口地址到达 = 45,
出入口地址到达 = 45,
响应中转站台地址请求 = 50,
中间站台地址请求 = 50,
响应中转站台地址到达 = 55,
中间站台地址到达 = 55,
任务完成 = 100,
+8 -2
View File
@@ -259,7 +259,7 @@ namespace WCS_YongFeng
{
App.taskList.Remove(task);
});
if (task.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt() || task.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt())
if (task.NowState == E_TaskState.堆垛机取货.GetIndexInt() || task.NowState == E_TaskState.堆垛机放货.GetIndexInt())
{
LogExecute.logNet.WriteDebug($"该任务删除成功,请至WCS手动界面删除堆垛机任务");
return BllResult.Sucess($"该任务删除成功,请至WCS手动界面删除堆垛机任务");
@@ -304,7 +304,7 @@ namespace WCS_YongFeng
App.taskList.Remove(tasklist);
});
if (tasklist.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt() || tasklist.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt())
if (tasklist.NowState == E_TaskState.堆垛机取货.GetIndexInt() || tasklist.NowState == E_TaskState.堆垛机放货.GetIndexInt())
{
LogExecute.logNet.WriteDebug($"该任务删除成功,请至WCS手动界面删除堆垛机任务");
return BllResult.Sucess($"该任务删除成功,请至WCS手动界面删除堆垛机任务");
@@ -1153,6 +1153,12 @@ namespace WCS_YongFeng
Enter = _Enter;
task.EntrancePlace = Enter;
}
if (task.ExitPlace == "WareCell")
{
return BllResult.Error("终点为虚拟仓位时,不允许更改状态!");
}
string from = taskflow.FromPlace;
if (taskflow.FromPlace == "Entrance")
{
@@ -73,14 +73,14 @@ namespace WCS_YongFeng
var AllTask = App.taskList.ToList().FindAll(a =>
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.FromPlace) &&
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.ToPlace) &&
(a.NextState >= E_TaskState.下发堆垛机取货任务.GetIndexInt() && a.NextState <= E_TaskState.响应堆垛机放货完成.GetIndexInt()));
(a.NextState >= E_TaskState.堆垛机取货.GetIndexInt() && a.NextState <= E_TaskState.堆垛机放货完成.GetIndexInt()));
if (AllTask.Count == 0)
{
return BllResult.Error();
}
var againtasks = AllTask.FindAll(a =>
(a.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt() || a.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt()) &&
(a.NowState == E_TaskState.堆垛机放货.GetIndexInt() || a.NowState == E_TaskState.堆垛机取货.GetIndexInt()) &&
a.SendAgainFlag != 0);
if (againtasks != null && againtasks.Count != 0)
{
@@ -96,7 +96,7 @@ namespace WCS_YongFeng
}
}
var taskcount = AllTask.FindAll(a => a.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt() || a.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt()).Count;
var taskcount = AllTask.FindAll(a => a.NowState == E_TaskState.堆垛机放货.GetIndexInt() || a.NowState == E_TaskState.堆垛机取货.GetIndexInt()).Count;
if (taskcount > 0)
{
//堆垛机有任务待恢复
@@ -106,7 +106,7 @@ namespace WCS_YongFeng
if (!vM_SrmRead.Fork1_Goods) //货叉无货
{
List<I_Task> TAllTask = AllTask.FindAll(a => a.NextState == E_TaskState.下发堆垛机取货任务.GetIndexInt()).OrderBy(a => a.tNo).ToList();
List<I_Task> TAllTask = AllTask.FindAll(a => a.NextState == E_TaskState.堆垛机取货.GetIndexInt()).OrderBy(a => a.tNo).ToList();
if (TAllTask.Count != 0 && TAllTask != null)
{
var sendResult = SendTask(TAllTask[0]);
@@ -124,7 +124,7 @@ namespace WCS_YongFeng
}
else //货叉有货
{
List<I_Task> FAllTask = AllTask.FindAll(a => a.NextState == E_TaskState.下发堆垛机放货任务.GetIndexInt()).OrderBy(a => a.tNo).ToList();
List<I_Task> FAllTask = AllTask.FindAll(a => a.NextState == E_TaskState.堆垛机放货.GetIndexInt()).OrderBy(a => a.tNo).ToList();
if (FAllTask != null && FAllTask.Count != 0)
{
if (FAllTask.Count > 1)
@@ -255,7 +255,7 @@ namespace WCS_YongFeng
}
else
{
var finishtask = App.taskList.FirstOrDefault(a => a.PalletOrBoxNo == vM_SrmWrite.Fork1_Code && (a.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt() || a.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt()));
var finishtask = App.taskList.FirstOrDefault(a => a.PalletOrBoxNo == vM_SrmWrite.Fork1_Code && (a.NowState == E_TaskState.堆垛机取货.GetIndexInt() || a.NowState == E_TaskState.堆垛机放货.GetIndexInt()));
if (finishtask != null)
{
vM_SrmWrite.Fork1TaskType_1 = 10;
@@ -307,14 +307,14 @@ namespace WCS_YongFeng
if (task.SendAgainFlag == 0 && task.FullInFlag == 0)
{
if (task.NextState == E_TaskState.下发堆垛机取货任务.GetIndexInt())
if (task.NextState == E_TaskState.堆垛机取货.GetIndexInt())
{
vM_SrmWrite.Fork1TaskType_1 = E_SrmTaskType.到位置取.GetIndexInt();
vM_SrmWrite.Fork1_Pick_AxisX_NO = sendtask_frompose.Xpose;
vM_SrmWrite.Fork1_Pick_AxisY_NO = sendtask_frompose.Ypose;
vM_SrmWrite.Fork1_Pick_AxisZ_NO = sendtask_frompose.Zpose;
}
else if (task.NextState == E_TaskState.下发堆垛机放货任务.GetIndexInt())
else if (task.NextState == E_TaskState.堆垛机放货.GetIndexInt())
{
vM_SrmWrite.Fork1TaskType_1 = E_SrmTaskType.到位置放.GetIndexInt();
vM_SrmWrite.Fork1_Release_AxisX_NO = sendtask_topose.Xpose;
@@ -364,14 +364,14 @@ namespace WCS_YongFeng
else
{
//需要重发的任务
if (task.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt())
if (task.NowState == E_TaskState.堆垛机取货.GetIndexInt())
{
vM_SrmWrite.Fork1TaskType_1 = E_SrmTaskType.到位置取.GetIndexInt();
vM_SrmWrite.Fork1_Pick_AxisX_NO = sendtask_frompose.Xpose;
vM_SrmWrite.Fork1_Pick_AxisY_NO = sendtask_frompose.Ypose;
vM_SrmWrite.Fork1_Pick_AxisZ_NO = sendtask_frompose.Zpose;
}
else if (task.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt())
else if (task.NowState == E_TaskState.堆垛机放货.GetIndexInt())
{
vM_SrmWrite.Fork1TaskType_1 = E_SrmTaskType.到位置放.GetIndexInt();
vM_SrmWrite.Fork1_Release_AxisX_NO = sendtask_topose.Xpose;
@@ -467,7 +467,7 @@ namespace WCS_YongFeng
var ftask = App.taskList.ToList().FindAll(a =>
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.FromPlace) &&
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.ToPlace) &&
(a.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt() || a.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt()));
(a.NowState == E_TaskState.堆垛机取货.GetIndexInt() || a.NowState == E_TaskState.堆垛机放货.GetIndexInt()));
if (ftask == null)
{
LogExecute.logNet.WriteError($"完成当前任务状态任务失败,任务中没有支持完成任务状态的任务");
@@ -521,7 +521,7 @@ namespace WCS_YongFeng
var reqtask = App.taskList.FirstOrDefault(a =>
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.FromPlace) &&
App.poseList.Where(p => p.wcRoadWay == device.RoadWay).Select(b => b.wcName).Contains(a.ToPlace) &&
(a.NowState == E_TaskState.下发堆垛机取货任务.GetIndexInt() || a.NowState == E_TaskState.下发堆垛机放货任务.GetIndexInt()));
(a.NowState == E_TaskState.堆垛机取货.GetIndexInt() || a.NowState == E_TaskState.堆垛机放货.GetIndexInt()));
if (reqtask == null)
{
LogExecute.logNet.WriteError($"重新下发{device.Name}任务失败,任务中无待下发的任务");
@@ -34,7 +34,7 @@ namespace WCS_YongFeng
//地址请求未回复
if (device.Type == "Entrance")
{
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.入库.GetIndexString() && a.NextState == E_TaskState.响应出入口地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.入库.GetIndexString() && a.NextState == E_TaskState.出入口地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
if (taskresur == null)
{
LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,未找到托盘号{pallet}的任务");
@@ -60,12 +60,32 @@ namespace WCS_YongFeng
vM_StationDACK.PalletID = vM_StationDR.PalletID;
vM_StationDACK.DeStation = device.ToPoint;
//var pose = App.poseList.FirstOrDefault(a => a.Station == device.Point);
//if (pose == null)
//{
// LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,未找站台对应的坐标");
// return BllResult.Sucess();
//}
if (taskresur.ExitPlace == "WareCell")
{
ReqTaskFinish reqTaskFinish = new ReqTaskFinish()
{
TaskNo = taskresur.tNo_WMS,
State = 10,
Height = vM_StationDR.Height
};
var interfaceresult = WcsWebApiClient.FinishTask(reqTaskFinish);
if (!interfaceresult.Success)
{
LogExecute.logNet.WriteError($"请求仓位时调用WMS接口失败,任务号{taskresur.tNo},高度{vM_StationDR.Height},错误原因{interfaceresult.Msg}");
return BllResult.Error(); ;
}
BaseDal<I_Task> _baseDal = new BaseDal<I_Task>();
Dictionary<string, object> lstColumnValues = new Dictionary<string, object>();
lstColumnValues.Add("ExitPlace", interfaceresult.Data.LocationCode);
var updatewarecell = _baseDal.Update(lstColumnValues, a => a.tNo == taskresur.tNo);
if (updatewarecell.Success)
{
LogExecute.logNet.WriteError($"请求仓位时更新数据库失败,任务号{taskresur.tNo},高度{vM_StationDR.Height},错误原因{updatewarecell.Msg}");
return BllResult.Error(); ;
}
taskresur.ExitPlace = interfaceresult.Data.LocationCode;
}
BaseDal<I_Task> baseDal = new BaseDal<I_Task>();
baseDal.BeginTran();
@@ -98,7 +118,7 @@ namespace WCS_YongFeng
}
else if (device.Type == "OutStation")
{
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.响应中转站台地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.中间站台地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
if (taskresur != null)
{
//var topose = App.poseList.FirstOrDefault(a => a.wcName == taskresur.ToPlace);
@@ -25,7 +25,7 @@ namespace WCS_YongFeng
LogExecute.logNet.WriteDebug($"收到{device.Name}站台地址到达,托盘号{pallet},读码器编号{vM_StationPR.ScannerNr}");
if (device.Type == "InStation")
{
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.入库.GetIndexString() && a.NextState == E_TaskState.响应中转站台地址到达.GetIndexInt() && a.PalletOrBoxNo == pallet);
var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.入库.GetIndexString() && a.NextState == E_TaskState.中间站台地址到达.GetIndexInt() && a.PalletOrBoxNo == pallet);
if (taskresur != null)
{
vM_StationACK.MessageID = 8;
@@ -64,7 +64,7 @@ namespace WCS_YongFeng
}
else if (device.Type == "Exit")
{
var _taskresur = App.taskList.ToList().FindAll(a => a.PalletOrBoxNo == vM_StationPR.PalletID && a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.响应出入口地址到达.GetIndexInt()).OrderBy(a => a.Task_StartTime).ToList();
var _taskresur = App.taskList.ToList().FindAll(a => a.PalletOrBoxNo == vM_StationPR.PalletID && a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.出入口地址到达.GetIndexInt()).OrderBy(a => a.Task_StartTime).ToList();
if (_taskresur != null && _taskresur.Count > 0)
{
var taskresur = _taskresur[0];
@@ -92,9 +92,9 @@ namespace WCS_YongFeng
/// </summary>
/// <param name="reqTask"></param>
/// <returns></returns>
public static BllResult FinishTask(ReqTaskFinish reqTask)
public static BllResult<ResWareCellAllocation> FinishTask(ReqTaskFinish reqTask)
{
return FormPost(reqTask, "/ReturnStatus");
return FormPost<ResWareCellAllocation>(reqTask, "/ReturnStatus");
}
/// <summary>