From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步（安全培训-筛选优化）
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 e6aa3c3..ec7a12c 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -77,12 +77,13 @@
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("0");
- int add = stockInRecordService.add(stockInRecordDto);
+ Long id = stockInRecordService.add(stockInRecordDto);
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (add > 0) {
+ if (id != null) {
try {
- addApproveByPurchase(loginUser, stockInRecordDto);
+ addApproveByPurchase(loginUser, stockInRecordDto,id);
} catch (Exception e) {
e.printStackTrace();
}
@@ -90,7 +91,7 @@
return true;
}
- public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto) throws Exception {
+ public void addApproveByPurchase(LoginUser loginUser, StockInRecordDto stockInRecordDto,Long id) throws Exception {
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(9);
approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
@@ -100,7 +101,7 @@
approveProcessVO.setApproveTime(LocalDate.now().toString());
approveProcessVO.setInventoryReview(false);
approveProcessVO.setStorageType("鍚堟牸鍏ュ簱");
- approveProcessVO.setRecordId(stockInRecordDto.getId());
+ approveProcessVO.setRecordId(id);
approveProcessService.addApprove(approveProcessVO);
}
--
Gitblit v1.9.3