diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java index 27b5edb..70d178a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.service.storagemat; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; @@ -26,6 +27,7 @@ import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -245,7 +247,13 @@ public class StorageMatServiceImpl implements StorageMatService { queryWrapper.eq(StorageLogNowDO::getRgId,storageMatDO.getRgId()); } StorageLogNowDO storageLogNowDO = storageLogNowMapper.selectOne(queryWrapper); - storageMatDO.setMatRest(storageLogNowDO.getStorageOkQty()); + if (ObjectUtil.isNotEmpty(storageLogNowDO)){ + storageMatDO.setMatRest(storageLogNowDO.getStorageOkQty()); + }else { + storageMatDO.setMatRest(new BigDecimal(0)); + } + + // if(storageMatDO.getProjectSubName()!=null && !storageMatDO.getProjectSubName().equals("")){ // if(subNameMap.get(storageMatDO.getProjectNo())!=null){ // storageMatDO.setProjectSubName(subNameMap.get(storageMatDO.getProjectNo()));