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/StockInventoryServiceImpl.java | 471 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 346 insertions(+), 125 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 13968cb..5a2681f 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -1,7 +1,7 @@
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;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,15 +13,20 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.stock.dto.FinishedProductTreeDto;
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.dto.StockUninventoryDto;
import com.ruoyi.stock.execl.StockInventoryExportData;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.pojo.StockInRecord;
@@ -29,6 +34,7 @@
import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.stock.service.StockInventoryService;
import com.ruoyi.stock.service.StockOutRecordService;
+import com.ruoyi.stock.service.StockUninventoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,21 +43,17 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * <p>
- * 搴撳瓨琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-21 04:16:36
- */
@Service
public class StockInventoryServiceImpl extends ServiceImpl<StockInventoryMapper, StockInventory> implements StockInventoryService {
@@ -69,18 +71,62 @@
private ProductModelMapper productModelMapper;
@Autowired
private ProductMapper productMapper;
+ @Autowired
+ private StockUninventoryService stockUninventoryService;
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
return stockInventoryMapper.pagestockInventory(page, stockInventoryDto);
}
- //鍏ュ簱璋冪敤-娣诲姞鍏ュ簱璁板綍
+ /**
+ * 鏌ヨ鎴愬搧搴撳瓨鏍戙��
+ * 杩斿洖缁撴瀯娌跨敤鍩虹璧勬枡浜у搧鏍戯紝鍙跺瓙鑺傜偣琛ュ厖鎴愬搧搴撳瓨缁村害锛氬瀷鍙枫�佸伐搴忓垎绫汇�佺數鍘嬨��
+ */
+ @Override
+ public List<FinishedProductTreeDto> finishedProductList(StockInventoryDto stockInventoryDto) {
+ List<StockInventoryDto> inventoryList = stockInventoryMapper.selectFinishedProductInventoryList(stockInventoryDto);
+ if (inventoryList.isEmpty()) {
+ return new ArrayList<>();
+ }
+
+ List<Product> allProducts = productMapper.selectList(null);
+ Map<Long, Product> productMap = new HashMap<>();
+ Map<Long, List<Product>> childrenMap = new HashMap<>();
+ for (Product product : allProducts) {
+ productMap.put(product.getId(), product);
+ childrenMap.computeIfAbsent(product.getParentId(), key -> new ArrayList<>()).add(product);
+ }
+
+ Map<Long, List<FinishedProductTreeDto>> leafMap = buildFinishedProductLeafMap(inventoryList);
+ Set<Long> visibleProductIds = collectVisibleProductIds(leafMap.keySet(), productMap);
+
+ List<FinishedProductTreeDto> result = new ArrayList<>();
+ for (Product rootProduct : allProducts) {
+ if (!isFinishedRoot(rootProduct)) {
+ continue;
+ }
+ FinishedProductTreeDto rootNode = buildProductNode(rootProduct);
+ rootNode.setChildren(buildFinishedChildren(rootProduct.getId(), childrenMap, leafMap, visibleProductIds));
+ if (!rootNode.getChildren().isEmpty()) {
+ result.add(rootNode);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+ return stockInventoryMapper.pageListCombinedStockInventory(page, stockInventoryDto);
+ }
+
+ /**
+ * 鍚堟牸鍏ュ簱锛氬厛鐢熸垚鍏ュ簱璁板綍锛屽啀璧板鎵规祦銆�
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean addstockInventory(StockInventoryDto stockInventoryDto) {
List<StockInventory> stockInventoryList = stockInventoryMapper.selectList(null);
- //鏂板鍏ュ簱璁板綍鍐嶆坊鍔犲簱瀛�
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
@@ -89,23 +135,19 @@
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ stockInRecordDto.setProcessCategory(normalizeDimension(stockInventoryDto.getProcessCategory()));
+ stockInRecordDto.setVoltage(normalizeDimension(stockInventoryDto.getVoltage()));
stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("0");
- if (stockInventoryDto.getBatchNo() == null || stockInventoryDto.getBatchNo().isEmpty()) {
+ if (StringUtils.isBlank(stockInventoryDto.getBatchNo())) {
String batchNo;
- // 鑾峰彇褰撳墠鏈堜唤锛堜袱浣嶏級
LocalDate now = LocalDate.now();
String monthFlag = now.format(DateTimeFormatter.ofPattern("MM"));
-
- // 鑾峰彇褰撳墠鏈堜唤鐨勬渶澶ф祦姘村彿
int maxSeq = getCurrentMonthMaxSeq(stockInventoryDto, monthFlag, stockInventoryList);
-
- // 鏂版祦姘村彿 = 鏈�澶ф祦姘村彿 + 1
int newSeq = maxSeq + 1;
String seqStr = String.format("%03d", newSeq);
-
- // 缁勮batchNo
- batchNo = stockInventoryDto.getMaterialCode() + stockInventoryDto.getProductModelName() + "P" + monthFlag + seqStr;
+ ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
+ batchNo = stockInventoryDto.getMaterialCode() + productModel.getModel() + "P" + monthFlag + seqStr;
stockInRecordDto.setBatchNo(batchNo);
} else {
stockInRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
@@ -122,21 +164,15 @@
return true;
}
- /**
- * 鏌ヨ褰撳墠鏈堜唤宸插瓨鍦ㄧ殑鏈�澶ф祦姘村彿
- */
private static int getCurrentMonthMaxSeq(StockInventoryDto dto, String monthFlag, List<StockInventory> existingList) {
int maxSeq = 0;
-
- String prefix = dto.getMaterialCode() + dto.getModel() + "P" + monthFlag;
-
- // 姝ｅ垯鍖归厤锛氬墠缂� + 3浣嶆暟瀛�
+ String prefix = dto.getMaterialCode() + dto.getProductModelName() + "P" + monthFlag;
Pattern pattern = Pattern.compile(Pattern.quote(prefix) + "(\\d{3})");
-
for (StockInventory item : existingList) {
String batchNo = item.getBatchNo();
- if (batchNo == null) continue;
-
+ if (batchNo == null) {
+ continue;
+ }
Matcher matcher = pattern.matcher(batchNo);
if (matcher.find()) {
int seq = Integer.parseInt(matcher.group(1));
@@ -145,10 +181,10 @@
}
}
}
-
return maxSeq;
}
+ @Override
public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto, Long id) throws Exception {
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(9);
@@ -164,86 +200,77 @@
}
/**
- * 瀹為檯鍏ュ簱
- *
- * @param stockInRecord
+ * 鎸夊簱瀛樺敮涓�閿悎骞跺簱瀛樸��
+ * 鎴愬搧浣跨敤 product_model_id + processCategory + voltage锛涘叾浠栧叆搴撳彧鎸� product_model_id銆�
*/
+ @Override
public void updateOrCreateStockInventory(StockInRecord stockInRecord) {
- // 鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(
- new QueryWrapper<StockInventory>().lambda()
- .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId())
- .eq(StockInventory::getBatchNo, stockInRecord.getBatchNo())
+ String processCategory = normalizeDimension(stockInRecord.getProcessCategory());
+ String voltage = normalizeDimension(stockInRecord.getVoltage());
+ StockInventory oldStockInventory = findInventoryForMerge(
+ stockInRecord.getProductModelId(),
+ processCategory,
+ voltage
);
if (ObjectUtils.isEmpty(oldStockInventory)) {
- // 涓嶅瓨鍦ㄥ垯鏂板
StockInventory newStockInventory = new StockInventory();
newStockInventory.setProductModelId(stockInRecord.getProductModelId());
- newStockInventory.setQualitity(stockInRecord.getStockInNum());
+ newStockInventory.setQualitity(defaultDecimal(stockInRecord.getStockInNum()));
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInRecord.getRemark());
- newStockInventory.setLockedQuantity(stockInRecord.getLockedQuantity());
+ newStockInventory.setLockedQuantity(defaultDecimal(stockInRecord.getLockedQuantity()));
newStockInventory.setWarnNum(stockInRecord.getWarnNum());
- newStockInventory.setBatchNo(stockInRecord.getBatchNo());
+ newStockInventory.setProcessCategory(processCategory);
+ newStockInventory.setVoltage(voltage);
+ newStockInventory.setBatchNo(StringUtils.trimToEmpty(stockInRecord.getBatchNo()));
stockInventoryMapper.insert(newStockInventory);
- } else {
- // 瀛樺湪鍒欐洿鏂�
- LambdaUpdateWrapper<StockInventory> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper
- .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId())
- .eq(StockInventory::getBatchNo, stockInRecord.getBatchNo())
- .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);
+ return;
}
+
+ oldStockInventory.setQualitity(defaultDecimal(oldStockInventory.getQualitity()).add(defaultDecimal(stockInRecord.getStockInNum())));
+ oldStockInventory.setVersion(oldStockInventory.getVersion() == null ? 1 : oldStockInventory.getVersion() + 1);
+ if (StringUtils.isNotBlank(stockInRecord.getRemark())) {
+ oldStockInventory.setRemark(stockInRecord.getRemark());
+ }
+ if (stockInRecord.getWarnNum() != null) {
+ oldStockInventory.setWarnNum(stockInRecord.getWarnNum());
+ }
+ if (stockInRecord.getLockedQuantity() != null) {
+ oldStockInventory.setLockedQuantity(defaultDecimal(oldStockInventory.getLockedQuantity()).add(stockInRecord.getLockedQuantity()));
+ }
+ oldStockInventory.setProcessCategory(processCategory);
+ oldStockInventory.setVoltage(voltage);
+ oldStockInventory.setUpdateTime(LocalDateTime.now());
+ stockInventoryMapper.updateById(oldStockInventory);
}
- //鍗婃垚鍝佺洿鎺ュ叆搴�
+ /**
+ * 涓嶅鏍稿叆搴擄紝鐩存帴鍐欏叆鍏ュ簱璁板綍鍜屽簱瀛樸��
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean addstockInventoryNoReview(StockInventoryDto stockInventoryDto) {
- //鏂板鍏ュ簱璁板綍鍐嶆坊鍔犲簱瀛�
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
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.setProcessCategory(normalizeDimension(stockInventoryDto.getProcessCategory()));
+ stockInRecordDto.setVoltage(normalizeDimension(stockInventoryDto.getVoltage()));
+ stockInRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
stockInRecordDto.setType("0");
stockInRecordService.add(stockInRecordDto);
- //鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
- //鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
- .eq(StockInventory::getBatchNo, stockInventoryDto.getBatchNo()));
- if (ObjectUtils.isEmpty(oldStockInventory)) {
- StockInventory newStockInventory = new StockInventory();
- newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
- newStockInventory.setQualitity(stockInventoryDto.getQualitity());
- newStockInventory.setVersion(1);
- newStockInventory.setRemark(stockInventoryDto.getRemark());
- newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
- newStockInventory.setWarnNum(stockInventoryDto.getWarnNum());
- stockInventoryMapper.insert(newStockInventory);
- } else {
- stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
- }
+ updateOrCreateStockInventory(toStockInRecord(stockInRecordDto));
return true;
}
- //鍑哄簱璋冪敤
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
- // 鏂板鍑哄簱璁板綍
StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
@@ -251,86 +278,152 @@
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
stockOutRecordService.add(stockOutRecordDto);
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
- .eq(StockInventory::getBatchNo, stockInventoryDto.getBatchNo()));
+
+ if (StringUtils.isBlank(stockInventoryDto.getBatchNo()) && !usesDimensionIdentity(normalizeDimension(stockInventoryDto.getProcessCategory()), normalizeDimension(stockInventoryDto.getVoltage()))) {
+ List<StockInventory> stockInventories = stockInventoryMapper.selectList(new QueryWrapper<StockInventory>().lambda()
+ .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
+ .orderByAsc(StockInventory::getId));
+ if (ObjectUtils.isEmpty(stockInventories)) {
+ throw new RuntimeException("浜у搧搴撳瓨涓嶅瓨鍦�");
+ }
+
+ BigDecimal remainingQty = stockInventoryDto.getQualitity();
+ for (StockInventory stockInventory : stockInventories) {
+ BigDecimal lockedQty = defaultDecimal(stockInventory.getLockedQuantity());
+ BigDecimal availableQty = defaultDecimal(stockInventory.getQualitity()).subtract(lockedQty);
+ if (availableQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+
+ BigDecimal deductQty = remainingQty.min(availableQty);
+ stockInventory.setQualitity(defaultDecimal(stockInventory.getQualitity()).subtract(deductQty));
+ stockInventory.setVersion(stockInventory.getVersion() == null ? 1 : stockInventory.getVersion() + 1);
+ stockInventory.setUpdateTime(LocalDateTime.now());
+ stockInventoryMapper.updateById(stockInventory);
+
+ remainingQty = remainingQty.subtract(deductQty);
+ if (remainingQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return true;
+ }
+ }
+
+ ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
+ Product product = productMapper.selectById(productModel.getProductId());
+ throw new RuntimeException(product.getProductName() + "/" + productModel.getModel() + "搴撳瓨涓嶈冻锛屾棤娉曞嚭搴�");
+ }
+
+ StockInventory oldStockInventory = findInventoryForMerge(
+ stockInventoryDto.getProductModelId(),
+ stockInventoryDto.getProcessCategory(),
+ stockInventoryDto.getVoltage()
+ );
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) {
- // 鏌ヨ浜у搧瑙勬牸鍚�
+ BigDecimal lockedQty = defaultDecimal(oldStockInventory.getLockedQuantity());
+ if (stockInventoryDto.getQualitity().compareTo(defaultDecimal(oldStockInventory.getQualitity()).subtract(lockedQty)) > 0) {
ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
Product product = productMapper.selectById(productModel.getProductId());
- throw new RuntimeException(product.getProductName() + "/" + productModel.getModel() + "搴撳瓨涓嶈冻鏃犳硶鍑哄簱");
+ throw new RuntimeException(product.getProductName() + "/" + productModel.getModel() + "搴撳瓨涓嶈冻锛屾棤娉曞嚭搴�");
}
- stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ oldStockInventory.setQualitity(defaultDecimal(oldStockInventory.getQualitity()).subtract(stockInventoryDto.getQualitity()));
+ oldStockInventory.setVersion(oldStockInventory.getVersion() == null ? 1 : oldStockInventory.getVersion() + 1);
+ oldStockInventory.setUpdateTime(LocalDateTime.now());
+ stockInventoryMapper.updateById(oldStockInventory);
return true;
}
@Override
public R importStockInventory(MultipartFile file) {
try {
- // 鏌ヨ鎵�鏈夌殑浜у搧
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectProduct();
+ Map<String, SalesLedgerProduct> productMap = new HashMap<>();
+ for (SalesLedgerProduct product : salesLedgerProducts) {
+ String key = product.getProductCategory() + "|" + product.getSpecificationModel();
+ productMap.put(key, product);
+ }
- ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
+ ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
-
- // 璁板綍鏈壘鍒板尮閰嶉」鐨勬暟鎹�
List<String> unmatchedRecords = new ArrayList<>();
+ int successCount = 0;
- list.forEach(dto -> {
- boolean matched = false;
- for (SalesLedgerProduct item : salesLedgerProducts) {
- if (item.getProductCategory().equals(dto.getProductName()) &&
- item.getSpecificationModel().equals(dto.getModel())) {
+ for (StockInventoryExportData dto : list) {
+ String key = dto.getProductName() + "|" + dto.getModel();
+ SalesLedgerProduct matchedProduct = productMap.get(key);
+
+ if (matchedProduct != null) {
+ if (dto.getQualifiedQuantity() != null && dto.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(0L);
stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
- stockInventoryDto.setQualitity(dto.getQualitity());
+ stockInventoryDto.setQualitity(dto.getQualifiedQuantity());
stockInventoryDto.setRemark(dto.getRemark());
stockInventoryDto.setWarnNum(dto.getWarnNum());
- if (ObjectUtils.isNotEmpty(dto.getLockedQuantity()) && dto.getLockedQuantity().compareTo(dto.getQualitity()) > 0) {
- throw new RuntimeException("鍐荤粨鏁伴噺涓嶈兘瓒呰繃鏈瀵煎叆鐨勫簱瀛樻暟閲�");
+ stockInventoryDto.setBatchNo(dto.getQualifiedBatchNo());
+ stockInventoryDto.setProcessCategory(dto.getProcessCategory());
+ stockInventoryDto.setVoltage(dto.getVoltage());
+
+ if (ObjectUtils.isNotEmpty(dto.getQualifiedLockedQuantity())) {
+ if (dto.getQualifiedLockedQuantity().compareTo(dto.getQualifiedQuantity()) > 0) {
+ throw new RuntimeException("鍚堟牸鍐荤粨鏁伴噺涓嶈兘瓒呰繃鏈瀵煎叆鐨勫悎鏍煎簱瀛樻暟閲�");
+ }
+ stockInventoryDto.setLockedQuantity(dto.getQualifiedLockedQuantity());
+ } else {
+ stockInventoryDto.setLockedQuantity(BigDecimal.ZERO);
}
- stockInventoryDto.setLockedQuantity(dto.getLockedQuantity());
- stockInventoryDto.setProductModelId(item.getProductModelId());
+
+ stockInventoryDto.setProductModelId(matchedProduct.getProductModelId());
this.addstockInventory(stockInventoryDto);
- matched = true;
- break; // 鎵惧埌鍖归厤椤瑰悗璺冲嚭寰幆
+ successCount++;
}
+
+ if (dto.getUnQualifiedQuantity() != null && dto.getUnQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
+ stockUninventoryDto.setRecordId(0L);
+ stockUninventoryDto.setRecordType(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode());
+ stockUninventoryDto.setQualitity(dto.getUnQualifiedQuantity());
+ stockUninventoryDto.setRemark(dto.getRemark());
+ stockUninventoryDto.setBatchNo(dto.getUnQualifiedBatchNo());
+
+ if (ObjectUtils.isNotEmpty(dto.getUnQualifiedLockedQuantity())) {
+ if (dto.getUnQualifiedLockedQuantity().compareTo(dto.getUnQualifiedQuantity()) > 0) {
+ throw new RuntimeException("涓嶅悎鏍煎喕缁撴暟閲忎笉鑳借秴杩囨湰娆″鍏ョ殑涓嶅悎鏍煎簱瀛樻暟閲�");
+ }
+ stockUninventoryDto.setLockedQuantity(dto.getUnQualifiedLockedQuantity());
+ } else {
+ stockUninventoryDto.setLockedQuantity(BigDecimal.ZERO);
+ }
+
+ stockUninventoryDto.setProductModelId(matchedProduct.getProductModelId());
+ stockUninventoryService.addStockUninventory(stockUninventoryDto);
+ successCount++;
+ }
+ } else {
+ String unmatchedRecord = "浜у搧鍚嶇О锛�" + dto.getProductName() + "锛屽瀷鍙凤細" + dto.getModel() + " 鏈尮閰嶅埌搴撳瓨浜у搧";
+ unmatchedRecords.add(unmatchedRecord);
}
- 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");
+ message.append("瀵煎叆鎴愬姛 ").append(successCount).append(" 鏉¤褰曪紝浠ヤ笅浜у搧鏈尮閰嶏細\n");
for (String record : unmatchedRecords) {
message.append(record).append("\n");
}
- throw new RuntimeException(message.toString());
+ return R.ok(message.toString());
}
- } catch (Exception e) {
- e.printStackTrace();
- return R.fail("瀵煎叆澶辫触锛�" + e.getMessage());
- }
- return R.ok("瀵煎叆鎴愬姛");
- }
+ return R.ok("瀵煎叆鎴愬姛锛屽叡澶勭悊 " + successCount + " 鏉¤褰�");
+ } catch (Exception e) {
+ log.error("搴撳瓨瀵煎叆澶辫触", e);
+ 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, "搴撳瓨淇℃伅");
@@ -369,4 +462,132 @@
stockInventory.setLockedQuantity(stockInventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity()));
return this.updateById(stockInventory);
}
+
+ // 鍏ュ簱鍚堝苟鍞竴閿細鎴愬搧鎸夌被鍒拰鐢靛帇锛屽叾浣欏彧鎸変骇鍝佽鏍笺��
+ private StockInventory findInventoryForMerge(Long productModelId, String processCategory, String voltage) {
+ LambdaQueryWrapper<StockInventory> queryWrapper = new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, productModelId)
+ .orderByAsc(StockInventory::getId);
+ if (usesDimensionIdentity(processCategory, voltage)) {
+ queryWrapper.eq(StockInventory::getProcessCategory, normalizeDimension(processCategory));
+ queryWrapper.eq(StockInventory::getVoltage, normalizeDimension(voltage));
+ }
+ List<StockInventory> inventories = stockInventoryMapper.selectList(queryWrapper);
+ return inventories.isEmpty() ? null : inventories.get(0);
+ }
+
+ // 灏嗗叆搴撹褰� DTO 澶嶅埗涓烘寔涔呭寲瀹炰綋銆�
+ private StockInRecord toStockInRecord(StockInRecordDto stockInRecordDto) {
+ StockInRecord stockInRecord = new StockInRecord();
+ stockInRecord.setRecordId(stockInRecordDto.getRecordId());
+ stockInRecord.setRecordType(stockInRecordDto.getRecordType());
+ stockInRecord.setStockInNum(stockInRecordDto.getStockInNum());
+ stockInRecord.setProductModelId(stockInRecordDto.getProductModelId());
+ stockInRecord.setRemark(stockInRecordDto.getRemark());
+ stockInRecord.setType(stockInRecordDto.getType());
+ stockInRecord.setLockedQuantity(stockInRecordDto.getLockedQuantity());
+ stockInRecord.setWarnNum(stockInRecordDto.getWarnNum());
+ stockInRecord.setApproveStatus(stockInRecordDto.getApproveStatus());
+ stockInRecord.setBatchNo(stockInRecordDto.getBatchNo());
+ stockInRecord.setProcessCategory(stockInRecordDto.getProcessCategory());
+ stockInRecord.setVoltage(stockInRecordDto.getVoltage());
+ return stockInRecord;
+ }
+
+ // 鍙甯︽湁鎴愬搧缁村害锛屽氨鎸夌淮搴︿綔涓哄敮涓�閿��
+ private boolean usesDimensionIdentity(String processCategory, String voltage) {
+ return StringUtils.isNotBlank(processCategory) || StringUtils.isNotBlank(voltage);
+ }
+
+ private String normalizeDimension(String value) {
+ return StringUtils.trimToEmpty(value);
+ }
+
+ private BigDecimal defaultDecimal(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
+ private Map<Long, List<FinishedProductTreeDto>> buildFinishedProductLeafMap(List<StockInventoryDto> inventoryList) {
+ Map<Long, List<FinishedProductTreeDto>> leafMap = new HashMap<>();
+ for (StockInventoryDto inventory : inventoryList) {
+ FinishedProductTreeDto leafNode = new FinishedProductTreeDto();
+ leafNode.setId(inventory.getId() == null ? null : -inventory.getId());
+ leafNode.setParentId(inventory.getProductId());
+ leafNode.setProductId(inventory.getProductId());
+ leafNode.setProductModelId(inventory.getProductModelId());
+ leafNode.setProductName(inventory.getProductName());
+ leafNode.setLabel(buildLeafLabel(inventory));
+ leafNode.setModel(inventory.getModel());
+ leafNode.setMaterialCode(inventory.getMaterialCode());
+ leafNode.setProcessCategory(inventory.getProcessCategory());
+ leafNode.setVoltage(inventory.getVoltage());
+ leafNode.setChildren(new ArrayList<>());
+ leafMap.computeIfAbsent(inventory.getProductId(), key -> new ArrayList<>()).add(leafNode);
+ }
+ return leafMap;
+ }
+
+ private Set<Long> collectVisibleProductIds(Set<Long> leafProductIds, Map<Long, Product> productMap) {
+ Set<Long> visibleIds = new HashSet<>();
+ for (Long productId : leafProductIds) {
+ Long currentId = productId;
+ while (currentId != null) {
+ Product current = productMap.get(currentId);
+ if (current == null) {
+ break;
+ }
+ visibleIds.add(currentId);
+ currentId = current.getParentId();
+ }
+ }
+ return visibleIds;
+ }
+
+ private List<FinishedProductTreeDto> buildFinishedChildren(Long parentId,
+ Map<Long, List<Product>> childrenMap,
+ Map<Long, List<FinishedProductTreeDto>> leafMap,
+ Set<Long> visibleProductIds) {
+ List<FinishedProductTreeDto> children = new ArrayList<>();
+ List<Product> childProducts = childrenMap.getOrDefault(parentId, new ArrayList<>());
+ for (Product childProduct : childProducts) {
+ if (!visibleProductIds.contains(childProduct.getId())) {
+ continue;
+ }
+ FinishedProductTreeDto childNode = buildProductNode(childProduct);
+ List<FinishedProductTreeDto> subChildren = buildFinishedChildren(childProduct.getId(), childrenMap, leafMap, visibleProductIds);
+ subChildren.addAll(leafMap.getOrDefault(childProduct.getId(), new ArrayList<>()));
+ childNode.setChildren(subChildren);
+ children.add(childNode);
+ }
+ return children;
+ }
+
+ private FinishedProductTreeDto buildProductNode(Product product) {
+ FinishedProductTreeDto node = new FinishedProductTreeDto();
+ BeanUtils.copyProperties(product, node);
+ node.setLabel(product.getProductName());
+ node.setChildren(new ArrayList<>());
+ return node;
+ }
+
+ private boolean isFinishedRoot(Product product) {
+ return product.getParentId() == null && "鎴愬搧".equals(StringUtils.trimToEmpty(product.getProductName()));
+ }
+
+ private String buildLeafLabel(StockInventoryDto inventory) {
+ List<String> parts = new ArrayList<>();
+ if (StringUtils.isNotBlank(inventory.getProductName())) {
+ parts.add(StringUtils.trim(inventory.getProductName()));
+ }
+ if (StringUtils.isNotBlank(inventory.getModel())) {
+ parts.add(StringUtils.trim(inventory.getModel()));
+ }
+ if (StringUtils.isNotBlank(inventory.getProcessCategory())) {
+ parts.add(StringUtils.trim(inventory.getProcessCategory()));
+ }
+ if (StringUtils.isNotBlank(inventory.getVoltage())) {
+ parts.add(StringUtils.trim(inventory.getVoltage()));
+ }
+ return String.join(" / ", parts);
+ }
}
--
Gitblit v1.9.3