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 | 287 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 238 insertions(+), 49 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 7b3ee2c..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,32 +1,41 @@
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.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+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.procurementrecord.utils.StockUtils;
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;
import com.ruoyi.stock.execl.StockInventoryExportData;
-import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.stock.service.StockInventoryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.stock.service.StockOutRecordService;
-import lombok.AllArgsConstructor;
+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;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -38,14 +47,18 @@
* @since 2026-01-21 04:16:36
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class StockInventoryServiceImpl extends ServiceImpl<StockInventoryMapper, StockInventory> implements StockInventoryService {
- private StockInventoryMapper stockInventoryMapper;
- private StockInRecordService stockInRecordService;
- private StockOutRecordService stockOutRecordService;
- private SalesLedgerProductMapper salesLedgerProductMapper;
- private StockUtils stockUtils;
+ private final StockInventoryMapper stockInventoryMapper;
+ private final StockInRecordService stockInRecordService;
+ 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) {
return stockInventoryMapper.pagestockInventory(page, stockInventoryDto);
@@ -55,26 +68,110 @@
@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.getQualitity());
- stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ stockInRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
+ 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");
+
+ // 鏍规嵁浜у搧绫诲瀷璁剧疆涓嶅悓鐨勯噸閲忓瓧娈�
+ 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());
+ // 鐢熸垚纾呭崟
+ 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.getQualitity());
+ newStockInventory.setQualitity(weight);
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInventoryDto.getRemark());
+ newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ newStockInventory.setWarnNum(stockInventoryDto.getWarnNum());
+ newStockInventory.setProductId(stockInventoryDto.getProductId());
stockInventoryMapper.insert(newStockInventory);
- }else {
- stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
+ } else {
+ // 鏇存柊搴撳瓨
+ stockInventoryDto.setQualitity(weight);
+ stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
return true;
}
@@ -83,54 +180,146 @@
@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());
stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
- stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
+ 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("浜у搧搴撳瓨涓嶅瓨鍦�");
- }else {
- stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
}
+ BigDecimal lockedQty = oldStockInventory.getLockedQuantity();
+ 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
public R importStockInventory(MultipartFile file) {
-// try {
-// final StringBuffer[] errorMsg = {new StringBuffer()};
-// //鏌ヨ鎵�鏈夌殑浜у搧
-// List<SalesLedgerProduct> salesLedgerProducts =salesLedgerProductMapper.selectProduct();
-//
-// ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
-// List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
-// list.stream().forEach(dto -> {
-// salesLedgerProducts.stream().forEach(item->{
-// if (item.getProductCategory().equals(dto.getProductName())&&item.getSpecificationModel().equals(dto.getModel())) {
-// //鏇存柊搴撳瓨
-// stockUtils.addStock(item.getId(),dto.getQualitity(), StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode(),0L);
-// }else {
-// errorMsg[0] = errorMsg[0].append("浜у搧鍚嶇О锛�"+dto.getProductName()+"瑙勬牸锛�"+dto.getModel()+"涓嶅瓨鍦�").append("\n");
-// }
-// });
-// });
-// return R.ok(errorMsg[0]);
-// }catch (Exception e){
-// e.printStackTrace();
-// }
- return R.fail();
+ try {
+ ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
+ List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
+
+ 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()));
+ }
+
+ 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());
+ }
}
+
@Override
public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
List<StockInventoryExportData> list = stockInventoryMapper.listStockInventoryExportData(stockInventoryDto);
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
- util.exportExcel(response,list, "搴撳瓨淇℃伅");
+ util.exportExcel(response, list, "搴撳瓨淇℃伅");
+ }
+
+ @Override
+ public IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto, Page page) {
+ return stockInventoryMapper.stockInventoryPage(stockInventoryDto, page);
+ }
+
+ @Override
+ public IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto, Page page) {
+ return stockInventoryMapper.stockInAndOutRecord(stockInventoryDto, page);
+ }
+
+ @Override
+ public Boolean frozenStock(StockInventoryDto stockInventoryDto) {
+ StockInventory stockInventory = stockInventoryMapper.selectById(stockInventoryDto.getId());
+ if (stockInventory.getQualitity().compareTo(stockInventoryDto.getLockedQuantity()) < 0) {
+ throw new RuntimeException("鍐荤粨鏁伴噺涓嶈兘瓒呰繃搴撳瓨鏁伴噺");
+ }
+ if (ObjectUtils.isEmpty(stockInventory.getLockedQuantity())) {
+ stockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ } else {
+ stockInventory.setLockedQuantity(stockInventory.getLockedQuantity().add(stockInventoryDto.getLockedQuantity()));
+ }
+ return this.updateById(stockInventory);
+ }
+
+ @Override
+ public Boolean thawStock(StockInventoryDto stockInventoryDto) {
+ StockInventory stockInventory = stockInventoryMapper.selectById(stockInventoryDto.getId());
+ if (stockInventory.getLockedQuantity().compareTo(stockInventoryDto.getLockedQuantity()) < 0) {
+ throw new RuntimeException("瑙ｅ喕鏁伴噺涓嶈兘瓒呰繃鍐荤粨鏁伴噺");
+ }
+ stockInventory.setLockedQuantity(stockInventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity()));
+ return this.updateById(stockInventory);
}
}
--
Gitblit v1.9.3