diff --git a/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue b/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue index 8ba56a4..4a0e7e0 100644 --- a/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue +++ b/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue @@ -399,7 +399,7 @@ uni.showToast({ title: '获取失败:' + res.data.message, icon: 'none', - duration: 3500 + duration: 3900 }); } diff --git a/PDA/PDA/pages/queryBindList/queryBindList.vue b/PDA/PDA/pages/queryBindList/queryBindList.vue index 93cd996..52fec81 100644 --- a/PDA/PDA/pages/queryBindList/queryBindList.vue +++ b/PDA/PDA/pages/queryBindList/queryBindList.vue @@ -499,6 +499,7 @@ icon: 'none', duration: 1500 }); + this.clear(); return; } //有物料信息 diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js index c5afd2d..9f5bc3c 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -3127,6 +3127,7 @@ if (uni.restoreGlobal) { icon: "none", duration: 1500 }); + this.clear(); return; } this.cardData = res.data.data.lists; @@ -3162,7 +3163,7 @@ if (uni.restoreGlobal) { this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:543", "请求完成", event); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:544", "请求完成", event); } }); }, @@ -4690,7 +4691,7 @@ if (uni.restoreGlobal) { uni.showToast({ title: "获取失败:" + res.data.message, icon: "none", - duration: 3500 + duration: 3900 }); } this.clear(); diff --git a/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs b/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs index e078ed9..f0558ae 100644 --- a/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs +++ b/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs @@ -158,7 +158,7 @@ namespace WCS.WebApi.Controllers return new ResponseCommon() { Code = 301, - Message = $"当前工位[{locationInfo.LocationCode}]\r\n已被货架[{shelfInfo.ShelfCode}]占用\r\n无法通过此功能进行呼叫!", + Message = $"当前工位[{locationInfo.LocationCode}]\r\n已被货架[{shelfInfo.ShelfCode}]占用\r\n请等待AGV运输!", Data = null, }; }