From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 177 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
index 8894288..0aabe70 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
@@ -15,9 +15,15 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.pojo.ProcurementDemand;
+import com.ruoyi.procurementrecord.service.ProcurementDemandService;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.technology.bean.dto.BomImportDto;
+import com.ruoyi.technology.bean.dto.BomKitCheckDto;
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.dto.TechnologyBomStructureDto;
+import com.ruoyi.technology.bean.vo.BomKitCheckItemVo;
import com.ruoyi.technology.bean.vo.TechnologyBomStructureVo;
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
@@ -49,6 +55,8 @@
private final TechnologyRoutingMapper technologyRoutingMapper;
private final IProductService productService;
private final TechnologyBomStructureMapper technologyBomStructureMapper;
+ private final StockInventoryMapper stockInventoryMapper;
+ private final ProcurementDemandService procurementDemandService;
/**
* 鍒嗛〉鏌ヨBOM鍒楄〃銆�
@@ -90,12 +98,18 @@
@Transactional(rollbackFor = Exception.class)
public R add(TechnologyBom technologyBom) {
validateProductModel(technologyBom.getProductModelId());
+ if (technologyBom.getStatus() == null) {
+ technologyBom.setStatus(1);
+ }
boolean saved = technologyBomMapper.insert(technologyBom) > 0;
if (!saved) {
return R.fail("Add BOM failed");
}
technologyBom.setBomNo("BM." + String.format("%05d", technologyBom.getId()));
technologyBomMapper.updateById(technologyBom);
+ if (Integer.valueOf(1).equals(technologyBom.getStatus())) {
+ deactivateOtherVersions(technologyBom.getProductModelId(), technologyBom.getId().longValue());
+ }
initRootStructure(technologyBom.getId().longValue(), technologyBom.getProductModelId());
return R.ok();
}
@@ -124,7 +138,24 @@
technologyBom.setBomNo(oldBom.getBomNo());
}
technologyBomMapper.updateById(technologyBom);
+ if (Integer.valueOf(1).equals(technologyBom.getStatus())) {
+ deactivateOtherVersions(technologyBom.getProductModelId(), technologyBom.getId().longValue());
+ }
return R.ok();
+ }
+
+ /**
+ * 鍚屼竴浜у搧瑙勬牸鍙繚鐣欎竴涓惎鐢ㄧ増鏈�
+ */
+ private void deactivateOtherVersions(Long productModelId, Long keepId) {
+ if (productModelId == null) {
+ return;
+ }
+ technologyBomMapper.update(null, Wrappers.<TechnologyBom>lambdaUpdate()
+ .set(TechnologyBom::getStatus, 0)
+ .eq(TechnologyBom::getProductModelId, productModelId)
+ .ne(TechnologyBom::getId, keepId)
+ .eq(TechnologyBom::getStatus, 1));
}
/**
@@ -341,6 +372,7 @@
newTechnologyBom.setProductModelId(oldTechnologyBom.getProductModelId());
newTechnologyBom.setVersion("FZ" + oldTechnologyBom.getVersion());
newTechnologyBom.setRemark(oldTechnologyBom.getRemark());
+ newTechnologyBom.setStatus(0);
boolean saved = technologyBomMapper.insert(newTechnologyBom) > 0;
if (!saved) {
return R.fail("Copy BOM failed");
@@ -483,4 +515,149 @@
long randomNum = ThreadLocalRandom.current().nextLong(min, max + 1);
return String.valueOf(randomNum);
}
+
+ /**
+ * BOM榻愬鍒嗘瀽锛氶�愬眰灞曞紑鏍戯紙闇�姹傞噺=鐖堕渶姹偯楀崟浣嶇敤閲忥級锛屾寜瑙勬牸姹囨�诲悗涓庡彲鐢ㄥ簱瀛樻瘮瀵广��
+ * 鍙敤搴撳瓨 = 危(搴撳瓨鏁伴噺 - 閿佸畾鏁伴噺)锛岀己鍙� = max(闇�姹傞噺 - 鍙敤搴撳瓨, 0)銆�
+ */
+ @Override
+ public List<BomKitCheckItemVo> kitCheck(BomKitCheckDto dto) {
+ if (dto == null || dto.getBomId() == null || dto.getDemandQty() == null
+ || dto.getDemandQty().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("璇蜂紶鍏omId鍜岄渶姹傛暟閲�(椤诲ぇ浜�0)");
+ }
+ TechnologyBom bom = technologyBomMapper.selectById(dto.getBomId());
+ if (bom == null) {
+ throw new ServiceException("BOM涓嶅瓨鍦�");
+ }
+ List<TechnologyBomStructureVo> roots = technologyBomStructureService.listByBomId(dto.getBomId());
+ if (CollUtil.isEmpty(roots)) {
+ throw new ServiceException("BOM缁撴瀯涓虹┖锛岃鍏堢淮鎶ょ墿鏂欐竻鍗�");
+ }
+
+ Map<Long, BigDecimal> requiredMap = new LinkedHashMap<>();
+ for (TechnologyBomStructureVo root : roots) {
+ expandRequirements(root, dto.getDemandQty(), requiredMap, true);
+ }
+ if (requiredMap.isEmpty()) {
+ throw new ServiceException("BOM涓嬫棤鐗╂枡鑺傜偣");
+ }
+
+ Map<Long, BigDecimal> availMap = new HashMap<>();
+ List<StockInventory> stocks = stockInventoryMapper.selectList(Wrappers.<StockInventory>lambdaQuery()
+ .in(StockInventory::getProductModelId, requiredMap.keySet()));
+ for (StockInventory s : stocks) {
+ BigDecimal avail = s.getQualitity() == null ? BigDecimal.ZERO : s.getQualitity();
+ avail = avail.subtract(s.getLockedQuantity() == null ? BigDecimal.ZERO : s.getLockedQuantity());
+ availMap.merge(s.getProductModelId(), avail, BigDecimal::add);
+ }
+
+ List<ProductModel> models = productModelService.listByIds(requiredMap.keySet());
+ Map<Long, ProductModel> modelMap = models.stream()
+ .collect(Collectors.toMap(ProductModel::getId, m -> m, (a, b) -> a));
+ Map<Long, String> productNameMap = new HashMap<>();
+ Set<Long> productIds = models.stream().map(ProductModel::getProductId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ if (!productIds.isEmpty()) {
+ productService.listByIds(productIds)
+ .forEach(p -> productNameMap.put(p.getId().longValue(), p.getProductName()));
+ }
+
+ List<BomKitCheckItemVo> result = new ArrayList<>();
+ for (Map.Entry<Long, BigDecimal> entry : requiredMap.entrySet()) {
+ BigDecimal required = entry.getValue();
+ BigDecimal available = availMap.getOrDefault(entry.getKey(), BigDecimal.ZERO);
+ ProductModel pm = modelMap.get(entry.getKey());
+ BomKitCheckItemVo vo = new BomKitCheckItemVo();
+ vo.setProductModelId(entry.getKey());
+ vo.setProductName(pm == null ? null : productNameMap.get(pm.getProductId()));
+ vo.setModel(pm == null ? null : pm.getModel());
+ vo.setUnit(pm == null ? null : pm.getUnit());
+ vo.setRequiredQty(required);
+ vo.setAvailableQty(available);
+ vo.setShortageQty(required.subtract(available).max(BigDecimal.ZERO));
+ result.add(vo);
+ }
+ result.sort(Comparator.comparing(BomKitCheckItemVo::getShortageQty).reversed());
+ return result;
+ }
+
+ private void expandRequirements(TechnologyBomStructureVo node, BigDecimal requiredQty,
+ Map<Long, BigDecimal> requiredMap, boolean isRoot) {
+ if (!isRoot && node.getProductModelId() != null) {
+ requiredMap.merge(node.getProductModelId(), requiredQty, BigDecimal::add);
+ }
+ if (CollUtil.isNotEmpty(node.getChildren())) {
+ for (TechnologyBomStructureVo child : node.getChildren()) {
+ BigDecimal unitQty = child.getUnitQuantity() == null ? BigDecimal.ZERO : child.getUnitQuantity();
+ expandRequirements(child, requiredQty.multiply(unitQty), requiredMap, false);
+ }
+ }
+ }
+
+ /**
+ * 灏嗙己鍙ｇ墿鏂欏啓鍏ラ噰璐渶姹傦細鍚岃鏍煎凡瀛樺湪寰呭鐞嗚褰曞垯绱姞缂哄彛锛屽惁鍒欐柊澧炪��
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R generateProcurementDemand(BomKitCheckDto dto) {
+ List<BomKitCheckItemVo> items = kitCheck(dto);
+ List<BomKitCheckItemVo> shortages = items.stream()
+ .filter(item -> item.getShortageQty().compareTo(BigDecimal.ZERO) > 0)
+ .collect(Collectors.toList());
+ if (shortages.isEmpty()) {
+ return R.ok("搴撳瓨榻愬锛屾棤闇�鐢熸垚閲囪喘闇�姹�");
+ }
+ TechnologyBom bom = technologyBomMapper.selectById(dto.getBomId());
+ int created = 0;
+ int merged = 0;
+ for (BomKitCheckItemVo item : shortages) {
+ ProcurementDemand exist = procurementDemandService.getOne(Wrappers.<ProcurementDemand>lambdaQuery()
+ .eq(ProcurementDemand::getProductModelId, item.getProductModelId())
+ .eq(ProcurementDemand::getStatus, 0)
+ .last("limit 1"));
+ if (exist != null) {
+ exist.setDemandQuantity(exist.getDemandQuantity().add(item.getShortageQty()));
+ exist.setStockQuantity(item.getAvailableQty());
+ exist.setSourceBomId(dto.getBomId());
+ exist.setSourceBomNo(bom == null ? null : bom.getBomNo());
+ procurementDemandService.updateById(exist);
+ merged++;
+ } else {
+ ProcurementDemand demand = new ProcurementDemand();
+ demand.setProductModelId(item.getProductModelId());
+ demand.setProductName(item.getProductName());
+ demand.setProductModel(item.getModel());
+ demand.setUnit(item.getUnit());
+ demand.setDemandQuantity(item.getShortageQty());
+ demand.setStockQuantity(item.getAvailableQty());
+ demand.setSourceBomId(dto.getBomId());
+ demand.setSourceBomNo(bom == null ? null : bom.getBomNo());
+ demand.setStatus(0);
+ procurementDemandService.save(demand);
+ created++;
+ }
+ }
+ return R.ok(String.format("閲囪喘闇�姹傜敓鎴愬畬鎴愶細鏂板 %d 鏉★紝绱姞鍚堝苟 %d 鏉�", created, merged));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R changeStatus(Integer id, Integer status) {
+ if (id == null || status == null || (status != 0 && status != 1)) {
+ return R.fail("鍙傛暟閿欒锛氶渶浼犲叆id鍜岀姸鎬�(1鍚敤/0鍋滅敤)");
+ }
+ TechnologyBom bom = technologyBomMapper.selectById(id);
+ if (bom == null) {
+ return R.fail("BOM涓嶅瓨鍦�");
+ }
+ TechnologyBom update = new TechnologyBom();
+ update.setId(id);
+ update.setStatus(status);
+ technologyBomMapper.updateById(update);
+ if (Integer.valueOf(1).equals(status)) {
+ deactivateOtherVersions(bom.getProductModelId(), id.longValue());
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.3