From 4751d4b8777cf9e6aedec9d05d225295f42977a7 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 10 Jan 2025 15:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E4=BB=93=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/service/storagemat/StorageMatServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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()));