From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人,维护时间默认当前 2.销售报价审核非必填,产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间,修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了,增加生产订单当前工序 3.库存导入模板规格改成图纸编号,产品名称可以为空,加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量(只统计二级)

---
 src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 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..b334365 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());
@@ -197,9 +225,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 +319,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