From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 30a7690..40836c8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -31,6 +31,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
@@ -44,6 +45,7 @@
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.sales.service.SalesLedgerProductionRefService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
@@ -166,6 +168,10 @@
private SysUserMapper sysUserMapper;
@Autowired
private CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ @Autowired
+ private SalesLedgerProductionRefService salesLedgerProductionRefService;
+ @Autowired
+ private SalesLedgerProductionRefMapper salesLedgerProductionRefMapper;
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
@@ -212,7 +218,8 @@
if (salesLedger == null) {
throw new BaseException("鍙拌处涓嶅瓨鍦�");
}
-
+ List<ProductOrderDto> productionOrdersBySalesLedgerId = getProductionOrdersBySalesLedgerId(salesLedger.getId());
+ salesLedger.setProductionOrders(productionOrdersBySalesLedgerId);
// 2. 鏌ヨ瀛愯〃
LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
@@ -551,6 +558,24 @@
return resultDto;
}
+ @Override
+ public List<ProductOrderDto> getProductionOrdersBySalesLedgerId(Long salesLedgerId) {
+ List<Long> productOrderIds = salesLedgerProductionRefMapper.getProductionOrderIdsBySalesLedgerId(salesLedgerId);
+ if (productOrderIds == null || productOrderIds.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return productOrderMapper.listByProductOrderId(productOrderIds);
+ }
+
+ @Override
+ public void getProductionOrders(List<SalesLedger> records) {
+ List<Long> ledgerIdList = records.stream()
+ .map(SalesLedger::getId)
+ .collect(Collectors.toList());
+
+
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
@@ -691,7 +716,10 @@
);
}
- // 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
+ //5. 缁戝畾閿�鍞鍗曞拰鐢熶骇璁㈠崟
+ bindSalesOrderAndProductionOrder(salesLedgerDto.getProductionOrderIds(), salesLedger.getId());
+
+ // 6. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {
migrateTempFilesToFormal(salesLedger.getId(), salesLedgerDto.getTempFileIds());
}
@@ -701,6 +729,26 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
+ }
+
+ private void bindSalesOrderAndProductionOrder(List<Long> productionOrderIds, Long salesLedgerId) {
+ // 鍏堝垹闄よ閿�鍞彴璐︽墍鏈夋棫鍏宠仈
+ LambdaQueryWrapper<SalesLedgerProductionRef> deleteWrapper = Wrappers.lambdaQuery();
+ deleteWrapper.eq(SalesLedgerProductionRef::getSalesLedgerId, salesLedgerId);
+ salesLedgerProductionRefMapper.delete(deleteWrapper);
+
+ if (productionOrderIds == null || productionOrderIds.isEmpty()) {
+ return;
+ }
+ List<SalesLedgerProductionRef> refList = productionOrderIds.stream()
+ .map(productOrderId -> {
+ SalesLedgerProductionRef ref = new SalesLedgerProductionRef();
+ ref.setSalesLedgerId(salesLedgerId);
+ ref.setProductOrderId(productOrderId);
+ return ref;
+ })
+ .collect(Collectors.toList());
+ salesLedgerProductionRefService.saveBatch(refList);
}
public void addApproveByPurchase(LoginUser loginUser, SalesLedger salesLedger) throws Exception {
@@ -817,7 +865,7 @@
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
// 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+ //salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
}
}
--
Gitblit v1.9.3