From 43b34b79802fc9c62ccc4fd63408e1944d00bd6b Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Tue, 25 Mar 2025 14:54:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=BA=93=E4=BD=8D=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.优化PDA文字提示 --- PDA/PDA/pages/allBindQuery/allBindQuery.vue | 6 +++++- .../dist/dev/app-plus/app-service.js | 6 ++++-- WCS.BLL/Services/Service/PDAMatBindService.cs | 2 +- .../PDAProductionLineCallOutController.cs | 2 +- 版本履历表.xlsx | Bin 11364 -> 11392 bytes 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PDA/PDA/pages/allBindQuery/allBindQuery.vue b/PDA/PDA/pages/allBindQuery/allBindQuery.vue index 4e43c59..c27e815 100644 --- a/PDA/PDA/pages/allBindQuery/allBindQuery.vue +++ b/PDA/PDA/pages/allBindQuery/allBindQuery.vue @@ -220,6 +220,10 @@ duration: 3000 }); this.clear(); + + this.shelfCode = ''; + this.locationCode = ''; + return; } //有物料信息 @@ -275,7 +279,7 @@ //清空当前界面所有内容 clear: function() { - this.placeholderText = '请先扫描货架码'; + this.placeholderText = '输入物料编码搜索'; this.cardData = null; this.recordCount = 0; }, 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 bccc353..276eea8 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -6614,6 +6614,8 @@ if (uni.restoreGlobal) { duration: 3e3 }); this.clear(); + this.shelfCode = ""; + this.locationCode = ""; return; } this.cardData = res.data.data.lists; @@ -6651,13 +6653,13 @@ if (uni.restoreGlobal) { this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:269", "请求完成", event); + formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:273", "请求完成", event); } }); }, //清空当前界面所有内容 clear: function() { - this.placeholderText = "请先扫描货架码"; + this.placeholderText = "输入物料编码搜索"; this.cardData = null; this.recordCount = 0; }, diff --git a/WCS.BLL/Services/Service/PDAMatBindService.cs b/WCS.BLL/Services/Service/PDAMatBindService.cs index f29235d..b7fce3c 100644 --- a/WCS.BLL/Services/Service/PDAMatBindService.cs +++ b/WCS.BLL/Services/Service/PDAMatBindService.cs @@ -266,7 +266,7 @@ namespace WCS.BLL.Services.Service #endregion var endLocation = await DbHelp.db.Queryable() - .LeftJoin((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) + .LeftJoin((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) .Where((li, si) => li.LocationAreaId == request.SendBackLocationAreaId) .Where((li, si) => li.IsEnable == true) .Where((li, si) => li.Id != shelf.CurrentLocationId) diff --git a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs index 20f2f76..4262d91 100644 --- a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs +++ b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs @@ -377,7 +377,7 @@ namespace WCS.WebApi.Controllers //根据选择的区域信息获取终点 var endLocation = await DbHelp.db.Queryable() - .LeftJoin((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) + .LeftJoin((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) .Where((li, si) => li.LocationAreaId == request.DestinationLocationAreaId) .Where((li, si) => li.IsEnable == true) .Where((li, si) => li.Id != shelfInfo.CurrentLocationId) diff --git a/版本履历表.xlsx b/版本履历表.xlsx index e432b44e29038abe086c84e7944a558478cfb59f..4224a7ea46160cbe2c3bb33184cd3e43b4b2a66a 100644 GIT binary patch delta 2072 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 PyOU2WD+VYh00000@k6(P