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

修改预验收库存等

Browse Source
busUser
anthonywj 2 years ago
parent 240cfb9927
commit d815da0c40
3 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File

16
api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java
Unescape Escape View File

@ -74,10 +74,16 @@ public class LoginController {
if (authAdmin == null) { if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
if (StrUtil.isEmpty(loginRequest.getImei())) {
if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.md5().digestHex(authAdmin.getPassWord()))) { if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.md5().digestHex(authAdmin.getPassWord()))) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
}
} else {
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, "该用户已被禁用！");
} }
@ -117,8 +123,8 @@ public class LoginController {
loginResponse.setToken(token); loginResponse.setToken(token);
loginResponse.setDept(authAdmin.getDept()); loginResponse.setDept(authAdmin.getDept());
loginResponse.setDeptName(authAdmin.getDeptName()); loginResponse.setDeptName(authAdmin.getDeptName());
loginResponse.setNeedChangePwd(cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date():authAdmin.getLastUpdatePwdTime() loginResponse.setNeedChangePwd(cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime()
, cn.hutool.core.date.DateUtil.date(), DateUnit.DAY)>=90); , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90);
return ResultVOUtils.success(loginResponse); return ResultVOUtils.success(loginResponse);
} }

82
api-admin/src/main/java/com/glxp/api/admin/controller/inout/IoCodeLostController.java
Unescape Escape View File

@ -58,47 +58,47 @@ public class IoCodeLostController {
} }
@PostMapping("warehouse/inout/saveTabCode") // @PostMapping("warehouse/inout/saveTabCode")
public BaseResponse saveCode(@RequestBody WarehouseEntity codeTempEntity) { // public BaseResponse saveCode(@RequestBody WarehouseEntity codeTempEntity) {
//
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) { // if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) {
return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存"); // return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存");
} // }
//
if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) { // if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) {
return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存"); // return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存");
} // }
//
if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) { // if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) {
return ResultVOUtils.error(500, "批次号不能为空！，不予缓存"); // return ResultVOUtils.error(500, "批次号不能为空！，不予缓存");
} // }
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { // if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
return ResultVOUtils.error(500, "有序列号不予缓存"); // return ResultVOUtils.error(500, "有序列号不予缓存");
} // }
//
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode()); // IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode());
IoCodeLostEntity insertEntity = null; // IoCodeLostEntity insertEntity = null;
if (codeLostEntity == null) { // if (codeLostEntity == null) {
insertEntity = new IoCodeLostEntity(); // insertEntity = new IoCodeLostEntity();
insertEntity.setCreateTime(new Date()); // insertEntity.setCreateTime(new Date());
} else { // } else {
insertEntity = codeLostEntity; // insertEntity = codeLostEntity;
} // }
insertEntity.setCode(codeTempEntity.getCode()); // insertEntity.setCode(codeTempEntity.getCode());
insertEntity.setBatchNo(codeTempEntity.getBatchNo()); // insertEntity.setBatchNo(codeTempEntity.getBatchNo());
insertEntity.setProduceDate(codeTempEntity.getProduceDate()); // insertEntity.setProduceDate(codeTempEntity.getProduceDate());
insertEntity.setExpireDate(codeTempEntity.getExpireDate()); // insertEntity.setExpireDate(codeTempEntity.getExpireDate());
insertEntity.setSerialNo(codeTempEntity.getSerialNo()); // insertEntity.setSerialNo(codeTempEntity.getSerialNo());
insertEntity.setSupId(codeTempEntity.getSupId()); // insertEntity.setSupId(codeTempEntity.getSupId());
insertEntity.setUpdateTime(new Date()); // insertEntity.setUpdateTime(new Date());
//
if (codeLostEntity != null) { // if (codeLostEntity != null) {
codeLostService.update(insertEntity); // codeLostService.update(insertEntity);
} else { // } else {
codeLostService.insert(insertEntity); // codeLostService.insert(insertEntity);
} // }
return ResultVOUtils.success("修改成功！"); // return ResultVOUtils.success("修改成功！");
} // }
//获取验收单据业务详情 //获取验收单据业务详情

7
api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -944,13 +944,6 @@ public class IoTransInoutService {
invPreinDetailEntity.setCount(count); invPreinDetailEntity.setCount(count);
invPreInProductDetailService.updateInvProduct(invPreinDetailEntity); invPreInProductDetailService.updateInvProduct(invPreinDetailEntity);
} }
int reCount = invPreinDetailEntity.getCount() - codeEntity.getCount();
if (reCount == 0) {
invPreInProductDetailService.deleteByCode(key, codeEntity.getCode());
} else {
invPreinDetailEntity.setCount(reCount);
invPreInProductDetailService.updateInvProduct(invPreinDetailEntity);
}
} }
} }

Write Preview
Loading…
Cancel
Save