From 425e388128ba159fb9ff714d6bde24caa25e85ef Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 18:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 6f4e4ff..e9480d5 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -273,7 +273,6 @@
goodsSkuIdList = page1.stream().map(SlGoodsMaterials::getId)
.collect(Collectors.toSet());
-
Page<SlVolumeProductionRk> page = new Page<>(gethuojRkQuery.getPageCurr(), gethuojRkQuery.getPageSize());
LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
if (gethuojRkQuery.getGoodsMaterialsName()!=null&&gethuojRkQuery.getGoodsMaterialsName()!=""){
@@ -285,6 +284,7 @@
wrapper1.in(SlVolumeProductionRk::getMaterialsId, goodsSkuIdList);
}
}
+ wrapper1.eq(SlVolumeProductionRk::getShelfId,gethuojRkQuery.getGoodsShelid());
wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
@@ -298,8 +298,11 @@
wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
-
- list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(managementGoodsMaterials.getRepertorySum())));
+ if (managementGoodsMaterials != null){
+ list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(managementGoodsMaterials.getRepertorySum())));
+ }else{
+ list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(1)));
+ }
list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
--
Gitblit v1.7.1