From aac591782bef5f9eedbd96ed3de8c4c7a0967776 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 三月 2026 17:26:26 +0800
Subject: [PATCH] 报工bug修改
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 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 b812cdf..5f6998e 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -765,7 +765,7 @@
.eq(ProcurementRecordStorage::getType, procurementDto.getType());
Long aLong = procurementRecordMapper.selectCount(procurementRecordLambdaQueryWrapper);
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(detail.getId());
- if (ObjectUtils.isNull(detail.getProductModelId())){
+ if (ObjectUtils.isNotEmpty(salesLedgerProduct)){
detail.setProductModelId(salesLedgerProduct.getProductModelId());
}
ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
@@ -775,8 +775,8 @@
.type(procurementDto.getType())
.warnNum(detail.getWarnNum())
.unitPrice(detail.getUnitPrice())
- .totalPrice(detail.getInboundQuantity().multiply(detail.getUnitPrice()))
- .createTime(LocalDateTime.now())
+// .totalPrice(detail.getInboundQuantity().multiply(detail.getUnitPrice()))
+ .createTime(procurementDto.getInboundTime())
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
.updateUser(loginUser.getUserId())
@@ -784,15 +784,6 @@
.productModelId(detail.getProductModelId())
.qualityInspectId(ObjectUtils.isNotNull(procurementDto.getQualityInspectId())?procurementDto.getQualityInspectId():0L);
this.save(procurementRecordBuilder.build());
- // 鍏ュ簱鎴愬姛鍑忔帀閲囪喘鏁伴噺
-// LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, detail.getId());
-// SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(salesLedgerProductLambdaQueryWrapper);
-// if(salesLedgerProduct == null){
-// throw new RuntimeException("鏈壘鍒拌鍟嗗搧");
-// }
-// salesLedgerProduct.setQuantity(salesLedgerProduct.getQuantity().subtract(detail.getInboundQuantity()));
-// salesLedgerProductMapper.updateById(salesLedgerProduct);
}
return 1;
}
@@ -882,16 +873,10 @@
}
return procurementPageDtoCopyIPage;
}
+
@Override
- public IPage<ProductModel> listPageProductionStock(Page page) {
- ProductModel productModel = new ProductModel();
- IPage<ProductModel> iPage = productModelMapper.listPageProductModel(page, productModel);
- iPage.getRecords().forEach(item -> {
- item.setInboundNum(stockUtils.getStockQuantity(item.getId()).get("inboundNum"));
- item.setOutboundNum(stockUtils.getStockQuantity(item.getId()).get("outboundNum"));
- item.setStockQuantity(stockUtils.getStockQuantity(item.getId()).get("stockQuantity"));
- });
- return iPage;
+ public IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto dto) {
+ return productModelMapper.listPageProductionStock(page, dto);
}
@Override
--
Gitblit v1.9.3