From ff5614116fe3f9a8d515ba7feb3c2e408d6af16a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 10:50:56 +0800
Subject: [PATCH] fix: 销售台账产品信息数据返回缺失

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 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 04f3a3a..87be01e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -389,12 +389,6 @@
             // 瀹㈡埛鏁版嵁
             List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
                     salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
-//            // 瑙勬牸鍨嬪彿鏁版嵁
-//            List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
-//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
-//            // 浜у搧澶х被鏁版嵁
-//            List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,
-//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));
             List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
             // 褰曞叆浜烘暟鎹�
             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
@@ -404,7 +398,7 @@
                         .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
                         .last("LIMIT 1"));
                 if (salesLedger1 != null) {
-                    continue;
+                    throw new ServiceException("瀵煎叆澶辫触锛氬悎鍚屽彿 [" + salesLedgerImportDto.getSalesContractNo() + "] 宸插瓨鍦紝璇锋鏌ュ悗閲嶆柊瀵煎叆");
                 }
                 SalesLedger salesLedger = new SalesLedger();
                 BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
@@ -426,7 +420,7 @@
                         .map(SysUser::getUserId)
                         .orElse(null);
                 if (aLong == null)
-                    throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
+                    throw new ServiceException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
                 salesLedger.setEntryPerson(aLong.toString());
                 // 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
                 List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
@@ -439,10 +433,12 @@
                         .reduce(BigDecimal.ZERO, BigDecimal::add));
                 salesLedgerMapper.insert(salesLedger);
 
-
                 for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                     SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                     BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
+                    salesLedgerProduct.setFloorCode(salesLedgerProductImportDto.getFloorNo());
+                    salesLedgerProduct.setProcessRequirement(salesLedgerProductImportDto.getProcessingRequirements());
+                    salesLedgerProduct.setRemark(salesLedgerProductImportDto.getRemarks());
                     salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
                     salesLedgerProduct.setType(1);
                     // 璁$畻涓嶅惈绋庢�讳环
@@ -456,21 +452,48 @@
                                 salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
                                 salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
                             });
-//                    salesLedgerProduct.setProductId(productList.stream()
-//                            .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
-//                            .findFirst()
-//                            .map(Product::getId)
-//                            .orElse(null));
-//                    salesLedgerProduct.setProductModelId(productModels.stream()
-//                            .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))
-//                            .findFirst()
-//                            .map(ProductModel::getId)
-//                            .orElse(null));
                     salesLedgerProduct.setRegister(loginUser.getNickName());
                     salesLedgerProduct.setRegisterDate(LocalDateTime.now());
                     salesLedgerProduct.setApproveStatus(0);
                     salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                     salesLedgerProductMapper.insert(salesLedgerProduct);
+
+                    // 澶勭悊棰濆鍔犲伐淇℃伅
+                    String extraProcessing = salesLedgerProductImportDto.getExtraProcessing();
+                    if (StringUtils.hasText(extraProcessing)) {
+                        List<SalesLedgerProductProcess> processList = new ArrayList<>();
+                        //  涓嫳鏂囧垎鍙�
+                        String[] items = extraProcessing.split("[;锛沒");
+                        for (String item : items) {
+                            if (StringUtils.hasText(item)) {
+                                String[] parts = item.split("[-鈥攡锝瀅");
+                                if (parts.length >= 2) {
+                                    String processName = parts[0].trim();
+                                    String qtyStr = parts[1].trim();
+                                    try {
+                                        BigDecimal quantity = new BigDecimal(qtyStr);
+                                        SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
+                                                new LambdaQueryWrapper<SalesLedgerProductProcess>()
+                                                        .eq(SalesLedgerProductProcess::getProcessName, processName)
+                                                        .last("LIMIT 1")
+                                        );
+                                        if (process != null) {
+                                            SalesLedgerProductProcess p = new SalesLedgerProductProcess();
+                                            p.setId(process.getId());
+                                            p.setQuantity(quantity.intValue());
+                                            processList.add(p);
+                                        }
+                                    } catch (Exception e) {
+                                        log.error("瑙f瀽棰濆鍔犲伐鏁伴噺澶辫触: {}", qtyStr);
+                                    }
+                                }
+                            }
+                        }
+                        if (!processList.isEmpty()) {
+                            salesLedgerProductProcessBindService.updateProductProcessBind(processList, salesLedgerProduct.getId());
+                        }
+                    }
+
                     // 娣诲姞鐢熶骇鏁版嵁
                     salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
                 }

--
Gitblit v1.9.3