From 2c27abdc366d09cfa68f120ef22a1991dcf7a1ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 14:50:30 +0800
Subject: [PATCH] 完善bug
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 13 +++++--------
src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java | 4 ++++
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 7 ++++---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 2 ++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 3 ---
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 2 +-
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 4f3f260..becd6a0 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -27,6 +27,8 @@
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
+ private Long productModelId;
+
/**
* 鍚堝悓鍙�
*/
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index dc5babd..7c57414 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -283,23 +282,21 @@
public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct){
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if(CollectionUtils.isEmpty(list)){
- return AjaxResult.error("璇ヤ骇鍝佷笉瀛樺湪");
+ throw new RuntimeException("璇ヤ骇鍝佷笉瀛樺湪");
}
List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
list.forEach(item -> {
ProcurementPageDto procurementDto = new ProcurementPageDto();
- procurementDto.setSalesLedgerProductId(String.valueOf(item.getId()));
- Page<ProcurementPageDto> page = new Page<>(1, 50);
- IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(page, procurementDto);
+ IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(new Page<>(1, -1), procurementDto);
procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
});
- if(!CollectionUtils.isEmpty(procurementPageDtoList)){
- return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ if(CollectionUtils.isEmpty(procurementPageDtoList)){
+ throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
}
AtomicInteger num = new AtomicInteger();
list.forEach(item -> {
procurementPageDtoList.forEach(procurementPageDto -> {
- if(String.valueOf(item.getId().intValue()).equals(procurementPageDto.getSalesLedgerProductId())){
+ if(item.getProductModelId().equals(procurementPageDto.getProductModelId())){
if (item.getQuantity().compareTo(procurementPageDto.getInboundNum0()) <= 0) {
num.getAndIncrement();
}
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
index d03fb20..40ad9f8 100644
--- a/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
@@ -13,4 +13,8 @@
* 鏁伴噺
*/
private BigDecimal quantity;
+
+
+ private String productCategory;
+ private String specificationModel;
}
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index c378c6a..b303d28 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -37,6 +37,7 @@
t1.sales_ledger_product_id,
t1.create_user,
t2.specification_model,
+ t2.product_model_id,
t2.unit,
t2.tax_rate,
t2.tax_inclusive_unit_price,
@@ -48,7 +49,7 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ ifnull(t1.warn_num, t2.warn_num) as warnNum
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
@@ -107,7 +108,7 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ ifnull(t1.warn_num, t2.warn_num) as warnNum
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
@@ -163,4 +164,4 @@
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
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 413f293..39a212f 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -11,7 +11,7 @@
FORMAT(A.sales_tax_amount - A.purchase_tax_amount, 2) AS balance_amount
FROM (
SELECT
- sl.customer_contract_no,
+ sl.sales_contract_no customerContractNo,
sl.id,
pl.id AS pl_id,
sl.customer_name,
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index a23a02c..a3db432 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -25,9 +25,6 @@
<if test="req.salesContractNo != null and req.salesContractNo != ''">
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
</if>
- <if test="req.productCategory != null and req.productCategory != ''">
- AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
- </if>
<if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
</if>
--
Gitblit v1.9.3