diff --git a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs index d33d724..9f3ae53 100644 --- a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs +++ b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs @@ -46,7 +46,7 @@ namespace WCS_YongFeng var sendtask_send = this.PutWriteAddress(); if (sendtask_send.Success) { - LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址回退成功,托盘号{vM_StationDR.PalletID} ,目的地1003"); + LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址回退成功,托盘号{vM_StationDR.PalletID} ,目的地{vM_StationDACK.DeStation}"); return BllResult.Sucess(); } @@ -60,12 +60,12 @@ 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(); - } + //var pose = App.poseList.FirstOrDefault(a => a.Station == device.Point); + //if (pose == null) + //{ + // LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,未找站台对应的坐标"); + // return BllResult.Sucess(); + //} BaseDal baseDal = new BaseDal(); baseDal.BeginTran(); @@ -78,7 +78,7 @@ namespace WCS_YongFeng { baseDal.CommitTran(); _bll.NextStateChangeCache(taskresur); - LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址请求成功,托盘号{vM_StationDR.PalletID}"); + LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址请求成功,托盘号{vM_StationDR.PalletID},目的地{vM_StationDACK.DeStation}"); return BllResult.Sucess(); } else @@ -101,12 +101,12 @@ namespace WCS_YongFeng 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); - if (topose == null) - { - LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(未找到坐标),托盘号{vM_StationDR.PalletID},坐标{taskresur.ToPlace}"); - return BllResult.Error(); - } + //var topose = App.poseList.FirstOrDefault(a => a.wcName == taskresur.ToPlace); + //if (topose == null) + //{ + // LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(未找到坐标),托盘号{vM_StationDR.PalletID},坐标{taskresur.ToPlace}"); + // return BllResult.Error(); + //} vM_StationDACK.MessageID = 6; vM_StationDACK.LoadingStatus = 1; @@ -125,20 +125,20 @@ namespace WCS_YongFeng { baseDal.CommitTran(); _bll.NextStateChangeCache(taskresur); - LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址请求成功,托盘号{vM_StationDR.PalletID},目的地{topose.Station}"); + LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址请求成功,托盘号{vM_StationDR.PalletID},目的地{vM_StationDACK.DeStation}"); return BllResult.Sucess(); } else { baseDal.RollbackTran(); - LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(发送异常),托盘号{vM_StationDR.PalletID},目的地{topose.Station},错误{sendtask_send.Msg}"); + LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(发送异常),托盘号{vM_StationDR.PalletID},目的地{vM_StationDACK.DeStation},错误{sendtask_send.Msg}"); return BllResult.Error(); } } else { baseDal.RollbackTran(); - LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(写入异常),托盘号{vM_StationDR.PalletID},目的地{topose.Station},错误{updateresult.Msg}"); + LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败(写入异常),托盘号{vM_StationDR.PalletID},目的地{vM_StationDACK.DeStation},错误{updateresult.Msg}"); return BllResult.Error(); } }