From bf84fec7d8dd5e7fbcc93030b8d83da7ec0ece91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:39:36 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
index 91dbec8..bcccf4f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -62,14 +62,42 @@
@Autowired
private ProductProcessService productProcessService;
+
@Override
public IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto) {
return productBomMapper.listPage(page, productBomDto);
}
+ /**
+ * 浜у搧鏍规嵁bom璁＄畻瀛愰」鏁伴噺锛堝彧缁熻浜岀骇锛�
+ */
+ public Long countChild(Long productModelId) {
+ ProductBom productBom = productBomMapper.selectOne(new LambdaQueryWrapper<ProductBom>()
+ .eq(ProductBom::getProductModelId, productModelId));
+ if(productBom != null){
+ return productStructureService.countBybomId(productBom.getId());
+ }
+ return 0L;
+ }
+
+ /**
+ * 鍒ゆ柇浜у搧鏄惁瀛樺湪bom false涓嶅瓨鍦� true瀛樺湪
+ * @param productBom
+ * @return
+ */
+ public boolean checkBom(ProductBom productBom) {
+ ProductBom productBom1 = productBomMapper.selectOne(new LambdaQueryWrapper<ProductBom>()
+ .eq(ProductBom::getProductModelId, productBom.getProductModelId()));
+ return productBom1 == null ? false : true;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(ProductBom productBom) {
+ boolean b = checkBom(productBom);
+ if (b) {
+ return AjaxResult.error("浜у搧妯″瀷宸插瓨鍦˙OM");
+ }
boolean save = productBomMapper.insert(productBom) > 0;
if (save) {
String no = "BM." + String.format("%05d", productBom.getId());
@@ -109,15 +137,6 @@
ProductBom bom,ProductModel rootModel,
Map<String, Long> processMap,
List<BomImportErrorDto> errorList ) {
- // 1. 鑾峰彇children涓瓙椤逛骇鍝佺紪鍙蜂负绌虹殑鏁版嵁
- List<BomImportDto> parentChildren = children
- .stream()
- .filter(child -> StringUtils.isEmpty(child.getChildCode()))
- .collect(Collectors.toList());
- if(CollectionUtils.isEmpty(parentChildren)){
- return;
- }
- BomImportDto parentId = parentChildren.get(0); // 鐖剁骇鏁版嵁
ProductStructure rootNode = new ProductStructure();
rootNode.setBomId(bom.getId());
rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
@@ -133,7 +152,7 @@
continue;
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
- ProductModel childModel = findModel(child.getChildName(), child.getChildSpec());
+ ProductModel childModel = findModel(child.getChildName(), child.getChildCode());
if(childModel.getId() == null){
BomImportErrorDto errorDto = new BomImportErrorDto();
BeanUtils.copyProperties(child, errorDto);
@@ -189,7 +208,7 @@
// 鍒涘缓 BOM 鏁版嵁
BomImportDto first = entry.getValue().get(0);
- ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
+ ProductModel rootModel = findModel(first.getParentName(), first.getParentCode());
if(rootModel.getId() == null){
BomImportErrorDto error = new BomImportErrorDto();
BeanUtils.copyProperties(first, error);
@@ -197,9 +216,18 @@
errorList.add(error);
continue;
}
+
ProductBom bom = new ProductBom();
bom.setProductModelId(rootModel.getId());
bom.setVersion("1.0");
+ boolean b = checkBom(bom);
+ if(b){
+ BomImportErrorDto error = new BomImportErrorDto();
+ BeanUtils.copyProperties(first, error);
+ error.setErrorMsg("浜у搧銆�"+ first.getParentSpec() + "銆態OM宸插瓨鍦�");
+ errorList.add(error);
+ continue;
+ }
productBomMapper.insert(bom);
bom.setBomNo("BM." + String.format("%05d", bom.getId()));
productBomMapper.updateById(bom);
@@ -282,6 +310,22 @@
util.exportExcel(response, exportList, "BOM缁撴瀯瀵煎嚭");
}
+ @Override
+ public String updateBom(ProductBom productBom) {
+ ProductBom productBom1 = productBomMapper.selectById(productBom.getId());
+ if(productBom.getProductModelId().equals(productBom1.getProductModelId())){
+ productBomMapper.updateById(productBom);
+ }else{
+ boolean b = checkBom(productBom);
+ if(b){
+ throw new ServiceException("浜у搧BOM宸插瓨鍦�");
+ }else{
+ productBomMapper.updateById(productBom);
+ }
+ }
+ return "淇敼鎴愬姛";
+ }
+
private void populateMap(List<ProductStructureDto> nodes, Map<Long, ProductStructureDto> map) {
if (nodes == null || nodes.isEmpty()) {
return;
--
Gitblit v1.9.3