From 3217d11481d7440f1526499d14a0c398369aa0e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 14:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 33a6fb9..688e1a5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -183,15 +183,16 @@
}
/**
+ * @param params
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鏀惰揣鑷虫敹璐у尯
- * @param params
- * @return
* @time 2025/3/10 15:41
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params) {
+ public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -234,7 +235,7 @@
}
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
- if (Objects.isNull(rcpt)) {continue;}
+ if (null == rcpt || Objects.isNull(rcpt)) {continue;}
ReceiptDetlsDto dto = JSONObject.parseObject(JSONObject.toJSONString(rcpt), ReceiptDetlsDto.class);
Matnr matnr = matnrMapper.selectById(dto.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -300,6 +301,8 @@
.setAnfme(dto.getReceiptQty())
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setMatnrId(matnr.getId())
.setMaktx(matnr.getName())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
--
Gitblit v1.9.1