From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别,电压进行筛选 3.销售页面展示电压,类别 4.生产入库按照电压入库

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |  347 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 246 insertions(+), 101 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 c5699b6..3e7bc29 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,10 +1,5 @@
 package com.ruoyi.sales.service.impl;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,9 +8,6 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.ruoyi.account.pojo.AccountIncome;
 import com.ruoyi.account.service.AccountIncomeService;
 import com.ruoyi.basic.mapper.CustomerMapper;
 import com.ruoyi.basic.mapper.ProductMapper;
@@ -25,11 +17,9 @@
 import com.ruoyi.common.enums.FileNameType;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.other.mapper.TempFileMapper;
@@ -50,6 +40,10 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -60,12 +54,12 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -73,14 +67,11 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 /**
  * 閿�鍞彴璐ervice涓氬姟灞傚鐞�
@@ -228,113 +219,263 @@
 
     @Override
     public void exportShippingNote(HttpServletResponse response, List<Long> ids) {
-        log.info("寮�濮嬪鍑洪�佽揣鍗曪紝鍙拌处ID鍒楄〃: {}", ids);
+        try {
+            List<SalesLedger> ledgerList = salesLedgerMapper.selectBatchIds(ids);
+            String fileName = "閫佽揣鍗�.xlsx";
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
 
-        // 鍙傛暟鏍¢獙
-        if (ids == null || ids.isEmpty()) {
-            throw new BaseException("璇烽�夋嫨瑕佸鍑虹殑閿�鍞彴璐�");
-        }
+            XSSFWorkbook workbook = new XSSFWorkbook();
 
-        List<SalesLedger> salesLedgerList = salesLedgerMapper.selectList(
-                Wrappers.<SalesLedger>lambdaQuery()
-                        .in(SalesLedger::getId, ids)
-        );
+            for (SalesLedger ledger : ledgerList) {
+                XSSFSheet sheet = workbook.createSheet(ledger.getSalesContractNo());
 
-        if (salesLedgerList.isEmpty()) {
-            throw new BaseException("鏈壘鍒板搴旈攢鍞彴璐︽暟鎹�");
-        }
+                // 璁剧疆椤佃竟璺濓紙鍗曚綅锛氳嫳瀵革紝1鑻卞=2.54鍘樼背锛�
+                sheet.getPrintSetup().setLandscape(false); // 绾靛悜鎵撳嵃
+                sheet.setMargin(Sheet.TopMargin, 0.54 / 2.54);     // 涓婇〉杈硅窛锛�0.54鍘樼背
+                sheet.setMargin(Sheet.BottomMargin, 0.54 / 2.54);  // 涓嬮〉杈硅窛锛�0.54鍘樼背
+                sheet.setMargin(Sheet.LeftMargin, 0.41 / 2.54);   // 宸﹂〉杈硅窛锛�0.41鍘樼背
+                sheet.setMargin(Sheet.RightMargin, 0.41 / 2.54);  // 鍙抽〉杈硅窛锛�0.41鍘樼背
+                sheet.setMargin(Sheet.HeaderMargin, 0.77 / 2.54); // 椤电湁锛�0.77鍘樼背
+                sheet.setMargin(Sheet.FooterMargin, 0.27 / 2.54); // 椤佃剼锛�0.27鍘樼背
 
-        response.setContentType("application/zip");
-        response.setHeader("Content-Disposition", "attachment;filename=閫佽揣鍗�.zip");
-        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+                sheet.setColumnWidth(0, 1310);
+                sheet.setColumnWidth(1, 4000);
+                sheet.setColumnWidth(2, 8980);
+                sheet.setColumnWidth(3, 1820);
+                sheet.setColumnWidth(4, 2880);
+                sheet.setColumnWidth(5, 5090);
+                sheet.setColumnWidth(6, 1410);
 
-        try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) {
+                CellStyle companyTitle = createBaseStyle(workbook, "瀹嬩綋", (short) 20, true, true);
+                CellStyle billTitle = createBaseStyle(workbook, "瀹嬩綋", (short) 18, false, true);
+                CellStyle headerStyle = createBorderStyle(workbook, "瀹嬩綋", (short) 12, true, true);
+                CellStyle dataCenterStyle = createBorderStyle(workbook, "瀹嬩綋", (short) 11, false, true);
 
-            for (SalesLedger ledger : salesLedgerList) {
-                log.info("澶勭悊鍚堝悓鍙�: {}", ledger.getSalesContractNo());
+                // 鏍峰紡1锛氬甫铏氱嚎 + 灞呬腑
+                CellStyle dashStyle = createDashBottomStyle(workbook);
+                dashStyle.setAlignment(HorizontalAlignment.CENTER);
+                dashStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 
-                // 鏌ヨ鏄庣粏
+                // 鏍峰紡2锛氭棤杈规 + 灞呬腑锛堢粰浠撳簱鐢級
+                CellStyle centerNoBorder = createNoBorderStyle(workbook);
+                centerNoBorder.setAlignment(HorizontalAlignment.CENTER);
+                centerNoBorder.setVerticalAlignment(VerticalAlignment.CENTER);
+
+                // 鏍囬
+                Row row0 = sheet.createRow(0);
+                row0.createCell(0).setCellValue("婀栧崡楣忓垱鐢靛瓙鏈夐檺鍏徃");
+                sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
+                fillMergeRange(sheet, 0, 0, 0, 6, companyTitle);
+
+                Row row1 = sheet.createRow(1);
+                row1.createCell(0).setCellValue("閫�   璐�   鍗�");
+                sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 6));
+                fillMergeRange(sheet, 1, 1, 0, 6, billTitle);
+
+                Customer customer = customerMapper.selectById(ledger.getCustomerId());
+
+                Row row2 = sheet.createRow(2);
+                row2.setHeightInPoints(13);
+                row2.createCell(0).setCellValue("瀹㈡埛鍚嶇О锛�" + ledger.getCustomerName());
+                row2.createCell(4).setCellValue("鍗曟嵁缂栧彿锛�" + ledger.getSalesContractNo());
+
+                Row row3 = sheet.createRow(3);
+                row3.setHeightInPoints(13);
+                row3.createCell(0).setCellValue("閫佽揣鍦板潃锛�" + customer.getCompanyAddress());
+                row3.createCell(4).setCellValue("閫佽揣鏃ユ湡锛�" + formatDate(LocalDate.now()));
+
+                // 绌鸿
+                Row row4 = sheet.createRow(4);
+                row4.setHeightInPoints(13);
+                row4.createCell(4).setCellValue("鑱旂郴鐢佃瘽锛�" + customer.getCompanyPhone());
+
+                Row row5 = sheet.createRow(5);
+                row5.createCell(0).setCellValue("鑱旂郴鏂瑰紡锛�" + customer.getContactPerson() + " " + customer.getContactPhone());
+                Row row6 = sheet.createRow(6);
+                row6.createCell(0).setCellValue("閫佽揣鍗曚綅锛氭箹鍗楅箯鍒涚數瀛愭湁闄愬叕鍙�");
+                Row row7 = sheet.createRow(7);
+                row7.createCell(0).setCellValue("鍦板潃锛氭箹鍗楃渷鑰掗槼甯傚垱鏂板垱涓氬洯A1鏍�");
+                Row row8 = sheet.createRow(8);
+                row8.setHeightInPoints((short) 3); // 琛岄珮3纾�
+                Row row9 = sheet.createRow(9);
+                row9.createCell(0).setCellValue("璐х墿璇︾粏淇℃伅锛�");
+
+                int tableStart = 10;
+                Row headerRow = sheet.createRow(tableStart);
+                headerRow.setHeightInPoints((short) 18);
+
+                String[] headers = {"搴忓彿", "鐗╂枡缂栧彿", "鍝佸悕/瑙勬牸", "鍗曚綅", "鏁伴噺", "璁㈠崟鍙�", "鍏卞洓鑱�"};
+                for (int i = 0; i < headers.length; i++) {
+                    Cell hc = headerRow.createCell(i);
+                    hc.setCellValue(headers[i]);
+                    if (i == 6) {
+                        hc.setCellStyle(dashStyle);
+                    } else {
+                        hc.setCellStyle(headerStyle);
+                    }
+                }
+
+                // 鏌ヨ浜у搧
                 SalesLedgerProduct cond = new SalesLedgerProduct();
                 cond.setSalesLedgerId(ledger.getId());
                 List<SalesLedgerProduct> productList = salesLedgerProductServiceImpl.selectSalesLedgerProductList(cond);
 
-                // 鑷姩搴忓彿+鐗╂枡缂栫爜璧嬪��
+                BigDecimal totalQuantity = BigDecimal.ZERO;
+                for (SalesLedgerProduct p : productList) {
+                    if (p.getQuantity() != null) totalQuantity = totalQuantity.add(p.getQuantity());
+                }
+
+                int currentRow = tableStart + 1;
+                String[] fourNames = {"瀛樻牴", "鍥炲崟", "瀹㈡埛", "浠撳簱"};
+
+                // 1. 鎵�鏈変骇鍝�
                 for (int i = 0; i < productList.size(); i++) {
-                    SalesLedgerProduct product = productList.get(i);
-                    if (product != null) {
-                        product.setSerialNumber(i + 1);
-                        product.setOrderNo(ledger.getSalesContractNo());
-                        Long productModelId = product.getProductModelId();
-                        if (productModelId != null) {
-                            ProductModel productModel = productModelMapper.selectById(productModelId);
-                            if (productModel != null) {
-                                product.setMaterialCode(productModel.getMaterialCode());
-                            }
+                    SalesLedgerProduct p = productList.get(i);
+                    Row dataRow = sheet.createRow(currentRow++);
+                    dataRow.setHeightInPoints((short) 18);
+
+                    String materialCode = "";
+                    if (p.getProductModelId() != null) {
+                        ProductModel m = productModelMapper.selectById(p.getProductModelId());
+                        if (m != null) materialCode = m.getMaterialCode();
+                    }
+
+                    dataRow.createCell(0).setCellValue(i + 1);
+                    dataRow.createCell(1).setCellValue(materialCode);
+                    dataRow.createCell(2).setCellValue(p.getProductCategory() + "/" + p.getSpecificationModel());
+                    dataRow.createCell(3).setCellValue(p.getUnit());
+                    dataRow.createCell(4).setCellValue(p.getQuantity() == null ? 0 : p.getQuantity().doubleValue());
+                    dataRow.createCell(5).setCellValue(ledger.getSalesContractNo());
+
+                    for (int c = 0; c <= 5; c++) dataRow.getCell(c).setCellStyle(dataCenterStyle);
+
+                    Cell fourCell = dataRow.createCell(6);
+                    if (i < fourNames.length) {
+                        fourCell.setCellValue(fourNames[i]);
+                        if (i <= 2) {
+                            fourCell.setCellStyle(dashStyle);
+                        } else {
+                            fourCell.setCellStyle(centerNoBorder);
                         }
+                    } else {
+                        fourCell.setCellStyle(centerNoBorder);
                     }
                 }
 
-                // 鍏宠仈瀹㈡埛淇℃伅
-                Customer customer = customerMapper.selectById(ledger.getCustomerId());
+                // 2. 涓嶈冻6琛岃ˉ绌�
+                int minRow = 6;
+                int needEmpty = Math.max(0, minRow - productList.size());
+                for (int i = 0; i < needEmpty; i++) {
+                    int seq = productList.size() + i;
+                    Row dataRow = sheet.createRow(currentRow++);
+                    dataRow.setHeightInPoints((short) 18);
 
-                // 璁$畻鎬诲悎璁�
-                BigDecimal totalQuantity = BigDecimal.ZERO;
-                for (SalesLedgerProduct product : productList) {
-                    totalQuantity = totalQuantity.add(product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity());
+                    for (int c = 0; c <= 5; c++) dataRow.createCell(c).setCellStyle(dataCenterStyle);
+
+                    Cell fourCell = dataRow.createCell(6);
+                    if (seq < fourNames.length) {
+                        fourCell.setCellValue(fourNames[seq]);
+                        if (seq <= 2) {
+                            fourCell.setCellStyle(dashStyle);
+                        } else {
+                            fourCell.setCellStyle(centerNoBorder);
+                        }
+                    } else {
+                        fourCell.setCellStyle(centerNoBorder);
+                    }
                 }
 
-                // 缁勮椤堕儴闈欐�佹暟鎹�
-                Map<String, Object> dataMap = new HashMap<>();
-                dataMap.put("customerName", ledger.getCustomerName());
-                dataMap.put("companyAddress", customer.getCompanyAddress());
-                dataMap.put("contactPerson", customer.getContactPerson());
-                dataMap.put("contactPhone", customer.getContactPhone());
-                dataMap.put("companyPhone", customer.getCompanyPhone());
-                dataMap.put("salesContractNo", ledger.getSalesContractNo());
-                dataMap.put("deliveryDate", formatDate(LocalDate.now()));
+                // 鍚堣
+                Row totalRow = sheet.createRow(currentRow);
+                totalRow.setHeightInPoints((short) 18);
 
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                InputStream templateIs = this.getClass().getResourceAsStream("/static/shipping-note.xlsx");
+                // 鍚堣鏀惧湪绗簩鍒楋紝涓嶅悎骞跺崟鍏冩牸
+                totalRow.createCell(1).setCellValue("鍚堣");
+                totalRow.createCell(4).setCellValue(totalQuantity.doubleValue());
 
-                ExcelWriter writer = EasyExcel.write(bos).withTemplate(templateIs).build();
-                WriteSheet sheet = EasyExcel.writerSheet().build();
-
-                // 鍏堝~鍏呮暟鎹紙鍖呮嫭鍚堣锛�
-                Map<String, Object> totalMap = new HashMap<>();
-                totalMap.put("totalQuantity", totalQuantity);
-                dataMap.putAll(totalMap);
-                writer.fill(dataMap, sheet);
-                
-                // 鍐嶅~鍏呬骇鍝佸垪琛�
-                if (!productList.isEmpty()) {
-                    FillConfig fillConfig = FillConfig.builder()
-                        .forceNewRow(Boolean.TRUE)
-                        .build();
-                    writer.fill(productList, fillConfig, sheet);
+                // 璁剧疆鏍峰紡
+                for (int c = 0; c <= 5; c++) {
+                    Cell cell = totalRow.getCell(c) != null ? totalRow.getCell(c) : totalRow.createCell(c);
+                    cell.setCellStyle(dataCenterStyle);
                 }
+                totalRow.createCell(6).setCellStyle(centerNoBorder);
 
-                writer.finish();
-                templateIs.close();
+                currentRow++;
+                Row emptyRow1 = sheet.createRow(currentRow);
+                emptyRow1.setHeightInPoints((short) 9); // 琛岄珮9纾�
 
-                // 鎵撳寘ZIP
-                String excelName = String.format("閫佽揣鍗昣%s.xlsx",
-                        Optional.ofNullable(ledger.getSalesContractNo()).orElse(String.valueOf(ledger.getId())));
-                ZipEntry entry = new ZipEntry(excelName);
-                zos.putNextEntry(entry);
-                zos.write(bos.toByteArray());
-                zos.closeEntry();
-                bos.close();
+                currentRow++;
+                Row remarkRow = sheet.createRow(currentRow);
+                remarkRow.createCell(0).setCellValue("澶囨敞锛氳吹鍙稿湪鏀惰揣鍚庤鍗冲埢鏍稿疄鏁伴噺鍙婂搧璐紝鑻ユ湁寮傝锛岃鍦�3鏃ュ唴鎻愬嚭锛屽惁鍒欒涓烘敹濡ャ��");
+                sheet.addMergedRegion(new CellRangeAddress(currentRow, currentRow, 0, 6));
+
+                currentRow++;
+                Row emptyRow2 = sheet.createRow(currentRow);
+                emptyRow2.setHeightInPoints((short) 9); // 琛岄珮9纾�
+
+                currentRow++;
+                Row sign1 = sheet.createRow(currentRow);
+                sign1.createCell(0).setCellValue("閫佽揣鍗曚綅锛堢绔狅級锛�");
+                sign1.createCell(4).setCellValue("鏀惰揣鍗曚綅锛�");
+
+                currentRow++;
+                Row sign2 = sheet.createRow(currentRow);
+                sign2.createCell(0).setCellValue("閫佽揣浜猴細");
+                sign2.createCell(4).setCellValue("鏀惰揣浜猴細");
             }
 
-            zos.finish();
-            log.info("鎵归噺瀵煎嚭瀹屾垚锛屽叡{}浠介�佽揣鍗�", salesLedgerList.size());
+            workbook.write(response.getOutputStream());
+            workbook.close();
 
-        } catch (BaseException e) {
-            log.error("瀵煎嚭澶辫触:{}", e.getMessage(), e);
-            throw e;
         } catch (Exception e) {
-            log.error("瀵煎嚭寮傚父", e);
-            throw new BaseException("瀵煎嚭澶辫触锛�" + e.getMessage());
+            log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
+            throw new RuntimeException("瀵煎嚭澶辫触");
+        }
+    }
+
+    // 宸ュ叿绫�
+    private CellStyle createBaseStyle(Workbook workbook, String fontName, short fontSize, boolean bold, boolean center) {
+        CellStyle style = workbook.createCellStyle();
+        Font font = workbook.createFont();
+        font.setFontName(fontName);
+        font.setFontHeightInPoints(fontSize);
+        font.setBold(bold);
+        style.setFont(font);
+        if (center) {
+            style.setAlignment(HorizontalAlignment.CENTER);
+            style.setVerticalAlignment(VerticalAlignment.CENTER);
+        }
+        return style;
+    }
+
+    private CellStyle createBorderStyle(Workbook workbook, String fontName, short fontSize, boolean bold, boolean center) {
+        CellStyle style = createBaseStyle(workbook, fontName, fontSize, bold, center);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        return style;
+    }
+
+    private CellStyle createNoBorderStyle(Workbook workbook) {
+        return createBaseStyle(workbook, "瀹嬩綋", (short) 11, false, false);
+    }
+
+    private CellStyle createDashBottomStyle(Workbook workbook) {
+        CellStyle style = createNoBorderStyle(workbook);
+        style.setBorderBottom(BorderStyle.DASHED);
+        return style;
+    }
+
+    private void fillMergeRange(Sheet sheet, int startR, int endR, int startC, int endC, CellStyle style) {
+        for (int r = startR; r <= endR; r++) {
+            Row row = sheet.getRow(r) == null ? sheet.createRow(r) : sheet.getRow(r);
+            for (int c = startC; c <= endC; c++) {
+                Cell cell = row.getCell(c) == null ? row.createCell(c) : row.getCell(c);
+                cell.setCellStyle(style);
+            }
         }
     }
 
@@ -342,7 +483,7 @@
         if (date == null) {
             return null;
         }
-        return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return date.format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
     }
 
     @Override
@@ -465,7 +606,7 @@
     }
 
     @Override
-    public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
+    public IPage<SalesLedgerDto> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
         return salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
     }
 
@@ -742,7 +883,7 @@
             // 4. 澶勭悊瀛愯〃鏁版嵁
             List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
             if (productList != null && !productList.isEmpty()) {
-                handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType(), salesLedgerDto.isProduce());
+                handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType(), Boolean.TRUE.equals(salesLedgerDto.getProduce()));
                 updateMainContractAmount(
                         salesLedger.getId(),
                         productList,
@@ -888,10 +1029,13 @@
                 salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
                 salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                 salesLedgerProductMapper.insert(salesLedgerProduct);
+
+            }
+        }
+        if (isProduce) {
+            for (SalesLedgerProduct salesLedgerProduct : products) {
                 // 娣诲姞鐢熶骇鏁版嵁
-                if (isProduce) {
-                    salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
-                }
+                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
             }
         }
     }
@@ -899,6 +1043,7 @@
     private SalesLedger convertToEntity(SalesLedgerDto dto) {
         SalesLedger entity = new SalesLedger();
         BeanUtils.copyProperties(dto, entity);
+        entity.setProduce(dto.getProduce());
         return entity;
     }
 
@@ -1005,4 +1150,4 @@
             throw new RuntimeException("鍔ㄦ�佹洿鏂颁富琛ㄩ噾棰濆け璐�", e);
         }
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3