From 58a084e25bcba9557c97f2566328aecda151696e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 04 一月 2026 15:56:00 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 2 +-
src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml | 3 +--
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java | 2 +-
src/main/java/com/ruoyi/procurementrecord/dto/Details.java | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 7ea2430..3850a90 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -77,7 +77,7 @@
return procurementRecordService.updateCustom(customStorage);
}
- @Delete("/delteCustom")
+ @PostMapping("/delteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
index 2257765..3f3ed35 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -14,6 +14,6 @@
private BigDecimal inboundQuantity; // 鍏ュ簱鏁伴噺
private BigDecimal warnNum; // 棰勮鏁伴噺锛堥噰璐叆搴撴墠鏈夛級
//鍗曚环
- private BigDecimal unitPrice;
+ private BigDecimal taxInclusiveUnitPrice;
private BigDecimal totalPrice;
}
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 c99a85b..0f13b51 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -696,8 +696,8 @@
.inboundNum(detail.getInboundQuantity())
.type(procurementDto.getType())
.warnNum(detail.getWarnNum())
- .unitPrice(detail.getUnitPrice())
- .totalPrice(detail.getInboundQuantity().multiply(detail.getUnitPrice()))
+ .unitPrice(detail.getTaxInclusiveUnitPrice())
+ .totalPrice(detail.getInboundQuantity().multiply(detail.getTaxInclusiveUnitPrice()))
.createTime(LocalDateTime.now())
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
index 2135a8b..31add0f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
@@ -129,7 +129,7 @@
Details details1 = new Details();
details1.setInboundQuantity(productionReportDto.getFinishedNum());
details1.setId(Integer.parseInt(salesLedgerWork.getSalesLedgerProductId().toString()));
- details1.setUnitPrice(productionReportDto.getUnitPrice());
+ details1.setTaxInclusiveUnitPrice(productionReportDto.getUnitPrice());
details1.setTotalPrice(productionReportDto.getTotalPrice());
details.add(details1);
procurementRecordOutAdd.setDetails(details);
diff --git a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
index 40d1d5d..05e719b 100644
--- a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
@@ -33,9 +33,8 @@
sum(t1.tax_inclusive_total_price) as taxInclusiveTotalPrice,
(t1.inbound_num - COALESCE(SUM(t2.inbound_num), 0)) AS availableStock
from custom_storage t1
- left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3
+ left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id
<where>
- t2.type = 3
<if test="req.productCategory != null and req.productCategory != ''">
and t1.product_category like concat('%',#{req.productCategory},'%')
</if>
--
Gitblit v1.9.3