From 12d467a5d380f99d02bf7f15e6be83e284e95a7d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 26 五月 2026 17:43:55 +0800
Subject: [PATCH] feat: 办公用品(日常用品)，领用归还。领用归还记录 完成 ps:如果pro使用直接引入该commit
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index c82ac34..857fdc6 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -92,6 +92,11 @@
stockInRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockInRecordDto.setType("0");
+ stockInRecordDto.setRemark(stockInventoryDto.getRemark());
+ // 濡傛灉DTO涓寚瀹氫簡瀹℃壒鐘舵�侊紝鍒欎娇鐢紱鍚﹀垯榛樿寰呭鎵�
+ if (stockInventoryDto.getApprovalStatus() != null) {
+ stockInRecordDto.setApprovalStatus(stockInventoryDto.getApprovalStatus());
+ }
stockInRecordService.add(stockInRecordDto);
//鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
//鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
@@ -132,6 +137,11 @@
stockOutRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
+ stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
+ // 濡傛灉DTO涓寚瀹氫簡瀹℃壒鐘舵�侊紝鍒欎娇鐢紱鍚﹀垯榛樿寰呭鎵�
+ if (stockInventoryDto.getApprovalStatus() != null) {
+ stockOutRecordDto.setApprovalStatus(stockInventoryDto.getApprovalStatus());
+ }
stockOutRecordService.add(stockOutRecordDto);
@@ -440,4 +450,9 @@
public IPage<StockInventoryDto> getBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
return stockInventoryMapper.getBatchNoQty(page, stockInventoryDto);
}
+
+ @Override
+ public IPage<StockInventoryDto> pageStockAndBorrow(Page page, StockInventoryDto stockInventoryDto) {
+ return stockInventoryMapper.pageStockAndBorrow(page, stockInventoryDto);
+ }
}
--
Gitblit v1.9.3