From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 318 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 225 insertions(+), 93 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 ce432d5..9f7029d 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,21 @@
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.exception.base.BaseException;
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 +27,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,8 +36,9 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.math.RoundingMode;
import java.util.List;
+import java.util.Optional;
/**
* <p>
@@ -49,6 +57,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) {
@@ -59,32 +70,102 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean addstockInventory(StockInventoryDto stockInventoryDto) {
- //鏂板鍏ュ簱璁板綍鍐嶆坊鍔犲簱瀛�
+ // 1. 鍒涘缓鍏ュ簱璁板綍
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
- stockInRecordDto.setStockInNum(stockInventoryDto.getNetWeight());
- stockInRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
- stockInRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
- stockInRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
- stockInRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
- stockInRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
stockInRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
- stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
- stockInRecordDto.setProductId(stockInventoryDto.getProductId());
+ stockInRecordDto.setUnit(stockInventoryDto.getUnit());
+ 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");
- //鐢熸垚纾呭崟
- String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
- stockInRecordDto.setWeighbridgeDocPath(absoluteDocPath);
+
+ // 鏍规嵁浜у搧绫诲瀷璁剧疆涓嶅悓鐨勯噸閲忓瓧娈�
+ if (stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0) {
+ stockInRecordDto.setStockInNum(stockInventoryDto.getNetWeight());
+ stockInRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
+ stockInRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
+ stockInRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
+ stockInRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
+ stockInRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
+ stockInRecordDto.setUnit(stockInventoryDto.getUnit());
+ // 鐢熸垚纾呭崟
+ String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
+ stockInRecordDto.setWeighbridgeDocPath(absoluteDocPath);
+ } else {
+ stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
+ stockInRecordDto.setNetWeight(stockInventoryDto.getQualitity());
+ }
+
+ // 淇濆瓨鍏ュ簱璁板綍
stockInRecordService.add(stockInRecordDto);
- //鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
- //鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
+
+ // 2. 鏇存柊搴撳瓨
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(
+ 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.getNetWeight());
+ newStockInventory.setQualitity(weight);
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInventoryDto.getRemark());
newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
@@ -92,7 +173,8 @@
newStockInventory.setProductId(stockInventoryDto.getProductId());
stockInventoryMapper.insert(newStockInventory);
} else {
- stockInventoryDto.setQualitity(stockInventoryDto.getNetWeight());
+ // 鏇存柊搴撳瓨
+ stockInventoryDto.setQualitity(weight);
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
return true;
@@ -102,97 +184,147 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
- // 鏂板鍑哄簱璁板綍
- StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
- stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
- stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
- stockOutRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
- stockOutRecordDto.setStockOutNum(stockInventoryDto.getNetWeight());
- stockOutRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
- stockOutRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
- stockOutRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
- stockOutRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
- stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
- stockOutRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
- stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
- stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
- stockOutRecordDto.setType("0");
- //鐢熸垚纾呭崟
- StockInRecordDto stockInRecordDto = new StockInRecordDto();
- BeanUtils.copyProperties(stockOutRecordDto, stockInRecordDto);
- String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
- stockOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
- stockOutRecordService.add(stockOutRecordDto);
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
- if (ObjectUtils.isEmpty(oldStockInventory)) {
- throw new RuntimeException("浜у搧搴撳瓨涓嶅瓨鍦�");
- }
- BigDecimal lockedQty = oldStockInventory.getLockedQuantity();
- if (lockedQty == null) {
- lockedQty = BigDecimal.ZERO;
- }
- if (stockInventoryDto.getQualitity().compareTo(oldStockInventory.getQualitity().subtract(lockedQty)) > 0) {
- throw new RuntimeException("搴撳瓨涓嶈冻鏃犳硶鍑哄簱");
+
+ // 1. 鏌ヨ浜у搧鍨嬪彿鍜屽簱瀛樹俊鎭�
+ ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
+ if (productModel == null) {
+ throw new BaseException("浜у搧鍨嬪彿涓嶅瓨鍦�");
}
- stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(
+ new QueryWrapper<StockInventory>().lambda()
+ .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
+ );
+ if (oldStockInventory == null) {
+ throw new BaseException("浜у搧搴撳瓨涓嶅瓨鍦�");
+ }
+
+ // 2. 璁＄畻骞惰浆鎹㈠嚭搴撴暟閲�
+ BigDecimal outQuantity = compareUnit(stockInventoryDto, productModel);
+
+ // 3. 妫�鏌ュ簱瀛樻槸鍚﹀厖瓒筹紙鑰冭檻閿佸畾搴撳瓨锛�
+ BigDecimal availableQuantity = oldStockInventory.getQualitity()
+ .subtract(Optional.ofNullable(oldStockInventory.getLockedQuantity()).orElse(BigDecimal.ZERO));
+ if (outQuantity.compareTo(availableQuantity) > 0) {
+ throw new BaseException("搴撳瓨涓嶈冻锛屽綋鍓嶅彲鐢ㄥ簱瀛橈細" + availableQuantity);
+ }
+
+ // 4. 鎵ｅ噺搴撳瓨
+ stockInventoryDto.setQualitity(outQuantity);
+ int affectedRows = stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ if (affectedRows == 0) {
+ throw new BaseException("鎵ｅ噺搴撳瓨澶辫触锛屽彲鑳藉簱瀛樹笉瓒虫垨鏁版嵁宸茶淇敼");
+ }
+
+ // 5. 鍒涘缓骞朵繚瀛樺嚭搴撹褰�
+ createAndSaveStockOutRecord(stockInventoryDto, productModel);
+
return true;
+ }
+
+ /**
+ * 璁＄畻骞惰浆鎹㈠嚭搴撴暟閲忥紙缁熶竴杞崲涓哄簱瀛樺崟浣嶏級
+ */
+ private BigDecimal compareUnit(StockInventoryDto stockInventoryDto, ProductModel productModel) {
+ // 鑾峰彇鍘熷鍑哄簱鏁伴噺锛堟牴鎹骇鍝佺被鍨嬮�夋嫨鍑�閲嶆垨鏁伴噺锛�
+ BigDecimal originalQuantity = (stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0)
+ ? stockInventoryDto.getNetWeight()
+ : stockInventoryDto.getQualitity();
+
+ String sourceUnit = stockInventoryDto.getUnit();
+ String targetUnit = productModel.getUnit();
+
+ // 鍗曚綅鐩稿悓锛岀洿鎺ヨ繑鍥�
+ if (sourceUnit.equals(targetUnit)) {
+ return originalQuantity;
+ }
+
+ // 鍗曚綅杞崲
+ if ("鍚�".equals(targetUnit)) {
+ // 杞崲涓哄惃
+ return originalQuantity.divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
+ } else if ("鍏枻".equals(targetUnit)) {
+ // 杞崲涓哄叕鏂�
+ return originalQuantity.multiply(BigDecimal.valueOf(1000));
+ } else {
+ // 鍗曚綅涓嶅尮閰嶆椂锛岃繑鍥炲師鍊�
+ return originalQuantity;
+ }
+ }
+
+ /**
+ * 鍒涘缓骞朵繚瀛樺嚭搴撹褰�
+ */
+ private void createAndSaveStockOutRecord(StockInventoryDto stockInventoryDto, ProductModel productModel) {
+ // 鍒涘缓鍑哄簱璁板綍DTO
+ StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
+ if (stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0) {
+ stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
+ stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
+ stockOutRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
+ stockOutRecordDto.setStockOutNum(stockInventoryDto.getNetWeight());
+ stockOutRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
+ stockOutRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
+ stockOutRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
+ stockOutRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
+ stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ stockOutRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
+ stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
+ stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
+ stockOutRecordDto.setUnit(stockInventoryDto.getUnit());
+ stockOutRecordDto.setType("0");
+ // 鐢熸垚纾呭崟
+ StockInRecordDto stockInRecordDto = new StockInRecordDto();
+ BeanUtils.copyProperties(stockOutRecordDto, stockInRecordDto);
+ String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
+ stockOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
+ } else {
+ stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
+ stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
+ stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
+ stockOutRecordDto.setNetWeight(stockInventoryDto.getQualitity());
+ stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
+ stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
+ stockOutRecordDto.setUnit(stockInventoryDto.getUnit());
+ stockOutRecordDto.setType("0");
+ }
+ stockOutRecordService.add(stockOutRecordDto);
}
@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