From 559baa115845697113095cc7cdbad2e5d5fe2657 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 02 二月 2026 11:03:40 +0800
Subject: [PATCH] yys 成品入库单价修改，成品库存修改
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 57 +++++++++++++++++-----------
src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java | 10 ++++-
2 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
index 31add0f..4ab3c14 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
@@ -23,7 +23,9 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.mapper.LossMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.Loss;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -92,6 +94,8 @@
private final ProcurementRecordServiceImpl procurementRecordService;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+
@Override
public int productionReport(ProductionReportDto productionReportDto) {
SalesLedgerWork salesLedgerWork = salesLedgerWorkMapper.selectById(productionReportDto.getId());
@@ -119,6 +123,8 @@
.process(salesLedgerWork.getProcess())
.schedulingDate(LocalDate.parse(productionReportDto.getSchedulingDate(), DateTimeFormatter.ISO_LOCAL_DATE));
salesLedgerProductionAccountingMapper.insert(builder.build());
+ // 鏌ヨ閿�鍞骇鍝佸崟浠�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(salesLedgerWork.getSalesLedgerProductId());
// 鐢熶骇鎶ュ伐鎴愬姛 -> 鍏ュ簱
LoginUser loginUser = SecurityUtils.getLoginUser();
ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
@@ -129,8 +135,8 @@
Details details1 = new Details();
details1.setInboundQuantity(productionReportDto.getFinishedNum());
details1.setId(Integer.parseInt(salesLedgerWork.getSalesLedgerProductId().toString()));
- details1.setTaxInclusiveUnitPrice(productionReportDto.getUnitPrice());
- details1.setTotalPrice(productionReportDto.getTotalPrice());
+ details1.setTaxInclusiveUnitPrice(salesLedgerProduct != null ? salesLedgerProduct.getTaxInclusiveUnitPrice() : productionReportDto.getUnitPrice());
+ details1.setTotalPrice(details1.getTaxInclusiveUnitPrice().multiply(details1.getInboundQuantity()));
details.add(details1);
procurementRecordOutAdd.setDetails(details);
procurementRecordService.add(procurementRecordOutAdd);
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 3c7e470..7d3e77c 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -289,14 +289,14 @@
order by t1.create_time desc
</select>
<select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
+ SELECT
t3.customer_contract_no,
t3.sales_contract_no,
t3.customer_name,
t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
+ NULL AS id,
+ NULL AS sales_ledger_product_id,
+ NULL AS create_user,
t2.specification_model,
t2.unit,
t2.min_stock,
@@ -304,30 +304,40 @@
t2.tax_inclusive_unit_price,
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
- t1.inbound_batches,
- sum(t1.total_price) as totalPrice,
+ GROUP_CONCAT(DISTINCT t1.inbound_batches) AS inbound_batches,
+ SUM(t1.total_price) AS totalPrice,
t1.unit_price,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_by,
+ SUM(t1.inbound_num) AS inboundNum,
+ SUM(t1.inbound_num) AS inboundNum0,
+ MAX(t1.create_time) AS create_time,
+ MAX(t1.update_time) AS update_time,
+ GROUP_CONCAT(DISTINCT t1.create_by) AS create_by,
t2.warn_num,
- SUM(t1.inbound_num) - COALESCE(SUM(t4.inbound_num), 0) / COALESCE(count(1), 1) AS availableStock
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
- left join sales_ledger t3 on t3.id = t2.sales_ledger_id
- left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 2
+ (SUM(t1.inbound_num) - IFNULL(SUM(t4.total_outbound_num), 0)) AS availableStock
+ FROM procurement_record_storage t1
+ LEFT JOIN sales_ledger_product t2
+ ON t2.id = t1.sales_ledger_product_id
+ AND t2.type = 1
+ LEFT JOIN sales_ledger t3
+ ON t3.id = t2.sales_ledger_id
+ LEFT JOIN (
+ SELECT
+ procurement_record_storage_id,
+ SUM(inbound_num) AS total_outbound_num
+ FROM procurement_record_out
+ WHERE type = 2
+ GROUP BY procurement_record_storage_id
+ ) t4 ON t1.id = t4.procurement_record_storage_id
+ WHERE t1.type = 2
<where>
- t4.type = 2 and t1.type = 2
<if test="req.customerName != null and req.customerName != ''">
- and t3.customer_name like concat('%',#{req.customerName},'%')
+ and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
<if test="req.productCategory != null and req.productCategory != ''">
- and t2.product_category like concat('%',#{req.productCategory},'%')
+ and t2.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -345,8 +355,11 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t2.product_category,t2.specification_model,t1.unit_price
+ GROUP BY
+ t2.product_category,
+ t2.specification_model,
+ t1.unit_price
HAVING availableStock > 0
- order by t1.create_time desc
+ ORDER BY create_time DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3