From d9a10bd4084b406c40fcbb94c816cffd6e68d031 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:30:52 +0800
Subject: [PATCH] fix:入库审批
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 32 ++++++++++++++++----------------
src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java | 1 +
src/main/resources/mapper/stock/StockInRecordMapper.xml | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 +
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 9e70dfd..de7e81b 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -264,6 +264,14 @@
}
}
+ // 鍏ュ簱瀹℃牳
+ if (approveProcess.getApproveType().equals(9)) {
+ StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
+ if (!approveNode.isInventoryReview()) {
+ stockInRecord.setApproveStatus(3);
+ stockInRecordService.updateById(stockInRecord);
+ }
+ }
// 缁戝畾闄勪欢
if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
@@ -287,7 +295,14 @@
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
"/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
- } else if (approveProcess.getApproveType() == 9) {
+ } else {
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }
+ } else {
+ if (approveProcess.getApproveType() == 9) {
StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
if (approveNode.isInventoryReview()) {
if ("涓嶅悎鏍煎叆搴�".equals(approveNode.getStorageType())) {
@@ -297,22 +312,7 @@
}
stockInRecord.setApproveStatus(2);
stockInRecordService.updateById(stockInRecord);
- sysNoticeService.simpleNoticeByUser(
- approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType()
- + "&approveId=" + approveProcess.getApproveId()
- );
- }else {
- stockInRecord.setApproveStatus(3);
- stockInRecordService.updateById(stockInRecord);
}
- } else {
- sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
}
}
break;
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 418b71e..4ffb6c5 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -136,7 +136,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- stockInRecordDto.setApproveStatus(2);
+ stockInRecordDto.setApproveStatus(1);
return stockInRecordMapper.updateById(stockInRecordDto);
}
}
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 62ad936..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,6 +77,7 @@
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity());
+ stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("0");
Long id = stockInRecordService.add(stockInRecordDto);
LoginUser loginUser = SecurityUtils.getLoginUser();
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
index 42e49c1..6fdef58 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -63,6 +63,7 @@
stockInRecordDto.setStockInNum(stockUninventoryDto.getQualitity());
stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
+ stockInRecordDto.setApproveStatus(0);
stockInRecordDto.setType("1");
Long id = stockInRecordService.add(stockInRecordDto);
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 4850054..1dd3a52 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -75,7 +75,7 @@
LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
LEFT JOIN product_order po ON po.id = pwo.product_order_id
WHERE
- sir.id = 233
+ sir.id = #{id}
ORDER BY
sir.id DESC
</select>
--
Gitblit v1.9.3