diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs index 6810e155..84e27a2c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs @@ -521,10 +521,14 @@ namespace Tnb.WarehouseMgr public async Task TaskCallback(TaskCallBackInput input) { var disTask = await _db.Queryable().FirstAsync(it => it.bill_code == input.taskCode); - + /* 20240627 记录异常情况: WCS给我们发取货完成信号之后,如果我们返回了异常 WCS会一直重试20次,但是AGV已经取货走了,并成功送到库位,此时会给我们反馈放货信号, * 但是由于取货信号一直返回异常,WCS还是会一直重试,会出现我们收到到货信号后又会收到取货信号的异常情况,这里加个任务执行状态判断,用于避免这种情况 */ + //if (disTask.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID) + //{ + // return await ToApiResult(HttpStatusCode.OK, "此任务"); + //} Logger.Information($"【TaskCallback】 【接收】{input.taskCode} WCS信号 任务状态上报->接收参数:{JsonConvert.SerializeObject(input)}"); try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index 0c9d4189..ecaf586e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -231,7 +231,7 @@ namespace Tnb.WarehouseMgr Logger.LogError($"【CarryCodeUnbind】 {ex.StackTrace}"); return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); } - return Task.FromResult(true); + return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, "成功"); } } }