From 164d1bace8b1fd0f1be79428b5b15df9c10bec72 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 10 一月 2026 10:30:36 +0800
Subject: [PATCH] yys 修改成品出库管理
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
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 fdd9c7c..efe8148 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -31,6 +31,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -107,6 +108,7 @@
@Override
public int updatePro(ProcurementUpdateDto procurementDto) {
ProcurementRecordStorage procurementRecordStorageById = getProcurementRecordById(procurementDto.getId());
+ procurementRecordStorageById.setCreateTime(LocalDate.parse(procurementDto.getInboundDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(LocalTime.MIDNIGHT));
procurementRecordStorageById.setInboundNum(procurementDto.getQuantityStock());
procurementRecordStorageById.setWarnNum(procurementDto.getWarnNum());
procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId());
@@ -435,7 +437,7 @@
for (ProcurementPageDto dto : procurementPageDtos) {
// 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍑哄簱璁板綍
List<ProcurementRecordOut> collect1 = procurementRecords.stream()
- .filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
+ .filter(item -> item.getProcurementRecordStorageId().equals(dto.getId()))
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
@@ -476,21 +478,7 @@
@Override
public IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage) {
- LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(customStorage != null){
- if(!StringUtils.isEmpty(customStorage.getSupplierName())){
- customStorageLambdaQueryWrapper.like(CustomStorage::getSupplierName, customStorage.getSupplierName());
- }
- // 绛涢�夊叆搴撴椂闂�
- if(customStorage.getTimeStr() != null){
- customStorageLambdaQueryWrapper.eq(CustomStorage::getInboundDate, customStorage.getTimeStr());
- }
- if(!StringUtils.isEmpty(customStorage.getProductCategory())){
- customStorageLambdaQueryWrapper.like(CustomStorage::getProductCategory, customStorage.getProductCategory());
- }
- }
- customStorageLambdaQueryWrapper.orderByDesc(CustomStorage::getInboundDate);
- IPage<CustomStorage> procurementPageDtoIPage = customStorageMapper.selectPage(page, customStorageLambdaQueryWrapper);
+ IPage<CustomStorage> procurementPageDtoIPage = customStorageMapper.listPageByCustom(page, customStorage);
procurementPageDtoIPage.getRecords().forEach(item -> item.setInboundNum0(item.getInboundNum()));
List<CustomStorage> procurementPageDtos = procurementPageDtoIPage.getRecords();
// 璁＄畻寰呭叆搴撴暟閲�
@@ -694,8 +682,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())
--
Gitblit v1.9.3