From 124a6178ae918de05886b52199b7755d4fa1ece3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 78e15d1..b62665a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -4,16 +4,19 @@
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.mapper.ProductProcessRouteMapper;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.pojo.ProductOrder;
-import com.ruoyi.production.pojo.ProductProcessRoute;
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;
@@ -22,7 +25,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -39,6 +42,13 @@
@Autowired
private ProductOrderMapper productOrderMapper;
+ @Autowired
+ private ProductStructureService productStructureService;
+
+ @Autowired
+ private SysDictDataMapper sysDictDataMapper;
+
+
@Override
public IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
@@ -48,6 +58,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Integer saveProcessRoute(ProcessRoute 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"));
@@ -70,4 +88,27 @@
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;
+ }
+
+ @Override
+ public ProcessRoute latestTypeDate(String productName, String strength) {
+ return baseMapper.latestTypeDate(productName, strength);
+ }
}
--
Gitblit v1.9.3