完善同入同出逻辑

This commit is contained in:
bnala committed 2025-10-31 22:38:35 +08:00
1 parent 6cd6f7c5d0
commit bd6bed3e7b
2 files changed
+30 -1

No files matched your search

@@ -106,7 +106,16 @@ 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();
List<I_Task> TAllTask = App.taskList.ToList().FindAll(a => a.NextState == E_TaskState.下发堆垛机取货任务.GetIndexInt() &&
(
a.Type == E_TaskType.入库.GetIndexString() ///查找所有入库任务
||
(a.Type == E_TaskType.出库.GetIndexString() && !App.taskList.ToList().Exists(x => x.EntrancePlace == a.ExitPlace))///查找没有入库的出库任务
)
).OrderBy(a => a.tNo).ToList();
if (TAllTask.Count != 0 && TAllTask != null)
{
var sendResult = SendTask(TAllTask[0]);
@@ -68,6 +68,26 @@ namespace WCS_YongFeng
return BllResult.Sucess();
}
if (App.taskList.Any(a => a.ExitPlace == "EnterExit_P" + device.BackPoint))
{
vM_StationDACK.MessageID = 6;
vM_StationDACK.LoadingStatus = 1;
vM_StationDACK.ScannerNr = vM_StationDR.ScannerNr;
vM_StationDACK.PalletID = vM_StationDR.PalletID;
vM_StationDACK.DeStation = device.BackPoint;
var sendtask_send = this.PutWriteAddress();
if (sendtask_send.Success)
{
LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址回退成功,托盘号{vM_StationDR.PalletID} ,目的地{vM_StationDACK.DeStation}");
return BllResult.Sucess();
}
LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,已存在出库任务");
return BllResult.Sucess();
}
BaseDal<I_Task> baseDal = new BaseDal<I_Task>();
baseDal.BeginTran();
// 传入重量,更新到任务表中,任务完成的时候回传到WMS