From 2a9b952d21b3ef9cf63e4618a8e5afdf8a5f32bc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 19 九月 2025 09:17:23 +0800
Subject: [PATCH] 拉卡拉支付
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
index 49a3e7b..254a3e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
@@ -89,6 +89,8 @@
if(list.isEmpty()){
return pageInfo;
}
+
+
List<String> typeIds = list.stream().map(TErpGoods::getTypeId).collect(Collectors.toList());
if(!typeIds.isEmpty()){
List<TErpGoodsType> typeList = erpGoodsTypeMapper.selectBatchIds(typeIds);
@@ -173,6 +175,7 @@
}
tErpGoodsWarehouseLastVO.setAllNum(tErpGoodsWarehouseVOS.stream().mapToInt(TErpGoodsWarehouseVO::getNowNum).sum());
tErpGoodsWarehouseLastVO.setAllTotalPrice(tErpGoodsWarehouseVOS.stream().mapToDouble(TErpGoodsWarehouseVO::getUnitAmount).sum());
+ tErpGoodsWarehouseLastVO.setAllTotalPrice(BigDecimal.valueOf(tErpGoodsWarehouseLastVO.getAllTotalPrice()).setScale(2,RoundingMode.HALF_UP).doubleValue());
tErpGoodsWarehouseLastVO.setList(tErpGoodsWarehouseVOS);
tErpGoodsWarehouseLastVO.setWarningInventory(goods.getWarningInventory());
tErpGoodsWarehouseLastVOS.add(tErpGoodsWarehouseLastVO);
@@ -277,11 +280,14 @@
tErpSupplierWarehousing.setGoodsId(dto.getGoodsId());
TErpGoods goods = erpGoodsMapper.selectById(dto.getGoodsId());
tErpSupplierWarehousing.setGoodsName(goods.getGoodsName());
- tErpSupplierWarehousing.setGoodsCount(tErpSupplierWarehousing.getGoodsCount());
- tErpSupplierWarehousing.setUnitAmount(tErpSupplierWarehousing.getUnitAmount());
- tErpSupplierWarehousing.setTotalPrice(tErpSupplierWarehousing.getTotalPrice());
- erpSupplierWarehousingMapper.insert(tErpSupplierWarehousing);
+ tErpSupplierWarehousing.setGoodsCount(dto.getWarehousingNum());
+ tErpSupplierWarehousing.setUnitAmount(dto.getPrice());
+ tErpSupplierWarehousing.setTotalPrice(dto.getTotalPrice());
List<WarehousingGoodsNextDto> warehousingGoodsNextDtos = dto.getWarehousingGoodsNextDtos();
+ int sum = warehousingGoodsNextDtos.stream().mapToInt(WarehousingGoodsNextDto::getWarehousingNum).sum();
+ tErpSupplierWarehousing.setGoodsCount( sum);
+ erpSupplierWarehousingMapper.insert(tErpSupplierWarehousing);
+
for (WarehousingGoodsNextDto warehousingGoodsNextDto : warehousingGoodsNextDtos) {
TErpSupplierWarehousingBatch tErpSupplierWarehousingBatch = new TErpSupplierWarehousingBatch();
tErpSupplierWarehousingBatch.setWarehousingId(tErpSupplierWarehousing.getId());
@@ -503,11 +509,11 @@
throw new ServiceException("批次号："+tErpSupplierWarehousingBatch.getBatchNumber()+"库存不足");
}
TErpSupplierWarehousing tErpSupplierWarehousing = erpSupplierWarehousingMapper.selectById(tErpSupplierWarehousingBatch.getWarehousingId());
- TErpGoods goods = erpGoodsMapper.selectById(tErpSupplierWarehousing.getGoodsId());
- BigDecimal multiply = goods.getSalesAmount().multiply(BigDecimal.valueOf(outboundGoodsNextDto.getNum()));
+// TErpGoods goods = erpGoodsMapper.selectById(tErpSupplierWarehousing.getGoodsId());
+ BigDecimal multiply = tErpSupplierWarehousing.getUnitAmount().multiply(BigDecimal.valueOf(outboundGoodsNextDto.getNum()));
TErpSupplierOutboundGoods tErpSupplierOutboundGoods1 = new TErpSupplierOutboundGoods();
- tErpSupplierOutboundGoods1.setWarehousingId(dto.getWarehouseId());
+ tErpSupplierOutboundGoods1.setWarehousingId(tErpSupplierWarehousing.getId());
tErpSupplierOutboundGoods1.setWarehousingBatchId(outboundGoodsNextDto.getBatchId());
tErpSupplierOutboundGoods1.setOutboundCount(outboundGoodsNextDto.getNum());
tErpSupplierOutboundGoods1.setTotalPrice(multiply);
--
Gitblit v1.7.1