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 |  689 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 593 insertions(+), 96 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 ab9b1ca..3e7bc29 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -8,29 +8,42 @@
 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.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
 import com.ruoyi.account.service.AccountIncomeService;
 import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
 import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.ProductModel;
 import com.ruoyi.common.enums.FileNameType;
 import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.other.mapper.TempFileMapper;
 import com.ruoyi.other.pojo.TempFile;
-import com.ruoyi.production.mapper.SalesLedgerSchedulingMapper;
-import com.ruoyi.production.pojo.SalesLedgerScheduling;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.service.ProductionProductMainService;
 import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.sales.dto.MonthlyAmountDto;
-import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.sales.dto.*;
 import com.ruoyi.sales.mapper.*;
 import com.ruoyi.sales.pojo.*;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
 import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
 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;
@@ -38,10 +51,15 @@
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 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.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -72,6 +90,7 @@
     private final CustomerMapper customerMapper;
 
     private final SalesLedgerProductMapper salesLedgerProductMapper;
+    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
 
     private final CommonFileMapper commonFileMapper;
 
@@ -79,9 +98,47 @@
 
     private final ReceiptPaymentMapper receiptPaymentMapper;
 
+    private final ShippingInfoServiceImpl shippingInfoServiceImpl;
+
+    private final CommonFileServiceImpl commonFileService;
+
+    private final ShippingInfoMapper shippingInfoMapper;
+
     private final InvoiceLedgerMapper invoiceLedgerMapper;
 
     private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;
+
+    private final SalesLedgerWorkMapper salesLedgerWorkMapper;
+
+    private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+
+    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+    private final InvoiceRegistrationMapper invoiceRegistrationMapper;
+
+    private final ProductOrderMapper productOrderMapper;
+
+    private final ProcessRouteMapper processRouteMapper;
+    private final ProductProcessRouteMapper productProcessRouteMapper;
+
+    private final ProcessRouteItemMapper processRouteItemMapper;
+
+    private final ProductProcessRouteItemMapper productProcessRouteItemMapper;
+
+    private final ProductWorkOrderMapper productWorkOrderMapper;
+
+    private final ProductionProductMainMapper productionProductMainMapper;
+
+    private final ProductionProductOutputMapper productionProductOutputMapper;
+
+    private final ProductionProductInputMapper productionProductInputMapper;
+
+    private final QualityInspectMapper qualityInspectMapper;
+
+    private final StockInventoryMapper stockInventoryMapper;
+
+    private ISalesLedgerProductService salesLedgerProductService;
+
 
     @Autowired
     private SysDeptMapper sysDeptMapper;
@@ -94,6 +151,16 @@
     private static final long LOCK_EXPIRE_TIME = 30;  // 閿佽嚜鍔ㄨ繃鏈熸椂闂达紙绉掞級
 
     private final RedisTemplate<String, String> redisTemplate;
+    @Autowired
+    private ProductModelMapper productModelMapper;
+
+    @Autowired
+    private ProductMapper productMapper;
+    @Autowired
+    private ProductStructureMapper productStructureMapper;
+    @Autowired
+    private ProductionProductMainService productionProductMainService;
+    ;
 
     @Override
     public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
@@ -120,6 +187,17 @@
             product.setTempNoInvoiceNum(product.getNoInvoiceNum());
             product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
             product.setRegisterDate(LocalDateTime.now());
+            // 鍙戣揣淇℃伅
+            ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
+                    .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
+                    .orderByDesc(ShippingInfo::getCreateTime)
+                    .last("limit 1"));
+            if (shippingInfo != null) {
+                product.setShippingStatus(shippingInfo.getStatus());
+            }
+
+            ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
+            product.setMaterialCode(productModel.getMaterialCode());
         }
 
         // 3.鏌ヨ涓婁紶鏂囦欢
@@ -137,6 +215,275 @@
             resultDto.setSalesLedgerFiles(salesLedgerFiles);
         }
         return resultDto;
