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

送回时判断位置是否可以送回

Browse Source
This commit is contained in:
hehaibing-1996
2025-03-04 19:57:53 +08:00
parent 653cf80f0c
commit 4ce1396642
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PDA/PDA/config.js
View File

@ -10,7 +10,7 @@ export function getConfig(key, defaultValue) {
} }
export function getServerIPAndPort() { export function getServerIPAndPort() {
var serverIP = getConfig('serverIP', '192.168.18.153'); var serverIP = getConfig('serverIP', '192.168.18.200');
var serverPort = getConfig('serverPort', '8888'); var serverPort = getConfig('serverPort', '8888');
return serverIP + ':' + serverPort; return serverIP + ':' + serverPort;
} }

2
PDA/PDA/pages/config/config.vue
View File

@ -31,7 +31,7 @@
}; };
}, },
onLoad:function() { onLoad:function() {
this.serverIP = getConfig('serverIP', '192.168.18.153'); this.serverIP = getConfig('serverIP', '192.168.18.200');
this.serverPort = getConfig('serverPort', '8888'); this.serverPort = getConfig('serverPort', '8888');
}, },
methods: { methods: {

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

@ -147,7 +147,7 @@ if (uni.restoreGlobal) {
return uni.getStorageSync(key) || defaultValue; return uni.getStorageSync(key) || defaultValue;
} }
function getServerIPAndPort() { function getServerIPAndPort() {
var serverIP = getConfig("serverIP", "192.168.18.153"); var serverIP = getConfig("serverIP", "192.168.18.200");
var serverPort = getConfig("serverPort", "8888"); var serverPort = getConfig("serverPort", "8888");
return serverIP + ":" + serverPort; return serverIP + ":" + serverPort;
} }
@ -332,7 +332,7 @@ if (uni.restoreGlobal) {
}; };
}, },
onLoad: function() { onLoad: function() {
this.serverIP = getConfig("serverIP", "192.168.18.153"); this.serverIP = getConfig("serverIP", "192.168.18.200");
this.serverPort = getConfig("serverPort", "8888"); this.serverPort = getConfig("serverPort", "8888");
}, },
methods: { methods: {

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

@ -203,6 +203,7 @@ namespace WCS.BLL.Services.Service
.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)
.Where((li, si) => si.Id == null)
.Select((li, si) => li) .Select((li, si) => li)
.FirstAsync(); .FirstAsync();
if (endLocation == null) if (endLocation == null)

4
WCS.BLL/Services/Service/UserService.cs
View File

@ -119,7 +119,7 @@ namespace WCS.BLL.Services.Service
{ {
var newUser = new UserBase() var newUser = new UserBase()
{ {
LoginName = request.User.LoginName, LoginName = request.User.LoginName.ToLower(),
Password = request.User.Password, Password = request.User.Password,
RoleIds = request.User.RoleIds, RoleIds = request.User.RoleIds,
IsAdmin = request.User.IsAdmin, IsAdmin = request.User.IsAdmin,
@ -452,7 +452,7 @@ namespace WCS.BLL.Services.Service
//#endregion //#endregion
if (user == null) if (user == null)
user = await AuthDbHelp.db.Queryable<UserBase>() user = await AuthDbHelp.db.Queryable<UserBase>()
.Where(t => t.LoginName == request.UserName) .Where(t => t.LoginName == request.UserName.ToLower())
.FirstAsync(); .FirstAsync();
if (user == null) if (user == null)
{ {

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

@ -377,6 +377,8 @@ namespace WCS.WebApi.Controllers
.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 && si.TransStatus == TransStatusEnum.静止) || (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) => si.Id == null)
.Select((li, si) => li) .Select((li, si) => li)
.FirstAsync(); .FirstAsync();
if (endLocation == null) if (endLocation == null)