Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2026-04-24 400169d87dee7a40802824875167a4dec4ef3bc0

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -608,7 +608,7 @@
                    }
                    lastDate = date;
                    salesLedger.setEntryDate(date);
                    salesLedger.setContractAmount(importDto.getAmount());

                    salesLedger.setEntryPerson(loginUser.getUserId().toString());
                    salesLedger.setTenantId(matchedCustomer.getTenantId());
                    salesLedgerMapper.insert(salesLedger);
@@ -644,6 +644,8 @@
                        Long productModelId = productModelService.productModelAnticlockwise(productModelAnticlockwiseDto);
                        product.setProductModelId(productModelId);
                    }
                    salesLedger.setContractAmount(product.getTaxInclusiveTotalPrice());
                    salesLedgerMapper.updateById(salesLedger);

                    salesLedgerProductMapper.insert(product);
                    salesLedgerProductServiceImpl.addProductionData(product);