From 5419a78b26e0005d65d53ad77ab437e6b5e6f712 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 15:36:27 +0800
Subject: [PATCH] feat(log): 添加日志报告备注字段并完善库存管理功能
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 3 +++
src/main/java/com/ruoyi/approve/pojo/LogReport.java | 6 ++++++
src/main/java/com/ruoyi/approve/service/impl/LogReportServiceImpl.java | 6 ++++++
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 1 +
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/LogReport.java b/src/main/java/com/ruoyi/approve/pojo/LogReport.java
index 45fff38..c46b2e4 100644
--- a/src/main/java/com/ruoyi/approve/pojo/LogReport.java
+++ b/src/main/java/com/ruoyi/approve/pojo/LogReport.java
@@ -62,6 +62,12 @@
private Integer pushStatus;
/**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ /**
* 鍒涘缓浜�
*/
@Schema(description = "鍒涘缓浜�")
diff --git a/src/main/java/com/ruoyi/approve/service/impl/LogReportServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/LogReportServiceImpl.java
index aea0e0b..040be48 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/LogReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/LogReportServiceImpl.java
@@ -73,6 +73,9 @@
@Override
public Boolean add(LogReportDto sysLogReport) {
+ if (ObjectUtils.isEmpty(sysLogReport.getCcUserIds())) {
+ throw new RuntimeException("璇烽�夋嫨鎶勯�佷汉");
+ }
String collect = sysLogReport.getCcUserIds().stream()
.map(String::valueOf) // Long 鈫� String
.collect(Collectors.joining(","));// 鎷兼帴涓� "1,2,3"
@@ -87,6 +90,9 @@
@Override
public Boolean updateSysLogReportDto(LogReportDto sysLogReport) {
+ if (ObjectUtils.isEmpty(sysLogReport.getCcUserIds())) {
+ throw new RuntimeException("璇烽�夋嫨鎶勯�佷汉");
+ }
String collect = sysLogReport.getCcUserIds().stream()
.map(String::valueOf) // Long 鈫� String
.collect(Collectors.joining(","));// 鎷兼帴涓� "1,2,3"
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index 4e5688f..f0a199b 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -24,4 +24,7 @@
@Excel(name = "鍗曚綅")
private String unit;
+ @Excel(name = "搴撳瓨閲�")
+ private String stockInventory;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index cae6632..9cba3fe 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -84,5 +84,6 @@
* 搴撳瓨閲�
*/
@Schema(description = "搴撳瓨閲�")
+ @Excel(name = "搴撳瓨閲�")
private BigDecimal stockInventory;
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
index 51021a7..4b6bfa0 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
@@ -119,6 +119,8 @@
return R.fail("鐩樼偣鍗曚笉瀛樺湪");
}
for (StockInventoryCheckItem item : stockInventoryCheckPlanDto.getCheckItems()) {
+ //鏇存柊搴撳瓨閿佸畾鐘舵��
+ stockInventoryService.updateLocked(item.getProductModelId(),item.getBatchNo(), false);
if (item.getDifferenceQuantity() == null || item.getDifferenceQuantity().compareTo(BigDecimal.ZERO) == 0) {
continue;
}
@@ -139,8 +141,6 @@
//鐩存帴瀹℃牳閫氳繃
stockOutRecordService.batchApprove(Collections.singletonList(stock.getId()), 1);
}
- //鏇存柊搴撳瓨閿佸畾鐘舵��
- stockInventoryService.updateLocked(stockInventoryDto.getProductModelId(),stockInventoryDto.getBatchNo(), false);
}
stockInventoryCheckItemMapper.updateById(stockInventoryCheckPlanDto.getCheckItems());
plan.setStatus(2);
--
Gitblit v1.9.3