czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加耗材功能

This commit is contained in:
韩鹏辉 2024-06-28 09:44:35 +08:00
parent 020975e8b4
commit 3e1ef9c5f2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@ -74,7 +74,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
resources.setConTypeName(tbConsType.getConTypeName());
resources.setLasterInStock(BigDecimal.ZERO);
resources.setSurplusStock(BigDecimal.ZERO);
resources.setStockNumber(BigDecimal.ZERO);
resources.setCreateTime(new Timestamp(System.currentTimeMillis()));
return tbConsInfoMapper.toDto(tbConsInfoRepository.save(resources));
@ -85,8 +84,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
public void update(TbConsInfo resources) {
TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resources.getId()).orElseGet(TbConsInfo::new);
ValidationUtil.isNull( tbConsInfo.getId(),"TbConsInfo","id",resources.getId());
tbConsInfo.setSurplusStock(resources.getSurplusStock());
tbConsInfoRepository.save(tbConsInfo);
}
@ -108,7 +105,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
map.put("耗材名称", tbConsInfo.getConName());
map.put("库存值", tbConsInfo.getStockNumber());
map.put("单位值", tbConsInfo.getConUnit());
map.put("剩余库存", tbConsInfo.getSurplusStock());
map.put("最近一次入库量", tbConsInfo.getLasterInStock());
map.put("创建时间", tbConsInfo.getCreateTime());
map.put("耗材预警值",tbConsInfo.getConWarning());

10
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.ysk.cashier.cons.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.ysk.cashier.cons.domain.TbProskuCon;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.PageUtil;
@ -73,7 +74,14 @@ public class TbProskuConServiceImpl implements TbProskuConService {
public void update(TbProskuCon resources) {
TbProskuCon tbProskuCon = tbProskuConRepository.findById(resources.getId()).orElseGet(TbProskuCon::new);
ValidationUtil.isNull( tbProskuCon.getId(),"TbProskuCon","id",resources.getId());
tbProskuCon.copy(resources);
if(ObjectUtil.isNotEmpty(resources.getStatus())){
tbProskuCon.setStatus("1");
}
if(ObjectUtil.isNotEmpty(resources.getSurplusStock())){
tbProskuCon.setSurplusStock(resources.getSurplusStock());
}
tbProskuConRepository.save(tbProskuCon);
}