ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化库位冲突问题

Browse Source 
2.优化PDA文字提示
This commit is contained in:
hehaibing-1996
2025-03-25 14:54:58 +08:00
parent 6fc9236e55
commit 43b34b7980
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PDA/PDA/pages/allBindQuery/allBindQuery.vue
View File

@ -220,6 +220,10 @@
duration: 3000 duration: 3000
}); });
this.clear(); this.clear();
this.shelfCode = '';
this.locationCode = '';
return; return;
} }
//有物料信息 //有物料信息
@ -275,7 +279,7 @@
//清空当前界面所有内容 //清空当前界面所有内容
clear: function() { clear: function() {
this.placeholderText = '请先扫描货架码'; this.placeholderText = '输入物料编码搜索';
this.cardData = null; this.cardData = null;
this.recordCount = 0; this.recordCount = 0;
}, },

6
PDA/PDA/unpackage/dist/dev/app-plus/app-service.js vendored
View File

@ -6614,6 +6614,8 @@ if (uni.restoreGlobal) {
duration: 3e3 duration: 3e3
}); });
this.clear(); this.clear();
this.shelfCode = "";
this.locationCode = "";
return; return;
} }
this.cardData = res.data.data.lists; this.cardData = res.data.data.lists;
@ -6651,13 +6653,13 @@ if (uni.restoreGlobal) {
this.clear(); this.clear();
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:269", "请求完成", event); formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:273", "请求完成", event);
} }
}); });
}, },
//清空当前界面所有内容 //清空当前界面所有内容
clear: function() { clear: function() {
this.placeholderText = "请先扫描货架码"; this.placeholderText = "输入物料编码搜索";
this.cardData = null; this.cardData = null;
this.recordCount = 0; this.recordCount = 0;
}, },

2
WCS.BLL/Services/Service/PDAMatBindService.cs
View File

@ -266,7 +266,7 @@ namespace WCS.BLL.Services.Service
#endregion #endregion
var endLocation = await DbHelp.db.Queryable<LocationInfo>() var endLocation = await DbHelp.db.Queryable<LocationInfo>()
.LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
.Where((li, si) => li.LocationAreaId == request.SendBackLocationAreaId) .Where((li, si) => li.LocationAreaId == request.SendBackLocationAreaId)
.Where((li, si) => li.IsEnable == true) .Where((li, si) => li.IsEnable == true)
.Where((li, si) => li.Id != shelf.CurrentLocationId) .Where((li, si) => li.Id != shelf.CurrentLocationId)

2
WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs
View File

@ -377,7 +377,7 @@ namespace WCS.WebApi.Controllers
//根据选择的区域信息获取终点 //根据选择的区域信息获取终点
var endLocation = await DbHelp.db.Queryable<LocationInfo>() var endLocation = await DbHelp.db.Queryable<LocationInfo>()
.LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中)) .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
.Where((li, si) => li.LocationAreaId == request.DestinationLocationAreaId) .Where((li, si) => li.LocationAreaId == request.DestinationLocationAreaId)
.Where((li, si) => li.IsEnable == true) .Where((li, si) => li.IsEnable == true)
.Where((li, si) => li.Id != shelfInfo.CurrentLocationId) .Where((li, si) => li.Id != shelfInfo.CurrentLocationId)

BIN
版本履历表.xlsx
View File

Binary file not shown.