Merge branch 'ww' into test
This commit is contained in:
@@ -86,7 +86,7 @@ public class TbConCheckServiceImpl implements TbConCheckService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
consInfo.setStockConsume(BigDecimal.ZERO);
|
consInfo.setStockConsume(BigDecimal.ZERO);//消耗总量
|
||||||
consInfo.setStockNumber(resources.getStockNumber());
|
consInfo.setStockNumber(resources.getStockNumber());
|
||||||
consInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
|
consInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
|
||||||
tbConsInfoRepository.save(consInfo);
|
tbConsInfoRepository.save(consInfo);
|
||||||
@@ -97,10 +97,11 @@ public class TbConCheckServiceImpl implements TbConCheckService {
|
|||||||
flow.setConsId(consInfo.getId());
|
flow.setConsId(consInfo.getId());
|
||||||
flow.setShopId(consInfo.getShopId());
|
flow.setShopId(consInfo.getShopId());
|
||||||
flow.setConName(consInfo.getConName());
|
flow.setConName(consInfo.getConName());
|
||||||
flow.setAmount(consInfo.getStockNumber());
|
flow.setAmount(resources.getLpNum());
|
||||||
flow.setBalance(consInfo.getStockNumber());
|
flow.setBalance(resources.getStockNumber());
|
||||||
flow.setOperator(SecurityUtils.getCurrentUsername());
|
flow.setOperator(SecurityUtils.getCurrentUsername());
|
||||||
flow.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
flow.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
||||||
|
flow.setRemark(resources.getRemark());
|
||||||
tbConsInfoFlowRepository.save(flow);
|
tbConsInfoFlowRepository.save(flow);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user