From 5c998c8f14dbf037c0a8e310e013fb4580f0c61d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 11:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 2 +-
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 8 +++++++-
src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java | 2 ++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 1 +
src/main/resources/mapper/stock/StockInventoryMapper.xml | 6 ++++++
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 9 +++++++++
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 11 ++---------
7 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 93928ca..b66def3 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -185,15 +185,8 @@
// 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
- LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
- procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
- .lt(ProcurementRecordStorage::getCreateTime, now.plusDays(1)); // 灏忎簬鏄庡ぉ
- List<ProcurementRecordStorage> procurementRecordStorages1 = procurementRecordStorageMapper.selectList(procurementRecordStorageLambdaQueryWrapper);
- BigDecimal stockAmount1 = procurementRecordStorages1.stream()
- .map(ProcurementRecordStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());
+ BigDecimal bigDecimal = stockInventoryMapper.selectTotalByDate(LocalDate.now());
+ homeBusinessDto.setTodayInventoryNum(bigDecimal.setScale(2, RoundingMode.HALF_UP).toString());
return homeBusinessDto;
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index 310ca78..a154c94 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -24,11 +24,13 @@
@ApiModel
public class ProcurementBusinessSummaryDto {
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
/**
* 瑙勬牸鍨嬪彿
*/
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -44,33 +46,40 @@
/**
* 閲囪喘鏁伴噺
*/
+ @Excel(name = "閲囪喘鏁伴噺")
private BigDecimal purchaseNum;
/**
* 閲囪喘閲戦
*/
+ @Excel(name = "閲囪喘閲戦")
private BigDecimal purchaseAmount;
/**
* 閲囪喘娆℃暟
*/
+ @Excel(name = "閲囪喘娆℃暟")
private Integer purchaseTimes;
/**
* 骞冲潎鍗曚环
*/
+ @Excel(name = "骞冲潎鍗曚环")
private BigDecimal averagePrice;
/**
* 渚涘簲鍟嗗悕绉�
*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
/**
* 褰曞叆鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e5dd8a3..e5942a2 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -433,6 +433,7 @@
//鎵归噺鍒犻櫎妫�楠屾爣鍑�
LambdaQueryWrapper<QualityInspect> materialInspectLambdaQueryWrapper = new LambdaQueryWrapper<>();
materialInspectLambdaQueryWrapper.in(QualityInspect::getPurchaseLedgerId, ids);
+
List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(materialInspectLambdaQueryWrapper);
qualityInspects.stream().forEach(qualityInspect -> {
if (ObjectUtils.isNotEmpty(qualityInspect.getInspectState())&&qualityInspect.getInspectState().equals(1)) {
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 1555082..7dfae1f 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.service.impl.ProcurementRecordServiceImpl;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -40,6 +42,8 @@
private IQualityInspectFileService qualityInspectFileService;
@Autowired
private ProcurementRecordService procurementRecordService;
+ @Autowired
+ private StockUtils stockUtils;
/**
@@ -69,7 +73,9 @@
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
.in(QualityInspectFile::getInspectId,ids));
//鍒犻櫎鍏ュ簱璁板綍
- procurementRecordService.remove(Wrappers.<ProcurementRecordStorage>lambdaQuery().in(ProcurementRecordStorage::getQualityInspectId,ids));
+ for (Integer id : ids) {
+ stockUtils.deleteStockRecord(Long.valueOf(id), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode());
+ }
//鍒犻櫎妫�楠屽崟
return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index bdcff3a..07f070e 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -93,7 +93,7 @@
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
//鍚堟牸鐩存帴鍏ュ簱
- stockUtils.addStock(inspect.getProductModelId(), inspect.getQuantity(), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), inspect.getId());
+ stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
index 7450a7c..15dcbbc 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
@@ -11,6 +11,7 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -39,4 +40,5 @@
BigDecimal selectTotal();
+ BigDecimal selectTotalByDate( @Param("now") LocalDate now);
}
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 20b60e7..0c47ede 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -188,5 +188,11 @@
select ifnull(sum(qualitity),0)
from stock_inventory
</select>
+ <select id="selectTotalByDate" resultType="java.math.BigDecimal">
+ select sum(qualitity)
+ from stock_inventory
+ where
+ create_time >= #{now} and create_time < DATE_ADD(#{now}, INTERVAL 1 DAY)
+ </select>
</mapper>
--
Gitblit v1.9.3