|
|
|
@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
|
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.util.*; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
@ -246,7 +247,7 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe |
|
|
|
LdConsumerForm consumerForm = consumerFormService.getByMaterialId(groupMaterialVO.getMaterialId(), departmentId); |
|
|
|
LdConsumerForm consumerForm = consumerFormService.getByMaterialId(groupMaterialVO.getMaterialId(), departmentId); |
|
|
|
if(null != consumerForm){ |
|
|
|
if(null != consumerForm){ |
|
|
|
BeanUtils.copyProperties(consumerForm, ldTwoInventoryVO); |
|
|
|
BeanUtils.copyProperties(consumerForm, ldTwoInventoryVO); |
|
|
|
ldTwoInventoryVO.setInventory(consumerForm.getNum()); |
|
|
|
ldTwoInventoryVO.setInventory(consumerForm.getNum().setScale(0, RoundingMode.DOWN)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//耐用
|
|
|
|
//耐用
|
|
|
|
@ -255,7 +256,7 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe |
|
|
|
.map(form -> { |
|
|
|
.map(form -> { |
|
|
|
LdTwoInventoryVO vo = new LdTwoInventoryVO(); |
|
|
|
LdTwoInventoryVO vo = new LdTwoInventoryVO(); |
|
|
|
BeanUtils.copyProperties(form, vo); |
|
|
|
BeanUtils.copyProperties(form, vo); |
|
|
|
vo.setInventory(form.getNum()); |
|
|
|
vo.setInventory(form.getNum().setScale(0, RoundingMode.DOWN)); |
|
|
|
return vo; |
|
|
|
return vo; |
|
|
|
}) |
|
|
|
}) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|