修改物资跟踪管理台账查询列表修改
This commit is contained in:
@ -668,11 +668,13 @@ public class MatMaterialsServiceImpl extends ServiceImpl<MatMaterialsMapper, Mat
|
|||||||
BeanUtils.copyProperties(material, vo);
|
BeanUtils.copyProperties(material, vo);
|
||||||
Long id = material.getId();
|
Long id = material.getId();
|
||||||
MatMaterialsInventory put = putMap.get(id);
|
MatMaterialsInventory put = putMap.get(id);
|
||||||
|
if (put != null) {
|
||||||
vo.setSupplier(put.getRecipient());
|
vo.setSupplier(put.getRecipient());
|
||||||
vo.setInventoryId(put.getId());
|
vo.setInventoryId(put.getId());
|
||||||
vo.setNumber(put.getNumber());
|
vo.setNumber(put.getNumber());
|
||||||
vo.setOperator(put.getOperator());
|
vo.setOperator(put.getOperator());
|
||||||
vo.setEnterTime(put.getCreateTime());
|
vo.setEnterTime(put.getCreateTime());
|
||||||
|
}
|
||||||
if (CollUtil.isNotEmpty(outList)) {
|
if (CollUtil.isNotEmpty(outList)) {
|
||||||
List<MatMaterialsInventory> outs = outList.stream()
|
List<MatMaterialsInventory> outs = outList.stream()
|
||||||
.filter(inventory -> inventory.getMaterialsId().equals(id))
|
.filter(inventory -> inventory.getMaterialsId().equals(id))
|
||||||
|
|||||||
Reference in New Issue
Block a user