From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步（安全培训-筛选优化）
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 133 insertions(+), 27 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 e103f75..ec7a12c 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -1,11 +1,17 @@
package com.ruoyi.stock.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.common.enums.StockQualifiedRecordTypeEnum;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -13,19 +19,22 @@
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.StockInRecord;
+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 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.time.LocalDate;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -37,19 +46,25 @@
* @since 2026-01-21 04:16:36
*/
@Service
-@AllArgsConstructor
public class StockInventoryServiceImpl extends ServiceImpl<StockInventoryMapper, StockInventory> implements StockInventoryService {
- private StockInventoryMapper stockInventoryMapper;
+ @Autowired
+ private StockInventoryMapper stockInventoryMapper;
+ @Autowired
private StockInRecordService stockInRecordService;
+ @Autowired
private StockOutRecordService stockOutRecordService;
+ @Autowired
private SalesLedgerProductMapper salesLedgerProductMapper;
+ @Autowired
+ private ApproveProcessServiceImpl approveProcessService;
+
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
return stockInventoryMapper.pagestockInventory(page, stockInventoryDto);
}
- //鍏ュ簱璋冪敤
+ //鍏ュ簱璋冪敤-娣诲姞鍏ュ簱璁板綍
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean addstockInventory(StockInventoryDto stockInventoryDto) {
@@ -59,29 +74,84 @@
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ stockInRecordDto.setRemark(stockInventoryDto.getRemark());
+ stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
+ stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("0");
- stockInRecordService.add(stockInRecordDto);
- //鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
- //鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
- if (ObjectUtils.isEmpty(oldStockInventory)) {
- StockInventory newStockInventory = new StockInventory();
- newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
- newStockInventory.setQualitity(stockInventoryDto.getQualitity());
- newStockInventory.setVersion(1);
- newStockInventory.setRemark(stockInventoryDto.getRemark());
- stockInventoryMapper.insert(newStockInventory);
- }else {
- stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
+ Long id = stockInRecordService.add(stockInRecordDto);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (id != null) {
+ try {
+ addApproveByPurchase(loginUser, stockInRecordDto,id);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
return true;
+ }
+
+ public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto,Long id) throws Exception {
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(9);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(stockInRecordDto.getInboundBatches());
+ approveProcessVO.setApproveUserIds(String.valueOf(1));
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessVO.setInventoryReview(false);
+ approveProcessVO.setStorageType("鍚堟牸鍏ュ簱");
+ approveProcessVO.setRecordId(id);
+ approveProcessService.addApprove(approveProcessVO);
+ }
+
+ /**
+ * 瀹為檯鍏ュ簱
+ *
+ * @param stockInRecord
+ */
+ public void updateOrCreateStockInventory(StockInRecord stockInRecord) {
+ // 鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(
+ new QueryWrapper<StockInventory>().lambda()
+ .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId())
+ );
+
+ if (ObjectUtils.isEmpty(oldStockInventory)) {
+ // 涓嶅瓨鍦ㄥ垯鏂板
+ StockInventory newStockInventory = new StockInventory();
+ newStockInventory.setProductModelId(stockInRecord.getProductModelId());
+ newStockInventory.setQualitity(stockInRecord.getStockInNum());
+ newStockInventory.setVersion(1);
+ newStockInventory.setRemark(stockInRecord.getRemark());
+ newStockInventory.setLockedQuantity(stockInRecord.getLockedQuantity());
+ newStockInventory.setWarnNum(stockInRecord.getWarnNum());
+ stockInventoryMapper.insert(newStockInventory);
+ } else {
+ // 瀛樺湪鍒欐洿鏂�
+ LambdaUpdateWrapper<StockInventory> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper
+ .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId())
+ .setSql(stockInRecord.getStockInNum() != null,
+ "qualitity = qualitity + " + stockInRecord.getStockInNum())
+ .setSql(true, "version = version + 1")
+ .set(stockInRecord.getRemark() != null && !stockInRecord.getRemark().isEmpty(),
+ StockInventory::getRemark, stockInRecord.getRemark())
+ .set(stockInRecord.getWarnNum() != null,
+ StockInventory::getWarnNum, stockInRecord.getWarnNum())
+ .setSql(stockInRecord.getLockedQuantity() != null,
+ "locked_quantity = locked_quantity + " + stockInRecord.getLockedQuantity())
+ .set(StockInventory::getUpdateTime, new Date());
+
+ stockInventoryMapper.update(null, updateWrapper);
+ }
}
//鍑哄簱璋冪敤
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
- // 鏂板鍑哄簱璁板綍
+ // 鏂板鍑哄簱璁板綍
StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
@@ -92,9 +162,16 @@
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;
+ }
+ if (stockInventoryDto.getQualitity().compareTo(oldStockInventory.getQualitity().subtract(lockedQty)) > 0) {
+ throw new RuntimeException("搴撳瓨涓嶈冻鏃犳硶鍑哄簱");
+ }
+
+ stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
return true;
}
@@ -117,9 +194,14 @@
item.getSpecificationModel().equals(dto.getModel())) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(0L);
- stockInventoryDto.setRecordType(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
+ 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;
@@ -155,16 +237,40 @@
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);
+ return stockInventoryMapper.stockInventoryPage(stockInventoryDto, page);
}
@Override
public IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto, Page page) {
- return stockInventoryMapper.stockInAndOutRecord(stockInventoryDto,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