+    }
+
+    @Override
+    public void exportShippingNote(HttpServletResponse response, List<Long> 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");
+
+            XSSFWorkbook workbook = new XSSFWorkbook();
+
+            for (SalesLedger ledger : ledgerList) {
+                XSSFSheet sheet = workbook.createSheet(ledger.getSalesContractNo());
+
+                // 璁剧疆椤佃竟璺濓紙鍗曚綅锛氳嫳瀵革紝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鍘樼背
+
+                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);
+
+                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);
+
+                // 鏍峰紡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 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);
+                    }
+                }
+
+                // 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);
+
+                    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);
+                    }
+                }
+
+                // 鍚堣
+                Row totalRow = sheet.createRow(currentRow);
+                totalRow.setHeightInPoints((short) 18);
+
+                // 鍚堣鏀惧湪绗簩鍒楋紝涓嶅悎骞跺崟鍏冩牸
+                totalRow.createCell(1).setCellValue("鍚堣");
+                totalRow.createCell(4).setCellValue(totalQuantity.doubleValue());
+
+                // 璁剧疆鏍峰紡
+                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);
+
+                currentRow++;
+                Row emptyRow1 = sheet.createRow(currentRow);
+                emptyRow1.setHeightInPoints((short) 9); // 琛岄珮9纾�
+
+                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("鏀惰揣浜猴細");
+            }
+
+            workbook.write(response.getOutputStream());
+            workbook.close();
+
+        } catch (Exception e) {
+            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);
+            }
+        }
+    }
+
+    public static String formatDate(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
+        return date.format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
     }
 
     @Override
