From 86d777aff8412b49fa83f51a1d9e0524e58f6059 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 14:31:13 +0800
Subject: [PATCH] fix: 删除生产订单未回退下发数量与更新下发状态

---
 src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java |   80 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index a5427d2..411f2c8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -1,12 +1,22 @@
 package com.ruoyi.production.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.production.dto.ProcessRouteDto;
+import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.mapper.ProcessRouteItemMapper;
 import com.ruoyi.production.mapper.ProcessRouteMapper;
+import com.ruoyi.production.mapper.ProductOrderMapper;
 import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.pojo.ProductOrder;
 import com.ruoyi.production.service.ProcessRouteService;
+import com.ruoyi.production.service.ProductStructureService;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +25,8 @@
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 @AllArgsConstructor
@@ -24,6 +36,19 @@
     @Autowired
     private ProcessRouteMapper processRouteMapper;
 
+    @Autowired
+    private ProcessRouteItemMapper processRouteItemMapper;
+
+    @Autowired
+    private ProductOrderMapper productOrderMapper;
+
+    @Autowired
+    private ProductStructureService productStructureService;
+
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+
+
     @Override
     public IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
 
@@ -31,13 +56,54 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer saveProcessRoute(ProcessRoute processRoute) {
-        this.save(processRoute);
-        String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        String idStr = String.format("%06d", processRoute.getId());
-        String newProductCode = "GYLX" + dateStr + idStr;
-        // 鏇存柊鏁版嵁搴撲腑鐨刾roductCode
-        processRoute.setProcessRouteCode(newProductCode);
-        return processRouteMapper.updateById(processRoute);
+        if (processRoute == null || processRoute.getDictCode() == null) {
+            throw new ServiceException("鏂板宸ヨ壓璺嚎澶辫触,浜у搧绫诲瀷涓嶈兘涓虹┖");
+        }
+        SysDictData sysDictData = sysDictDataMapper.selectDictDataById(processRoute.getDictCode());
+        if (sysDictData == null) {
+            throw new ServiceException("鏂板宸ヨ壓璺嚎澶辫触,浜у搧绫诲瀷涓嶅瓨鍦�");
+        }
+
+        save(processRoute);
+        if (processRoute.getProcessRouteCode() == null || processRoute.getProcessRouteCode().trim().isEmpty()) {
+            String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String idStr = String.format("%06d", processRoute.getId());
+            String newProductCode = "GYLX" + dateStr + idStr;
+            processRoute.setProcessRouteCode(newProductCode);
+            return processRouteMapper.updateById(processRoute);
+        }
+        return 1;
+    }
+
+    @Override
+    public int batchDelete(List<Long> ids) {
+        //鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
+        List<ProductOrder> productOrders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getRouteId, ids));
+        if (productOrders.size() > 0) {
+            throw new RuntimeException("璇ュ伐鑹鸿矾绾跨敓浜у凡寮曠敤锛屼笉鑳藉垹闄�");
+        }
+        //鍒犻櫎宸ヨ壓璺嚎璇︽儏
+        processRouteItemMapper.delete(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId, ids));
+        return processRouteMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public List<ProductStructureDto> getRouteBom(Long id) {
+        if (id == null) {
+            return new ArrayList<>(0);
+        }
+
+        ProcessRoute processRoute = getById(id);
+        if (processRoute == null) {
+            throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
+        }
+
+        List<ProductStructureDto> list = productStructureService.listByBomId(processRoute.getBomId());
+        if (list == null) {
+            list = new ArrayList<>(0);
+        }
+        return list;
     }
 }

--
Gitblit v1.9.3