UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手持终端登录，审核等问题修改

Browse Source
dev2.0
anthonywj 2 years ago
parent 5f3aca56b2
commit a7c709c2e7
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -150,10 +150,12 @@ public class LoginController extends BaseController {
if (authAdmin == null) { if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) {
if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
// if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
// throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
// }
if (authAdmin.getUserFlag() == 0) { if (authAdmin.getUserFlag() == 0) {
throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！"); throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
} }

42
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -272,29 +272,29 @@ public class IoOrderReviewController extends BaseController {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
return ResultVOUtils.error(500, "单据已验收！"); return ResultVOUtils.error(500, "单据已验收！");
} }
if (updateExportStatusRequest.isEntrust() && updateExportStatusRequest.getEntrustId() != null) { if (updateExportStatusRequest.isEntrust()) {
EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId()); // EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
if (entrustReceEntity == null) { // if (entrustReceEntity == null) {
return ResultVOUtils.error(500, "无验收权限！"); // return ResultVOUtils.error(500, "无验收权限！");
} else { // } else {
EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId());
if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) { if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
transferOrder(orderEntity, entrustReceEntity); transferOrder(orderEntity, entrustReceEntity);
}
}
if (!entrustReceEntity.getFinishRece()) {
redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
return ResultVOUtils.success("验收成功！");
} else {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);
log.error("更新外网验收状态");
updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
return updateReview(authAdmin, orderEntity);
} }
} }
if (!entrustReceEntity.getFinishRece()) {
redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
return ResultVOUtils.success("验收成功！");
} else {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);
log.error("更新外网验收状态");
updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
return updateReview(authAdmin, orderEntity);
}
// }
} else { } else {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest(); ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest); BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);

Write Preview
Loading…
Cancel
Save