@@ -210,82 +557,183 @@
 
     @Override
     public List<MonthlyAmountDto> getAmountHalfYear(Integer type) {
+
         LocalDate now = LocalDate.now();
-        LocalDateTime currentDateTime = LocalDateTime.now();
-
-        // 鏍规嵁 type 纭畾鏌ヨ鐨勬椂闂撮棿闅旓紙澶╂暟锛夊拰鎬绘煡璇㈠ぉ鏁�
-        int daysPerPeriod;
-        int totalDays;
-        switch (type) {
-            case 1:
-                daysPerPeriod = 5;   // 姣�5澶╂煡涓�娆�
-                totalDays = 30;       // 6娆� 脳 5澶� = 30澶�
-                break;
-            case 2:
-                daysPerPeriod = 15;    // 姣�15澶╂煡涓�娆�
-                totalDays = 90;       // 6娆� 脳 15澶� = 90澶�
-                break;
-            case 3:
-                daysPerPeriod = 30;   // 姣�30澶╂煡涓�娆�
-                totalDays = 180;      // 6娆� 脳 30澶� = 180澶�
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid type value: " + type);
-        }
-
         List<MonthlyAmountDto> result = new ArrayList<>();
 
-        // 寰幆6娆★紝姣忔鏌ヨ涓�涓椂闂存鐨勬暟鎹�
-        for (int i = 0; i < 6; i++) {
-            // 璁$畻褰撳墠鏃堕棿娈电殑璧峰鍜岀粨鏉熸椂闂�
-            LocalDateTime endTime = currentDateTime.minusDays(i * daysPerPeriod);
-            LocalDateTime startTime = endTime.minusDays(daysPerPeriod);
+        for (int i = 5; i >= 0; i--) {
+            YearMonth yearMonth = YearMonth.from(now.minusMonths(i));
+            LocalDateTime startTime = yearMonth.atDay(1).atStartOfDay();
+            LocalDateTime endTime = yearMonth.atEndOfMonth().atTime(23, 59, 59);
 
-            // 鏌ヨ鍥炴閲戦
+            //  鍥炴閲戦
             LambdaQueryWrapper<ReceiptPayment> receiptPaymentQuery = new LambdaQueryWrapper<>();
             receiptPaymentQuery
                     .ge(ReceiptPayment::getCreateTime, startTime)
-                    .lt(ReceiptPayment::getCreateTime, endTime);
-            List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(receiptPaymentQuery);
+                    .le(ReceiptPayment::getCreateTime, endTime);
 
-            // 鏌ヨ寮�绁ㄩ噾棰�
-            LambdaQueryWrapper<InvoiceLedger> invoiceLedgerQuery = new LambdaQueryWrapper<>();
-            invoiceLedgerQuery
-                    .ge(InvoiceLedger::getCreateTime, startTime)
-                    .lt(InvoiceLedger::getCreateTime, endTime);
-            List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(invoiceLedgerQuery);
+            List<ReceiptPayment> receiptPayments =
+                    receiptPaymentMapper.selectList(receiptPaymentQuery);
 
-            // 璁$畻鍥炴鎬婚
             BigDecimal receiptAmount = receiptPayments.stream()
                     .map(ReceiptPayment::getReceiptPaymentAmount)
                     .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-            // 璁$畻寮�绁ㄦ�婚
+            //  寮�绁ㄩ噾棰�
+            LambdaQueryWrapper<InvoiceLedger> invoiceLedgerQuery = new LambdaQueryWrapper<>();
+            invoiceLedgerQuery
+                    .ge(InvoiceLedger::getCreateTime, startTime)
+                    .le(InvoiceLedger::getCreateTime, endTime);
+
+            List<InvoiceLedger> invoiceLedgers =
+                    invoiceLedgerMapper.selectList(invoiceLedgerQuery);
+
             BigDecimal invoiceAmount = invoiceLedgers.stream()
                     .map(InvoiceLedger::getInvoiceTotal)
                     .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-            // 鏋勯�犺繑鍥炵殑 DTO
             MonthlyAmountDto dto = new MonthlyAmountDto();
-            dto.setMonth(startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " ~ " +
-                    endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            dto.setMonth(yearMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")));
             dto.setReceiptAmount(receiptAmount);
             dto.setInvoiceAmount(invoiceAmount);
 
             result.add(dto);
         }
 
-        // 鍙嶈浆鍒楄〃锛屼娇鏃堕棿椤哄簭浠庢棭鍒版櫄
-        Collections.reverse(result);
         return result;
     }
 
     @Override
-    public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
+    public IPage<SalesLedgerDto> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
         return salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
     }
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importData(MultipartFile file) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        try {
+            InputStream inputStream = file.getInputStream();
+            ExcelUtil<SalesLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(SalesLedgerImportDto.class);
+            Map<String, List<SalesLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閿�鍞彴璐︽暟鎹�", "閿�鍞骇鍝佹暟鎹�"), inputStream, 0);
+            if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閿�鍞〃鏍间负绌猴紒");
+            // 涓氬姟灞傚悎骞�
+            List<SalesLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閿�鍞彴璐︽暟鎹�");
+            if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閿�鍞彴璐︽暟鎹负绌猴紒");
+            List<SalesLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閿�鍞骇鍝佹暟鎹�");
+            if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閿�鍞骇鍝佹暟鎹负绌猴紒");
+            // 瀹㈡埛鏁版嵁
+            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,
+                    salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
+            for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
+                SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
+                        .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
+                        .last("LIMIT 1"));
+                if (salesLedger1 != null) {
+                    continue;
+                }
+                SalesLedger salesLedger = new SalesLedger();
+                BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
+                salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
+                // 閫氳繃瀹㈡埛鍚嶇О鏌ヨ瀹㈡埛ID锛屽鎴峰悎鍚屽彿
+                salesLedger.setCustomerId(customers.stream()
+                        .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
+                        .findFirst()
+                        .map(Customer::getId)
+                        .orElse(null));
+                salesLedger.setCustomerContractNo(customers.stream()
+                        .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
+                        .findFirst()
+                        .map(Customer::getTaxpayerIdentificationNumber)
+                        .orElse(null));
+                Long aLong = sysUsers.stream()
+                        .filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson()))
+                        .findFirst()
+                        .map(SysUser::getUserId)
+                        .orElse(null);
+                if (aLong == null)
+                    throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
+                salesLedger.setEntryPerson(aLong.toString());
+                // 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
+                List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
+                        .filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo()))
+                        .collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
+                    throw new RuntimeException("閿�鍞崟鍙�:" + salesLedgerImportDto.getSalesContractNo() + ",鏃犲搴斾骇鍝佹暟鎹紒");
+                salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
+                        .map(SalesLedgerProductImportDto::getTaxInclusiveTotalPrice)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add));
+                salesLedgerMapper.insert(salesLedger);
+
+
+                for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
+                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
+                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
+                    salesLedgerProduct.setType(1);
+                    // 璁$畻涓嶅惈绋庢�讳环
+                    salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
+                    salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
+                    salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
+                    list.stream()
+                            .filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
+                            .findFirst()
+                            .ifPresent(map -> {
+                                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);
+                    // 娣诲姞鐢熶骇鏁版嵁
+                    salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+                }
+            }
+
+            return AjaxResult.success("瀵煎叆鎴愬姛");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success("瀵煎叆澶辫触");
+    }
+
+    @Override
+    public List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId) {
+
+
+        List<LossProductModelDto> lossProductModelDtos = salesLedgerProductMapper.selectProductBomStructure(salesLedgerId);
+
+
+        return lossProductModelDtos;
+    }
+
 
     // 鍐呴儴绫荤敤浜庡瓨鍌ㄨ仛鍚堢粨鏋�
     private static class GroupedCustomer {
@@ -348,20 +796,63 @@
         if (CollectionUtils.isEmpty(idList)) {
             return 0;
         }
-        // 鐢熶骇璁㈠崟鏈夊緟鎺掍骇鏁版嵁锛屽彴璐︿笉鍙垹闄�
-        LambdaQueryWrapper<SalesLedgerScheduling> salesLedgerSchedulingLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerScheduling>()
-                .in(SalesLedgerScheduling::getSalesLedgerId, idList);
-        if (salesLedgerSchedulingMapper.selectCount(salesLedgerSchedulingLambdaQueryWrapper) > 0) {
-            throw new BaseException("鏈夋帓浜ф暟鎹紝涓嶅彲鍒犻櫎");
+        // 鍒犻櫎閿�鍞鐞嗘暟鎹�
+        LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList)
+                .select(SalesLedgerProduct::getId);
+
+        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(queryWrapper);
+        List<Long> productIds = products.stream()
+                .map(SalesLedgerProduct::getId)
+                .collect(Collectors.toList());
+        //鍒犻櫎鐢熶骇鏁版嵁
+        salesLedgerProductServiceImpl.deleteProductionData(productIds);
+
+        // 鎵归噺鍒犻櫎浜у搧瀛愯〃
+        if (!productIds.isEmpty()) {
+            salesLedgerProductMapper.deleteBatchIds(productIds);
         }
-        // 1. 鍏堝垹闄ゅ瓙琛ㄦ暟鎹�
-        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
-        productWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList);
-        salesLedgerProductMapper.delete(productWrapper);
-        // 鍒犻櫎鐢熶骇璁㈠崟鏁版嵁
-        LambdaQueryWrapper<SalesLedgerScheduling> in = new LambdaQueryWrapper<SalesLedgerScheduling>()
-                .in(SalesLedgerScheduling::getSalesLedgerId, idList);
-        salesLedgerSchedulingMapper.delete(in);
+
+        LambdaQueryWrapper<InvoiceRegistrationProduct> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(InvoiceRegistrationProduct::getSalesLedgerId, idList);
+        List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(wrapper);
+        List<Integer> invoiceLedgerIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(invoiceRegistrationProducts)) {
+            LambdaQueryWrapper<InvoiceLedger> wrapperOne = new LambdaQueryWrapper<>();
+            wrapperOne.in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList()));
+            List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(wrapperOne);
+            if (CollectionUtils.isNotEmpty(invoiceLedgers)) {
+                invoiceLedgerIds = invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList());
+            }
+            invoiceLedgerMapper.delete(wrapperOne);
+        }
+        invoiceRegistrationProductMapper.delete(wrapper);
+        LambdaQueryWrapper<InvoiceRegistration> wrapperTwo = new LambdaQueryWrapper<>();
+        wrapperTwo.in(InvoiceRegistration::getSalesLedgerId, idList);
+        invoiceRegistrationMapper.delete(wrapperTwo);
+
+        if (CollectionUtils.isNotEmpty(invoiceLedgerIds)) {
+            LambdaQueryWrapper<ReceiptPayment> wrapperTree = new LambdaQueryWrapper<>();
+            wrapperTree.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgerIds);
+            receiptPaymentMapper.delete(wrapperTree);
+        }
+        // 鍒犻櫎鍙戣揣鍙拌处璁板綍
+        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
+                .in(ShippingInfo::getSalesLedgerId, idList));
+        if (CollectionUtils.isNotEmpty(shippingInfos)) {
+            shippingInfoServiceImpl.delete(shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList()));
+        }
+        // 鍒犻櫎闄勪欢琛�
+        commonFileService.deleteByBusinessIds(idList, FileNameType.SALE.getValue());
+
+        // 鍒犻櫎鐢熶骇绠℃帶鏁版嵁
+        //鏌ヨ鐢熶骇鎶ュ伐id
+        ArrayList<Long> mainIdList = productionProductMainService.listMain(idList);
+        if (CollectionUtils.isNotEmpty(mainIdList)) {
+            mainIdList.stream().forEach(mainId -> {
+                productionProductMainService.removeProductMain(mainId);
+            });
+        }
         // 2. 鍐嶅垹闄や富琛ㄦ暟鎹�
         return salesLedgerMapper.deleteBatchIds(idList);
     }
