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 | 169 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 119 insertions(+), 50 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 cdb75a1..ca4e84d 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -1,15 +1,20 @@
package com.ruoyi.stock.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+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.sales.pojo.SalesLedgerProduct;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
@@ -21,6 +26,7 @@
import com.ruoyi.stock.service.StockOutRecordService;
import com.ruoyi.stock.word.WeighbridgeDocGenerator;
import lombok.RequiredArgsConstructor;
+import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,7 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -49,6 +55,9 @@
private final StockOutRecordService stockOutRecordService;
private final SalesLedgerProductMapper salesLedgerProductMapper;
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) {
@@ -64,8 +73,61 @@
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
stockInRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
- stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
- stockInRecordDto.setProductId(stockInventoryDto.getProductId());
+ Long modelId;
+ if (stockInventoryDto.getProductId() != null) {
+ stockInRecordDto.setProductId(stockInventoryDto.getProductId());
+ stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ modelId = stockInventoryDto.getProductModelId();
+ } else {
+ Product parent = productMapper.selectOne(new LambdaQueryWrapper<Product>().eq(Product::getProductName, "鍘熸潗鏂�").last("limit 1"));
+ if (parent == null) {
+ throw new RuntimeException("鍘熸潗鏂欏垎绫讳笉瀛樺湪");
+ }
+ Product product;
+ Product existingProduct = productMapper.selectOne(
+ new LambdaQueryWrapper<Product>()
+ .eq(Product::getParentId, parent.getId())
+ .eq(Product::getProductName, stockInventoryDto.getProductName())
+ );
+ if (existingProduct != null) {
+ // 宸插瓨鍦�
+ product = existingProduct;
+ } else {
+ // 涓嶅瓨鍦�
+ Product newProduct = new Product();
+ newProduct.setParentId(parent.getId());
+ newProduct.setProductName(stockInventoryDto.getProductName());
+ productMapper.insert(newProduct);
+ product = newProduct;
+ }
+ // 鍏堟煡璇㈡槸鍚﹀凡瀛樺湪鐩稿悓鐨勪骇鍝佸瀷鍙�
+ ProductModel existingModel = productModelMapper.selectOne(
+ new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getProductId, product.getId())
+ .eq(ProductModel::getUnit, stockInventoryDto.getUnit())
+ .eq(ProductModel::getModel, stockInventoryDto.getModel())
+ );
+
+ Long productModelId;
+ if (existingModel != null) {
+ // 宸插瓨鍦�
+ productModelId = existingModel.getId();
+ } else {
+ // 涓嶅瓨鍦�
+ ProductModel productModel = new ProductModel();
+ productModel.setProductId(product.getId());
+ productModel.setUnit(stockInventoryDto.getUnit());
+ productModel.setModel(stockInventoryDto.getModel());
+ productModelMapper.insert(productModel);
+ productModelId = productModel.getId();
+ }
+
+ stockInRecordDto.setProductId(product.getId());
+ stockInRecordDto.setProductModelId(productModelId);
+ stockInventoryDto.setProductModelId(productModelId);
+
+ modelId = productModelId;
+ }
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setType("0");
@@ -93,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() == 0 ?
- stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity());
+ newStockInventory.setQualitity(weight);
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInventoryDto.getRemark());
newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
@@ -107,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;
@@ -118,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());
@@ -147,6 +212,7 @@
if (lockedQty == null) {
lockedQty = BigDecimal.ZERO;
}
+ stockInventoryDto.setQualitity(weight);
if (stockInventoryDto.getQualitity().compareTo(oldStockInventory.getQualitity().subtract(lockedQty)) > 0) {
throw new RuntimeException("搴撳瓨涓嶈冻鏃犳硶鍑哄簱");
}
@@ -155,60 +221,63 @@
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
public R importStockInventory(MultipartFile file) {
try {
- // 鏌ヨ鎵�鏈夌殑浜у搧
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectProduct();
-
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
- // 璁板綍鏈壘鍒板尮閰嶉」鐨勬暟鎹�
- List<String> unmatchedRecords = new ArrayList<>();
+ for (StockInventoryExportData dto : list) {
+ // 楠岃瘉鍐荤粨鏁伴噺
+ if (ObjectUtils.isNotEmpty(dto.getLockedQuantity()) &&
+ dto.getLockedQuantity().compareTo(dto.getQualitity()) > 0) {
+ throw new RuntimeException(String.format("浜у搧[%s %s]鍐荤粨鏁伴噺涓嶈兘瓒呰繃搴撳瓨鏁伴噺",
+ dto.getProductName(), dto.getModel()));
+ }
- list.forEach(dto -> {
- boolean matched = false;
- for (SalesLedgerProduct item : salesLedgerProducts) {
- if (item.getProductCategory().equals(dto.getProductName()) &&
- item.getSpecificationModel().equals(dto.getModel())) {
- StockInventoryDto stockInventoryDto = new StockInventoryDto();
- stockInventoryDto.setRecordId(0L);
- stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
- stockInventoryDto.setQualitity(dto.getQualitity());
- stockInventoryDto.setRemark(dto.getRemark());
- stockInventoryDto.setWarnNum(dto.getWarnNum());
- if (ObjectUtils.isNotEmpty(dto.getLockedQuantity()) && dto.getLockedQuantity().compareTo(dto.getQualitity()) > 0) {
- throw new RuntimeException("鍐荤粨鏁伴噺涓嶈兘瓒呰繃鏈瀵煎叆鐨勫簱瀛樻暟閲�");
- }
- stockInventoryDto.setLockedQuantity(dto.getLockedQuantity());
- stockInventoryDto.setProductModelId(item.getProductModelId());
- this.addstockInventory(stockInventoryDto);
- matched = true;
- break; // 鎵惧埌鍖归厤椤瑰悗璺冲嚭寰幆
- }
- }
- if (!matched) {
- // 璁板綍鏈尮閰嶇殑鏁版嵁
- String unmatchedInfo = String.format("浜у搧鍚嶇О锛�%s锛岃鏍煎瀷鍙凤細%s",
- dto.getProductName(), dto.getModel());
- unmatchedRecords.add(unmatchedInfo);
- }
- });
- // 鏋勫缓杩斿洖淇℃伅
- StringBuilder message = new StringBuilder();
- if (!unmatchedRecords.isEmpty()) {
- message.append("浠ヤ笅浜у搧鏈壘鍒板尮閰嶉」锛歕n");
- for (String record : unmatchedRecords) {
- message.append(record).append("\n");
- }
- throw new RuntimeException(message.toString());
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setRecordId(0L);
+ stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
+ stockInventoryDto.setQualitity(dto.getQualitity());
+ stockInventoryDto.setRemark(dto.getRemark());
+ stockInventoryDto.setNetWeight(dto.getNetWeight());
+ stockInventoryDto.setLockedQuantity(dto.getLockedQuantity());
+ stockInventoryDto.setProductName(dto.getProductName());
+ stockInventoryDto.setModel(dto.getModel());
+ stockInventoryDto.setUnit(dto.getUnit());
+
+ //閫氳繃浠ｇ悊瀵硅薄璋冪敤
+ ((StockInventoryService) AopContext.currentProxy()).addstockInventory(stockInventoryDto);
}
+ return R.ok("瀵煎叆鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
return R.fail("瀵煎叆澶辫触锛�" + e.getMessage());
}
- return R.ok("瀵煎叆鎴愬姛");
}
--
Gitblit v1.9.3