src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -20,8 +20,6 @@ import com.ruoyi.procurementrecord.service.ReturnManagementService; import com.ruoyi.procurementrecord.service.ReturnSaleProductService; import com.ruoyi.procurementrecord.utils.StockUtils; import com.ruoyi.sales.mapper.SalesLedgerMapper; import com.ruoyi.sales.pojo.SalesLedger; import com.ruoyi.sales.pojo.ShippingInfo; import com.ruoyi.sales.service.ShippingInfoService; import lombok.RequiredArgsConstructor; @@ -47,7 +45,6 @@ private final ReturnManagementMapper returnManagementMapper; private final ReturnSaleProductService returnSaleProductService; private final ShippingInfoService shippingInfoService; private final SalesLedgerMapper salesLedgerMapper; private final SalesRefundAmountOrderService salesRefundAmountOrderService; private final StockUtils stockUtils; @@ -132,20 +129,6 @@ }).collect(Collectors.toList()); returnSaleProductService.updateBatchById(updateList); // 3. 更新销售台账的实际合同金额 if (byId.getShippingId() != null) { ShippingInfo shippingInfo = shippingInfoService.getById(byId.getShippingId()); if (shippingInfo != null && shippingInfo.getSalesLedgerId() != null) { SalesLedger salesLedger = salesLedgerMapper.selectById(shippingInfo.getSalesLedgerId()); if (salesLedger != null && salesLedger.getContractAmount() != null) { BigDecimal baseAmount = salesLedger.getNetContractAmount() != null ? salesLedger.getNetContractAmount() : salesLedger.getContractAmount(); salesLedger.setNetContractAmount(baseAmount.subtract(totalRefund)); salesLedgerMapper.updateById(salesLedger); } } } return true; }
@@ -21,6 +21,14 @@ import com.ruoyi.stock.execl.StockInRecordExportData; import com.ruoyi.production.mapper.ProductionOrderPickMapper; import com.ruoyi.production.pojo.ProductionOrderPick; import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper; import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper; import com.ruoyi.procurementrecord.pojo.ReturnManagement; import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct; import com.ruoyi.sales.mapper.SalesLedgerMapper; import com.ruoyi.sales.mapper.ShippingInfoMapper; import com.ruoyi.sales.pojo.SalesLedger; import com.ruoyi.sales.pojo.ShippingInfo; import com.ruoyi.stock.mapper.StockInRecordMapper; import com.ruoyi.stock.mapper.StockInventoryMapper; import com.ruoyi.stock.mapper.StockUninventoryMapper; @@ -45,6 +53,10 @@ private StockInventoryMapper stockInventoryMapper; private StockUninventoryMapper stockUninventoryMapper; private ProductionOrderPickMapper productionOrderPickMapper; private ReturnSaleProductMapper returnSaleProductMapper; private ReturnManagementMapper returnManagementMapper; private ShippingInfoMapper shippingInfoMapper; private SalesLedgerMapper salesLedgerMapper; @Override public IPage<StockInRecordDto> listPage(Page page, StockInRecordDto stockInRecordDto) { @@ -285,6 +297,8 @@ stockUninventoryMapper.updateAddStockUnInventory(stockUninventoryDto); } } // 销售退货入库:扣减销售台账实际合同金额(退货生效) handleSalesReturnRefund(stockInRecord); } } return ids.size(); @@ -335,4 +349,47 @@ return ids.size(); } /** * 销售退货入库审批通过时,扣减对应销售台账的实际合同金额。 * 关联链:stock_in_record.record_id = return_sale_product.id * → return_management.shipping_id = shipping_info.id * → shipping_info.sales_ledger_id = sales_ledger.id * 只处理 record_type 为 14(合格)或 15(不合格)的销售退货入库。 */ private void handleSalesReturnRefund(StockInRecord stockInRecord) { String recordType = stockInRecord.getRecordType(); if (!StockInQualifiedRecordTypeEnum.RETURN_HE_IN.getCode().equals(recordType) && !StockInQualifiedRecordTypeEnum.RETURN_UNSTOCK_IN.getCode().equals(recordType)) { return; } if (stockInRecord.getRecordId() == null) { return; } ReturnSaleProduct rsp = returnSaleProductMapper.selectById(stockInRecord.getRecordId()); if (rsp == null || rsp.getReturnManagementId() == null) { return; } ReturnManagement rm = returnManagementMapper.selectById(rsp.getReturnManagementId()); if (rm == null || rm.getShippingId() == null) { return; } ShippingInfo shippingInfo = shippingInfoMapper.selectById(rm.getShippingId()); if (shippingInfo == null || shippingInfo.getSalesLedgerId() == null) { return; } SalesLedger salesLedger = salesLedgerMapper.selectById(shippingInfo.getSalesLedgerId()); if (salesLedger == null || salesLedger.getContractAmount() == null) { return; } BigDecimal refund = rsp.getAmount() != null ? rsp.getAmount() : BigDecimal.ZERO; if (refund.compareTo(BigDecimal.ZERO) == 0) { return; } BigDecimal baseAmount = salesLedger.getNetContractAmount() != null ? salesLedger.getNetContractAmount() : salesLedger.getContractAmount(); salesLedger.setNetContractAmount(baseAmount.subtract(refund)); salesLedgerMapper.updateById(salesLedger); } } src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -14,9 +14,9 @@ sl.sales_contract_no, sl.salesman, CASE WHEN tempA.total_approval = 0 OR tempA.total_approval IS NULL THEN 0 WHEN tempA.approval_sum = tempA.total_approval THEN 1 WHEN tempA.approval_sum < tempA.total_approval AND tempA.approval_sum !=0 THEN 2 ELSE 0 ELSE 2 END AS stock_in_approval_status from return_management rm left join shipping_info si on rm.shipping_id = si.id src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -167,6 +167,20 @@ LEFT JOIN purchase_return_orders pro ON pro.id = prop.purchase_return_order_id GROUP BY prop.sales_ledger_product_id UNION ALL SELECT si.sales_ledger_product_id, IFNULL(SUM(rsp.num), 0) AS return_quantity FROM return_sale_product rsp INNER JOIN return_management rm ON rm.id = rsp.return_management_id INNER JOIN shipping_info si ON si.id = rm.shipping_id INNER JOIN stock_in_record sir ON sir.record_id = rsp.id AND TRIM(sir.record_type) IN ('14','15') AND sir.approval_status = 1 WHERE si.sales_ledger_product_id IS NOT NULL GROUP BY si.sales_ledger_product_id ) t6 ON t6.sales_ledger_product_id = T1.id left join product_model pm ON T1.product_model_id = pm.id left join product p ON pm.product_id = p.id