@@ -380,45 +871,19 @@
             SalesLedger salesLedger = convertToEntity(salesLedgerDto);
             salesLedger.setCustomerName(customer.getCustomerName());
             salesLedger.setTenantId(customer.getTenantId());
-
-            AccountIncome accountIncome = new AccountIncome();
-            accountIncome.setIncomeDate(salesLedger.getEntryDate());
-            accountIncome.setIncomeType("0");
-            accountIncome.setCustomerName(customer.getCustomerName());
-            accountIncome.setIncomeMoney(salesLedger.getContractAmount());
-            accountIncome.setIncomeMethod("0");
-            accountIncome.setInputTime(new Date());
-            accountIncome.setInputUser(salesLedger.getEntryPerson());
             // 3. 鏂板鎴栨洿鏂颁富琛�
             if (salesLedger.getId() == null) {
                 String contractNo = generateSalesContractNo();
                 salesLedger.setSalesContractNo(contractNo);
                 salesLedgerMapper.insert(salesLedger);
-                accountIncome.setIncomeDescribed("閿�鍞悎鍚岋細" + salesLedger.getSalesContractNo());
-                accountIncome.setInvoiceNumber(salesLedger.getSalesContractNo());
-                accountIncomeService.save(accountIncome);
             } else {
                 salesLedgerMapper.updateById(salesLedger);
-                SalesLedger salesLedgerDB = salesLedgerMapper.selectById(salesLedger.getId());
-                List<AccountIncome> accountIncomeDBs = accountIncomeService.getByInvoiceNumberList(salesLedger.getSalesContractNo());
-                if (!org.springframework.util.CollectionUtils.isEmpty(accountIncomeDBs)) {
-                    accountIncomeDBs.forEach(accountIncomeDB -> {
-                        accountIncomeDB.setCustomerName(salesLedgerDB.getCustomerName());
-                        accountIncomeDB.setIncomeMoney(salesLedgerDB.getContractAmount());
-                        accountIncomeDB.setIncomeDescribed("閿�鍞悎鍚岋細" + salesLedgerDB.getSalesContractNo());
-                        accountIncomeDB.setInvoiceNumber(salesLedgerDB.getSalesContractNo());
-                        accountIncomeDB.setInputTime(new Date());
-                        accountIncomeDB.setInputUser(salesLedgerDB.getEntryPerson());
-                        accountIncomeService.updateById(accountIncomeDB);
-                    });
-                }
-
             }
 
             // 4. 澶勭悊瀛愯〃鏁版嵁
             List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
             if (productList != null && !productList.isEmpty()) {
-                handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType());
+                handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType(), Boolean.TRUE.equals(salesLedgerDto.getProduce()));
                 updateMainContractAmount(
                         salesLedger.getId(),
                         productList,
@@ -516,7 +981,7 @@
     }
 
 
