From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 2f6d54c..ca4e84d 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -34,6 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -55,6 +57,7 @@
private final WeighbridgeDocGenerator weighbridgeDocGenerator;
private final ProductMapper productMapper;
private final ProductModelMapper productModelMapper;
+ private final ElectricityConsumptionAreaMapper electricityConsumptionAreaMapper;
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
@@ -70,10 +73,12 @@
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
stockInRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
+ Long modelId;
if (stockInventoryDto.getProductId() != null) {
stockInRecordDto.setProductId(stockInventoryDto.getProductId());
stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
- }else {
+ modelId = stockInventoryDto.getProductModelId();
+ } else {
Product parent = productMapper.selectOne(new LambdaQueryWrapper<Product>().eq(Product::getProductName, "鍘熸潗鏂�").last("limit 1"));
if (parent == null) {
throw new RuntimeException("鍘熸潗鏂欏垎绫讳笉瀛樺湪");
@@ -120,6 +125,8 @@
stockInRecordDto.setProductId(product.getId());
stockInRecordDto.setProductModelId(productModelId);
stockInventoryDto.setProductModelId(productModelId);
+
+ modelId = productModelId;
}
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setType("0");
@@ -148,12 +155,13 @@
new QueryWrapper<StockInventory>().lambda()
.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
);
+ ProductModel productModel = productModelMapper.selectById(modelId);
+ BigDecimal weight = compareUnit(stockInventoryDto, productModel);
if (ObjectUtils.isEmpty(oldStockInventory)) {
// 鏂板搴撳瓨
StockInventory newStockInventory = new StockInventory();
newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
- newStockInventory.setQualitity(stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
- stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity());
+ newStockInventory.setQualitity(weight);
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInventoryDto.getRemark());
newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
@@ -162,8 +170,7 @@
stockInventoryMapper.insert(newStockInventory);
} else {
// 鏇存柊搴撳瓨
- stockInventoryDto.setQualitity(stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
- stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity());
+ stockInventoryDto.setQualitity(weight);
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
return true;
@@ -173,6 +180,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
+
+ ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
+ BigDecimal weight = compareUnit(stockInventoryDto, productModel);
// 鏂板鍑哄簱璁板綍
StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
@@ -202,12 +212,37 @@
if (lockedQty == null) {
lockedQty = BigDecimal.ZERO;
}
+ stockInventoryDto.setQualitity(weight);
if (stockInventoryDto.getQualitity().compareTo(oldStockInventory.getQualitity().subtract(lockedQty)) > 0) {
throw new RuntimeException("搴撳瓨涓嶈冻鏃犳硶鍑哄簱");
}
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
return true;
+ }
+
+ private BigDecimal compareUnit(StockInventoryDto stockInventoryDto, ProductModel productModel) {
+ String unit = "";
+ if (productModel != null) {
+ unit = productModel.getUnit();
+ }
+ BigDecimal weight;
+ if (stockInventoryDto.getUnit().equals(unit)) {
+ weight = stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
+ stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity();
+ } else {
+ if ("鍚�".equals(unit)) {
+ weight =stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
+ stockInventoryDto.getNetWeight().divide(BigDecimal.valueOf(1000),2, RoundingMode.HALF_UP) : stockInventoryDto.getQualitity().divide(BigDecimal.valueOf(1000),2,RoundingMode.HALF_UP);
+ } else if ("鍏枻".equals(unit)) {
+ weight = stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
+ stockInventoryDto.getNetWeight().multiply(BigDecimal.valueOf(1000)) : stockInventoryDto.getQualitity().multiply(BigDecimal.valueOf(1000));
+ }else {
+ weight =stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
+ stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity();
+ }
+ }
+ return weight;
}
@Override
@@ -235,7 +270,7 @@
stockInventoryDto.setModel(dto.getModel());
stockInventoryDto.setUnit(dto.getUnit());
- // 瑙ｅ喅鏂规1锛氶�氳繃浠ｇ悊瀵硅薄璋冪敤
+ //閫氳繃浠ｇ悊瀵硅薄璋冪敤
((StockInventoryService) AopContext.currentProxy()).addstockInventory(stockInventoryDto);
}
return R.ok("瀵煎叆鎴愬姛");
--
Gitblit v1.9.3