From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
index cf8c3b1..96e8de7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.CommonExceStatus;
import com.vincent.rsf.server.manager.mapper.ReviseLogItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -40,7 +41,7 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public List<ReviseLogItem> itemSave(ReviseLogItemParams reviseLogItem, Long userId) {
ReviseLog reviseLog = reviseLogService.getById(reviseLogItem.getReviseLogId());
if (Objects.isNull(reviseLog)) {
@@ -71,29 +72,29 @@
throw new RuntimeException("搴撳瓨鏄庣粏璋冩暣澶辫触");
}
- LocItem one = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
- .eq(LocItem::getMatnrId, logItem.getMatnrId())
- .eq(StringUtils.isNotBlank(logItem.getBatch()), LocItem::getBatch, logItem.getBatch())
- .eq(StringUtils.isNotBlank(logItem.getFieldsIndex()), LocItem::getFieldsIndex, logItem.getFieldsIndex())
- .eq(LocItem::getLocCode, logItem.getLocCode()));
- if (Objects.isNull(one)) {
- LocItem locDetl = new LocItem();
- BeanUtils.copyProperties(logItem, locDetl);
- locDetl.setLocId(loc.getId())
- .setLocCode(loc.getCode())
- .setAnfme(logItem.getReviseQty())
- .setUpdateBy(userId)
- .setId(null)
- .setCreateBy(userId);
- if (!locItemService.save(locDetl)) {
- throw new CoolException("搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
- } else {
- one.setAnfme(logItem.getReviseQty());
- if (!locItemService.updateById(one)) {
- throw new RuntimeException("搴撳瓨鏄庣粏淇敼澶辫触锛侊紒");
- }
- }
+// LocItem one = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+// .eq(LocItem::getMatnrId, logItem.getMatnrId())
+// .eq(StringUtils.isNotBlank(logItem.getBatch()), LocItem::getBatch, logItem.getBatch())
+// .eq(StringUtils.isNotBlank(logItem.getFieldsIndex()), LocItem::getFieldsIndex, logItem.getFieldsIndex())
+// .eq(LocItem::getLocCode, logItem.getLocCode()));
+// if (Objects.isNull(one)) {
+// LocItem locDetl = new LocItem();
+// BeanUtils.copyProperties(logItem, locDetl);
+// locDetl.setLocId(loc.getId())
+// .setLocCode(loc.getCode())
+// .setAnfme(logItem.getReviseQty())
+// .setUpdateBy(userId)
+// .setId(null)
+// .setCreateBy(userId);
+// if (!locItemService.save(locDetl)) {
+// throw new CoolException("搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
+// }
+// } else {
+// one.setAnfme(logItem.getReviseQty());
+// if (!locItemService.updateById(one)) {
+// throw new RuntimeException("搴撳瓨鏄庣粏淇敼澶辫触锛侊紒");
+// }
+// }
});
List<ReviseLog> list = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
@@ -110,6 +111,7 @@
if (!locReviseService.update(new LambdaUpdateWrapper<LocRevise>()
.eq(LocRevise::getId, reviseLog.getReviseId())
.set(LocRevise::getAnfme, anfems)
+ .set(LocRevise::getExceStatus, CommonExceStatus.COMMON_EXCE_STATUS_EXCE_ING.val)
.set(LocRevise::getReviseQty, reviseQty))) {
throw new RuntimeException("搴撳瓨璋冩暣鍗曚慨鏀瑰け璐ワ紒锛�");
}
--
Gitblit v1.9.1