From f4d4d29368ccacb807f93e2033cd4a643a3ddade Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 10:20:28 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 b3beded..7a6b54b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -1,9 +1,12 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProcessRouteDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProcessRouteMapper;
@@ -47,12 +50,23 @@
@Override
public Integer saveProcessRoute(ProcessRoute processRoute) {
+ String nickName = SecurityUtils.getLoginUser().getNickName();
+ processRoute.setCreateBy(nickName);
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);
+ // 鏂板瀛愯〃鏁版嵁
+ if(CollectionUtils.isNotEmpty(processRoute.getProcessRouteItems())){
+ for (ProcessRouteItem processRouteItem : processRoute.getProcessRouteItems()) {
+ processRouteItem.setRouteId(processRoute.getId());
+ processRouteItemMapper.insert(processRouteItem);
+ }
+ }
+ if(StringUtils.isEmpty(processRoute.getProcessRouteCode())){
+ 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);
}
@@ -60,11 +74,24 @@
public int batchDelete(List<Long> ids) {
//鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
List<ProductOrder> productOrders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getRouteId, ids));
- if (productOrders.size()>0){
+ if (CollectionUtils.isNotEmpty(productOrders)){
throw new RuntimeException("璇ュ伐鑹鸿矾绾跨敓浜у凡寮曠敤锛屼笉鑳藉垹闄�");
}
//鍒犻櫎宸ヨ壓璺嚎璇︽儏
processRouteItemMapper.delete(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId, ids));
return processRouteMapper.deleteBatchIds(ids);
}
+
+ @Override
+ public int updateProcessRoute(ProcessRoute processRoute) {
+ this.updateById(processRoute);
+ processRouteItemMapper.delete(Wrappers.<ProcessRouteItem>lambdaQuery().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
+ if(CollectionUtils.isNotEmpty(processRoute.getProcessRouteItems())){
+ for (ProcessRouteItem processRouteItem : processRoute.getProcessRouteItems()) {
+ processRouteItem.setRouteId(processRoute.getId());
+ processRouteItemMapper.insert(processRouteItem);
+ }
+ }
+ return 1;
+ }
}
--
Gitblit v1.9.3