-    private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+    private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type, boolean isProduce) {
         // 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
         Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
                 .peek(p -> p.setSalesLedgerId(salesLedgerId))
@@ -525,9 +990,26 @@
         List<SalesLedgerProduct> updateList = partitionedProducts.get(true);
         List<SalesLedgerProduct> insertList = partitionedProducts.get(false);
 
+//        List<StockInventoryDto> stockInventoryDtos = stockInventoryMapper.selectProductList();
+
         // 鎵ц鏇存柊鎿嶄綔
         if (!updateList.isEmpty()) {
             for (SalesLedgerProduct product : updateList) {
+//                // 鏌ヨ搴撳瓨鏁伴噺
+//                SalesLedgerProduct oldProduct = salesLedgerProductMapper.selectById(product.getId());
+//                BigDecimal quantityChange = product.getQuantity().subtract(oldProduct.getQuantity());
+//
+//                // 濡傛灉鏁伴噺澧炲姞浜嗭紝妫�鏌ュ簱瀛�
+//                if (quantityChange.compareTo(BigDecimal.ZERO) > 0) {
+//                    for (StockInventoryDto stockInventoryDto : stockInventoryDtos) {
+//                        if (stockInventoryDto.getProductId().equals(product.getId())) {
+//                            if (quantityChange.compareTo(stockInventoryDto.getQualitity()) > 0) {
+//                                throw new RuntimeException("搴撳瓨涓嶈冻");
+//                            }
+//                            break;
+//                        }
+//                    }
+//                }
                 product.setType(type);
                 salesLedgerProductMapper.updateById(product);
             }
@@ -535,10 +1017,25 @@
         // 鎵ц鎻掑叆鎿嶄綔
         if (!insertList.isEmpty()) {
             for (SalesLedgerProduct salesLedgerProduct : insertList) {
+//                for (StockInventoryDto stockInventoryDto : stockInventoryDtos) {
+//                    if (stockInventoryDto.getProductId().equals(salesLedgerProduct.getId())) {
+//                        if (salesLedgerProduct.getQuantity().compareTo(stockInventoryDto.getQualitity()) > 0) {
+//                            throw new RuntimeException("搴撳瓨涓嶈冻");
+//                        }
+//                    }
+//                }
                 salesLedgerProduct.setType(type);
                 salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
                 salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                 salesLedgerProductMapper.insert(salesLedgerProduct);
+
+            }
+        }
+        if (isProduce) {
+            for (SalesLedgerProduct salesLedgerProduct : products) {
+                // 娣诲姞鐢熶骇鏁版嵁
+                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
             }
         }
     }
@@ -546,6 +1043,7 @@
     private SalesLedger convertToEntity(SalesLedgerDto dto) {
         SalesLedger entity = new SalesLedger();
         BeanUtils.copyProperties(dto, entity);
+        entity.setProduce(dto.getProduce());
         return entity;
     }
 
@@ -592,12 +1090,12 @@
 
             return datePart + String.format("%03d", nextSequence);
         } finally {
-            // 3. 閲婃斁閿侊紙浣跨敤Lua鑴氭湰淇濊瘉鍘熷瓙鎬э紝閬垮厤璇垹鍏朵粬绾跨▼鐨勯攣锛�
+            // 3. 閲婃斁閿�
             String luaScript = "if redis.call('GET', KEYS[1]) == ARGV[1] then return redis.call('DEL', KEYS[1]) else return 0 end";
             redisTemplate.execute(
                     new DefaultRedisScript<>(luaScript, Long.class),
                     Collections.singletonList(lockKey),
-                    lockValue // 鍙湁鎸佹湁鐩稿悓鍊肩殑绾跨▼鎵嶈兘鍒犻櫎閿�
+                    lockValue
             );
         }
     }
