From 5b08b6df3883a502990785a23dc2ecc9e58e0e41 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 13:44:05 +0800
Subject: [PATCH] feat: 入库管理新增"缺货字段"和"缺货情况"
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 4 +++-
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 10 ++++++++++
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 4 ++++
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 10 ++++++++++
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java | 11 +++++++++++
src/main/java/com/ruoyi/procurementrecord/dto/Details.java | 10 ++++++++++
6 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
index 2af2db0..2f9eaf6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -15,4 +15,14 @@
private BigDecimal warnNum;
private Long productModelId;
+ /**
+ * 缂鸿揣鏁伴噺
+ */
+ private BigDecimal outStockQuantity;
+
+ /**
+ * 缂鸿揣鎯呭喌
+ */
+ private String shortageDescription;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 4f3f260..9b7c280 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -151,4 +151,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
+ /**
+ * 缂鸿揣鏁伴噺
+ */
+ private BigDecimal outStockQuantity;
+
+ /**
+ * 缂鸿揣鎯呭喌
+ */
+ private String shortageDescription;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
index 82e02f1..f20800b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
@@ -20,4 +20,15 @@
private List<Integer> ids;
+ /**
+ * 缂鸿揣鏁伴噺
+ */
+ private BigDecimal outStockQuantity;
+
+ /**
+ * 缂鸿揣鎯呭喌
+ */
+ private String shortageDescription;
+
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index d3bd7c0..93b12b7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -46,6 +46,16 @@
// private BigDecimal minStock;
/**
+ * 缂鸿揣鏁伴噺
+ */
+ private BigDecimal outStockQuantity;
+
+ /**
+ * 缂鸿揣鎯呭喌
+ */
+ private String shortageDescription;
+
+ /**
* 鍏ュ簱鐢ㄦ埛
*/
private String createBy;
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 19010f4..af2cc7f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -106,6 +106,8 @@
procurementRecordStorageById.setWarnNum(procurementDto.getWarnNum());
procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId());
procurementRecordStorageById.setUpdateTime(LocalDateTime.now());
+ procurementRecordStorageById.setOutStockQuantity(procurementDto.getOutStockQuantity());
+ procurementRecordStorageById.setShortageDescription(procurementDto.getShortageDescription());
return procurementRecordMapper.updateById(procurementRecordStorageById);
}
@@ -413,6 +415,8 @@
.inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
.inboundNum(detail.getInboundQuantity())
.warnNum(detail.getWarnNum())
+ .outStockQuantity(detail.getOutStockQuantity())
+ .shortageDescription(detail.getShortageDescription())
.createTime(LocalDateTime.now())
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 08faec0..3636152 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -49,7 +49,9 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t1.out_stock_quantity as outStockQuantity,
+ t1.shortage_description as shortageDescription
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
--
Gitblit v1.9.3