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/production/service/impl/ProductionProductMainServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 3 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 9f3b4c0..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()
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 5d6553a..b31801d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -284,10 +284,10 @@
List<Details> details = new ArrayList<>();
Details details1 = new Details();
details1.setInboundQuantity(dto.getQuantity());
-// details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details1.setId(Math.toIntExact(productModel.getId()));
// details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
// details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
-// details1.setProductModelId(salesLedgerProduct.getProductModelId());
+ details1.setProductModelId(productModel.getId());
details.add(details1);
procurementRecordOutAdd.setDetails(details);
// procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
--
Gitblit v1.9.3