@@ -606,7 +1104,7 @@
         if (sequences.isEmpty()) {
             return 1;
         }
-        // 鎺掑簭鍚庢煡鎵剧涓�涓己澶辩殑姝f暣鏁帮紙涓庡師閫昏緫涓�鑷达級
+        // 鎺掑簭鍚庢煡鎵剧涓�涓己澶辩殑姝f暣鏁�
         sequences.sort(Integer::compareTo);
         int next = 1;
         for (int seq : sequences) {
@@ -636,14 +1134,13 @@
                 .filter(Objects::nonNull)
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-        // 鏋勯�犱富琛ㄦ洿鏂板璞★紙鏀寔浠绘剰涓昏〃绫诲瀷锛�
+        // 鏋勯�犱富琛ㄦ洿鏂板璞�
         try {
             S entity = mainEntityClass.getDeclaredConstructor().newInstance();
             Field idField = mainEntityClass.getDeclaredField("id");
             idField.setAccessible(true);
             idField.set(entity, mainId);
 
-            // 璁剧疆 contractAmount 瀛楁锛屾敞鎰忚繖閲屽亣璁惧瓧娈靛悕涓� "contractAmount"
             Field amountField = mainEntityClass.getDeclaredField("contractAmount");
             amountField.setAccessible(true);
             amountField.set(entity, totalAmount);

--
Gitblit v1.9.3