From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别，电压进行筛选 3.销售页面展示电压，类别 4.生产入库按照电压入库
---
src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
index b315964..6dfdc89 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -1,5 +1,6 @@
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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,6 +9,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
@@ -28,8 +31,11 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* <p>
@@ -50,6 +56,8 @@
private StockInRecordService stockInRecordService;
@Autowired
private ApproveProcessServiceImpl approveProcessService;
+ @Autowired
+ private ProductModelMapper productModelMapper;
@Override
public IPage<StockUninventoryDto> pageStockUninventory(Page page, StockUninventoryDto stockUninventoryDto) {
@@ -59,6 +67,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Integer addStockUninventory(StockUninventoryDto stockUninventoryDto) {
+ List<StockUninventory> stockUninventoryList = stockUninventoryMapper.selectList(null);
//鏂板鍏ュ簱璁板綍鍐嶆坊鍔犲簱瀛�
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockUninventoryDto.getRecordId());
@@ -68,6 +77,26 @@
stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("1");
+ if (stockUninventoryDto.getBatchNo() == null || stockUninventoryDto.getBatchNo().isEmpty()) {
+ String batchNo;
+ // 鑾峰彇褰撳墠鏈堜唤锛堜袱浣嶏級
+ LocalDate now = LocalDate.now();
+ String monthFlag = now.format(DateTimeFormatter.ofPattern("MM"));
+
+ // 鑾峰彇褰撳墠鏈堜唤鐨勬渶澶ф祦姘村彿
+ int maxSeq = getCurrentMonthMaxSeq(stockUninventoryDto, monthFlag, stockUninventoryList);
+
+ // 鏂版祦姘村彿 = 鏈�澶ф祦姘村彿 + 1
+ int newSeq = maxSeq + 1;
+ String seqStr = String.format("%03d", newSeq);
+
+ // 缁勮batchNo
+ ProductModel productModel = productModelMapper.selectById(stockUninventoryDto.getProductModelId());
+ batchNo = stockUninventoryDto.getMaterialCode() + productModel.getModel() + "P" + monthFlag + seqStr;
+ stockInRecordDto.setBatchNo(batchNo);
+ } else {
+ stockInRecordDto.setBatchNo(stockUninventoryDto.getBatchNo());
+ }
Long id = stockInRecordService.add(stockInRecordDto);
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -80,6 +109,33 @@
}
return 1;
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鏈堜唤宸插瓨鍦ㄧ殑鏈�澶ф祦姘村彿
+ */
+ private static int getCurrentMonthMaxSeq(StockUninventoryDto dto, String monthFlag, List<StockUninventory> existingList) {
+ int maxSeq = 0;
+
+ String prefix = dto.getMaterialCode() + dto.getModel() + "P" + monthFlag;
+
+ // 姝ｅ垯鍖归厤锛氬墠缂� + 3浣嶆暟瀛�
+ Pattern pattern = Pattern.compile(Pattern.quote(prefix) + "(\\d{3})");
+
+ for (StockUninventory item : existingList) {
+ String batchNo = item.getBatchNo();
+ if (batchNo == null) continue;
+
+ Matcher matcher = pattern.matcher(batchNo);
+ if (matcher.find()) {
+ int seq = Integer.parseInt(matcher.group(1));
+ if (seq > maxSeq) {
+ maxSeq = seq;
+ }
+ }
+ }
+
+ return maxSeq;
}
public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto,Long id) throws Exception {
@@ -129,10 +185,17 @@
*/
public void updateOrCreateStockUninventory(StockInRecord stockInRecord) {
// 鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪
- StockUninventory oldStockUnInventory = stockUninventoryMapper.selectOne(
- new QueryWrapper<StockUninventory>().lambda()
- .eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId())
- );
+ LambdaQueryWrapper<StockUninventory> queryWrapper = new QueryWrapper<StockUninventory>().lambda()
+ .eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId());
+
+ // 鏍规嵁 batchNo 鏄惁涓虹┖鏋勫缓涓嶅悓鐨勬煡璇㈡潯浠�
+ if (stockInRecord.getBatchNo() != null && !stockInRecord.getBatchNo().isEmpty()) {
+ queryWrapper.eq(StockUninventory::getBatchNo, stockInRecord.getBatchNo());
+ } else {
+ queryWrapper.isNull(StockUninventory::getBatchNo);
+ }
+
+ StockUninventory oldStockUnInventory = stockUninventoryMapper.selectOne(queryWrapper);
if (ObjectUtils.isEmpty(oldStockUnInventory)) {
// 涓嶅瓨鍦ㄥ垯鏂板
@@ -141,19 +204,32 @@
newStockUnInventory.setQualitity(stockInRecord.getStockInNum());
newStockUnInventory.setVersion(1);
newStockUnInventory.setRemark(stockInRecord.getRemark());
+ newStockUnInventory.setLockedQuantity(stockInRecord.getLockedQuantity());
+ newStockUnInventory.setBatchNo(stockInRecord.getBatchNo());
stockUninventoryMapper.insert(newStockUnInventory);
} else {
+ // 瀛樺湪鍒欐洿鏂�
LambdaUpdateWrapper<StockUninventory> updateWrapper = new LambdaUpdateWrapper<>();
- if (stockInRecord.getStockInNum() != null) {
- updateWrapper.setSql("qualitity = qualitity + " + stockInRecord.getStockInNum());
+ updateWrapper
+ .eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId());
+
+ // 鏍规嵁 batchNo 鏄惁涓虹┖鏋勫缓涓嶅悓鐨勬洿鏂版潯浠�
+ if (stockInRecord.getBatchNo() != null && !stockInRecord.getBatchNo().isEmpty()) {
+ updateWrapper.eq(StockUninventory::getBatchNo, stockInRecord.getBatchNo());
+ } else {
+ updateWrapper.isNull(StockUninventory::getBatchNo);
}
- updateWrapper.setSql("version = version + 1");
- String remark = stockInRecord.getRemark();
- if (remark != null && !remark.isEmpty()) {
- updateWrapper.set(StockUninventory::getRemark, remark);
- }
- updateWrapper.set(StockUninventory::getUpdateTime, new Date());
- updateWrapper.eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId());
+
+ updateWrapper
+ .setSql(stockInRecord.getStockInNum() != null,
+ "qualitity = qualitity + " + stockInRecord.getStockInNum())
+ .setSql(true, "version = version + 1")
+ .set(stockInRecord.getRemark() != null && !stockInRecord.getRemark().isEmpty(),
+ StockUninventory::getRemark, stockInRecord.getRemark())
+ .setSql(stockInRecord.getLockedQuantity() != null,
+ "locked_quantity = locked_quantity + " + stockInRecord.getLockedQuantity())
+ .set(StockUninventory::getUpdateTime, new Date());
+
stockUninventoryMapper.update(null, updateWrapper);
}
}
@@ -209,4 +285,4 @@
stockUninventory.setLockedQuantity(stockUninventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity()));
return this.updateById(stockUninventory);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3