From 1ec35b0c78dcbab5f32077ca190c70085e90615b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 11:38:21 +0800
Subject: [PATCH] #修改 1. 质检问题修复 2. 收货单据问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 07e3d46..4ab88da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -16,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,15 +39,16 @@
private LocService locService;
/**
+ * @param
+ * @param userId
+ * @return
* @author Ryan
* @description 缁勬嫋
- * @param
- * @return
* @time 2025/3/29 14:42
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public WaitPakin mergeItems(WaitPakinParam waitPakin) {
+ public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
if (waitPakin.getItems().isEmpty()) {
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
}
@@ -125,6 +124,8 @@
.setFieldsIndex(item.getFieldsIndex())
.setMatnrId(item.getMatnrId())
.setMaktx(item.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
@@ -159,6 +160,8 @@
.setFieldsIndex(item.getFieldsIndex())
.setMatnrId(item.getMatnrId())
.setMaktx(item.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
--
Gitblit v1.9.1