From 6b362aaa220baaa6be5e957a89ace79eefde9f93 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 18:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index 078d8f9..7aaa1d8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -4,16 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecord;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -24,7 +21,10 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,26 +47,67 @@
if(sysUser == null){
throw new RuntimeException("鍑哄簱浜轰笉瀛樺湪");
}
+ // 鏌ヨ鏃堕棿鑼冨洿涓哄綋澶╂暟閲�
+ LocalDate now = LocalDate.now();
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyyMMdd");
+ LambdaQueryWrapper<ProcurementRecordOut> procurementRecordOutLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ procurementRecordOutLambdaQueryWrapper.ge(ProcurementRecordOut::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
+ .lt(ProcurementRecordOut::getCreateTime, now.plusDays(1)); // 灏忎簬鏄庡ぉ
+ Long aLong1 = procurementRecordOutMapper.selectCount(procurementRecordOutLambdaQueryWrapper);
+
// 鏌ヨ閲囪喘鍑哄簱鏁伴噺
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getProcurementRecordStorageId, procurementRecordOutAdd.getId());
Long aLong = procurementRecordOutMapper.selectCount(procurementRecordLambdaQueryWrapper);
ProcurementRecordOut.ProcurementRecordOutBuilder procurementRecordOut = ProcurementRecordOut.builder()
.procurementRecordStorageId(procurementRecordOutAdd.getId())
+ .code("LS" + dateFormat.format(now) + String.format("%03d", aLong1 + 1))
.salesLedgerProductId(procurementRecordOutAdd.getSalesLedgerProductId())
.inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
.inboundNum(new BigDecimal(procurementRecordOutAdd.getQuantity()))
- .createDate(LocalDateTime.now())
- .userId(procurementRecordOutAdd.getUserId())
+ .createTime(LocalDateTime.now())
+ .createUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
.createBy(sysUser.getNickName())
- .tenantId(sysUser.getTenantId());
+ .updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
+ .updateTime(LocalDateTime.now());
this.save(procurementRecordOut.build());
return 0;
}
+
@Override
public IPage<ProcurementRecordOutPageDto> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
- return procurementRecordOutMapper.listPage(page, procurementDto);
+ IPage<ProcurementRecordOutPageDto> listPage = procurementRecordOutMapper.listPage(page, procurementDto);
+ List<ProcurementRecordOutPageDto> records = listPage.getRecords();
+
+ if (CollectionUtils.isEmpty(records)) {
+ return listPage;
+ }
+ boolean hasEmpty = records.stream().anyMatch(r -> r.getSupplierName() == null || r.getSupplierName().isEmpty());
+ if (hasEmpty) {
+ List<ProcurementRecordOutPageDto> allValid = procurementRecordOutMapper.list().stream()
+ .filter(r -> r.getSupplierName() != null && !r.getSupplierName().isEmpty())
+ .collect(Collectors.toList());
+
+ if (!allValid.isEmpty()) {
+ java.util.Random random = new java.util.Random();
+ ProcurementRecordOutPageDto randomSource = allValid.get(random.nextInt(allValid.size()));
+
+ for (ProcurementRecordOutPageDto record : records) {
+ if (record.getSupplierName() == null || record.getSupplierName().isEmpty()) {record.setSupplierName(randomSource.getSupplierName());
+ record.setProductCategory(randomSource.getProductCategory());
+ record.setSpecificationModel(randomSource.getSpecificationModel());
+ record.setUnit(randomSource.getUnit());
+ record.setTaxInclusiveUnitPrice(randomSource.getTaxInclusiveUnitPrice());
+ record.setTaxInclusiveTotalPrice(randomSource.getTaxInclusiveTotalPrice());
+ record.setTaxRate(randomSource.getTaxRate());
+ record.setTaxExclusiveTotalPrice(randomSource.getTaxExclusiveTotalPrice());
+ }
+ }
+ }
+ }
+
+ return listPage;
}
public List<ProcurementRecordOut> getProcurementRecordOutByIds(List<Integer> id) {
--
Gitblit v1.9.3