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 | 378 ++++++++++++++++++-----------------------------------
1 files changed, 128 insertions(+), 250 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 e2a5abd..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;
@@ -46,13 +36,13 @@
import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import com.ruoyi.sales.vo.ShippingNoteVo;
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;
@@ -64,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;
@@ -77,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涓氬姟灞傚鐞�
@@ -239,27 +226,42 @@
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
- Workbook workbook = new XSSFWorkbook();
+ XSSFWorkbook workbook = new XSSFWorkbook();
for (SalesLedger ledger : ledgerList) {
- // 姣忎釜鍗曟嵁涓�涓� sheet
- Sheet sheet = workbook.createSheet(ledger.getSalesContractNo());
+ XSSFSheet sheet = workbook.createSheet(ledger.getSalesContractNo());
- sheet.setColumnWidth(0, 2500);
+ // 璁剧疆椤佃竟璺濓紙鍗曚綅锛氳嫳瀵革紝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, 9000);
- sheet.setColumnWidth(3, 2500);
- sheet.setColumnWidth(4, 3000);
- sheet.setColumnWidth(5, 4500);
- sheet.setColumnWidth(6, 3500);
+ 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, 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);
- CellStyle noBorder = createNoBorderStyle(workbook);
- CellStyle fourDash = createDashBottomStyle(workbook);
+
+ // 鏍峰紡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);
@@ -268,68 +270,78 @@
fillMergeRange(sheet, 0, 0, 0, 6, companyTitle);
Row row1 = sheet.createRow(1);
- row1.createCell(0).setCellValue("閫� 璐� 鍗�");
+ 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.createCell(0).setCellValue("鑱旂郴鏂瑰紡锛�" + customer.getContactPerson() + " " + customer.getContactPhone());
+ row4.setHeightInPoints(13);
row4.createCell(4).setCellValue("鑱旂郴鐢佃瘽锛�" + customer.getCompanyPhone());
Row row5 = sheet.createRow(5);
- row5.createCell(0).setCellValue("閫佽揣鍗曚綅锛氭箹鍗楅箯鍒涚數瀛愭湁闄愬叕鍙�");
+ row5.createCell(0).setCellValue("鑱旂郴鏂瑰紡锛�" + customer.getContactPerson() + " " + customer.getContactPhone());
Row row6 = sheet.createRow(6);
- row6.createCell(0).setCellValue("鍦板潃锛氭箹鍗楃渷鑰掗槼甯傚垱鏂板垱涓氬洯A1鏍�");
+ row6.createCell(0).setCellValue("閫佽揣鍗曚綅锛氭箹鍗楅箯鍒涚數瀛愭湁闄愬叕鍙�");
Row row7 = sheet.createRow(7);
- row7.createCell(0).setCellValue("璐х墿璇︾粏淇℃伅锛�");
+ 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 = 8;
+ 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]);
- hc.setCellStyle(i == 6 ? noBorder : headerStyle);
+ 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 product : productList) {
- totalQuantity = totalQuantity.add(product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity());
+ 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);
- if (p == null) continue;
+ 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();
- }
+ if (m != null) materialCode = m.getMaterialCode();
}
- Row dataRow = sheet.createRow(currentRow);
dataRow.createCell(0).setCellValue(i + 1);
dataRow.createCell(1).setCellValue(materialCode);
dataRow.createCell(2).setCellValue(p.getProductCategory() + "/" + p.getSpecificationModel());
@@ -337,47 +349,81 @@
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]);
- }
-
- // 鍙墠3琛屾湁铏氱嚎锛屼粨搴撳強浠ヤ笅鏃犺竟妗�
- if (i >= 0 && i <= 2) {
- fourCell.setCellStyle(fourDash);
+ if (i <= 2) {
+ fourCell.setCellStyle(dashStyle);
+ } else {
+ fourCell.setCellStyle(centerNoBorder);
+ }
} else {
- fourCell.setCellStyle(noBorder);
+ fourCell.setCellStyle(centerNoBorder);
}
-
- for (int c = 0; c <= 5; c++) {
- dataRow.getCell(c).setCellStyle(dataCenterStyle);
- }
- currentRow++;
}
- // 鍚堣琛�
- Row totalRow = sheet.createRow(currentRow);
- sheet.addMergedRegion(new CellRangeAddress(currentRow, currentRow, 0, 3));
- totalRow.createCell(0).setCellValue("鍚堣");
- totalRow.createCell(4).setCellValue(totalQuantity.doubleValue());
- fillMergeRange(sheet, currentRow, currentRow, 0, 5, dataCenterStyle);
- totalRow.createCell(6).setCellStyle(noBorder);
+ // 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鏃ュ唴鎻愬嚭锛屽惁鍒欒涓烘敹鍙椼��");
+ 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(5).setCellValue("鏀惰揣鍗曚綅锛�");
+ sign1.createCell(4).setCellValue("鏀惰揣鍗曚綅锛�");
currentRow++;
Row sign2 = sheet.createRow(currentRow);
sign2.createCell(0).setCellValue("閫佽揣浜猴細");
- sign2.createCell(5).setCellValue("鏀惰揣浜猴細");
+ sign2.createCell(4).setCellValue("鏀惰揣浜猴細");
}
workbook.write(response.getOutputStream());
@@ -385,11 +431,11 @@
} catch (Exception e) {
log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
- throw new BaseException("鎵归噺瀵煎嚭澶辫触");
+ throw new RuntimeException("瀵煎嚭澶辫触");
}
}
- // 宸ュ叿绫讳笉鍔�
+ // 宸ュ叿绫�
private CellStyle createBaseStyle(Workbook workbook, String fontName, short fontSize, boolean bold, boolean center) {
CellStyle style = workbook.createCellStyle();
Font font = workbook.createFont();
@@ -432,184 +478,12 @@
}
}
}
- /**
- * 鎵归噺瀵煎嚭閫佽揣鍗曚负鍘嬬缉鍖�
- */
- private void exportBatchShippingNote(HttpServletResponse response, List<SalesLedger> salesLedgerList) {
- // 璁剧疆鍝嶅簲澶�
- response.setContentType("application/zip");
- response.setHeader("Content-Disposition", "attachment;filename=閫佽揣鍗�.zip");
- response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-
- try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) {
-
- for (SalesLedger ledger : salesLedgerList) {
- log.info("澶勭悊鍚堝悓鍙�: {}", ledger.getSalesContractNo());
-
- // 鏌ヨ鏄庣粏
- SalesLedgerProduct cond = new SalesLedgerProduct();
- cond.setSalesLedgerId(ledger.getId());
- List<SalesLedgerProduct> productList = salesLedgerProductServiceImpl.selectSalesLedgerProductList(cond);
-
- // 鑷姩搴忓彿+鐗╂枡缂栫爜璧嬪��
- 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());
- }
- }
- }
- }
-
- // 鍏宠仈瀹㈡埛淇℃伅
- Customer customer = customerMapper.selectById(ledger.getCustomerId());
-
- // 璁＄畻鎬诲悎璁�
- BigDecimal totalQuantity = BigDecimal.ZERO;
- for (SalesLedgerProduct product : productList) {
- totalQuantity = totalQuantity.add(product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity());
- }
-
- // 缁勮椤堕儴闈欐�佹暟鎹�
- 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()));
- dataMap.put("totalQuantity", totalQuantity);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- InputStream templateIs = this.getClass().getResourceAsStream("/static/shipping-note.xlsx");
-
- ExcelWriter writer = EasyExcel.write(bos).withTemplate(templateIs).build();
- WriteSheet sheet = EasyExcel.writerSheet().build();
-
- // 鍏堝～鍏呮暟鎹紙鍖呮嫭鍚堣锛�
- writer.fill(dataMap, sheet);
-
- // 鍐嶅～鍏呬骇鍝佸垪琛�
- if (!productList.isEmpty()) {
- FillConfig fillConfig = FillConfig.builder()
- .forceNewRow(Boolean.TRUE)
- .build();
- writer.fill(productList, fillConfig, sheet);
- }
-
- writer.finish();
- templateIs.close();
-
- // 鎵撳寘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();
- }
-
- zos.finish();
- log.info("鎵归噺瀵煎嚭瀹屾垚锛屽叡{}浠介�佽揣鍗�", salesLedgerList.size());
-
- } catch (BaseException e) {
- log.error("瀵煎嚭澶辫触:{}", e.getMessage(), e);
- throw e;
- } catch (Exception e) {
- log.error("瀵煎嚭寮傚父", e);
- throw new BaseException("瀵煎嚭澶辫触锛�" + e.getMessage());
- }
- }
public static String formatDate(LocalDate date) {
if (date == null) {
return null;
}
- return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- }
-
- /**
- * 璁剧疆鍗曞厓鏍兼牱寮�
- */
- private void setCellStyle(Cell cell, boolean isHeader, boolean isTitle) {
- Workbook workbook = cell.getSheet().getWorkbook();
- CellStyle style = workbook.createCellStyle();
-
- // 璁剧疆瀵归綈鏂瑰紡
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
-
- // 璁剧疆杈规
- style.setBorderTop(BorderStyle.THIN);
- style.setBorderBottom(BorderStyle.THIN);
- style.setBorderLeft(BorderStyle.THIN);
- style.setBorderRight(BorderStyle.THIN);
-
- // 璁剧疆瀛椾綋
- Font font = workbook.createFont();
- font.setFontName("瀹嬩綋");
- if (isTitle) {
- font.setFontHeightInPoints((short) 16);
- font.setBold(true);
- } else if (isHeader) {
- font.setFontHeightInPoints((short) 12);
- font.setBold(true);
- } else {
- font.setFontHeightInPoints((short) 11);
- }
- style.setFont(font);
-
- cell.setCellStyle(style);
- }
-
-
- /**
- * 閫佽揣鍗曟牱寮忓鐞嗗櫒
- */
- public static class ShippingNoteStyleHandler implements com.alibaba.excel.write.handler.CellWriteHandler {
- @Override
- public void beforeCellCreate(com.alibaba.excel.write.metadata.holder.WriteSheetHolder writeSheetHolder, com.alibaba.excel.write.metadata.holder.WriteTableHolder writeTableHolder, org.apache.poi.ss.usermodel.Row row, com.alibaba.excel.metadata.Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {
- }
-
-// @Override
-// public void afterCellDispose(com.alibaba.excel.write.metadata.holder.WriteSheetHolder writeSheetHolder, com.alibaba.excel.write.metadata.holder.WriteTableHolder writeTableHolder, org.apache.poi.ss.usermodel.Cell cell, com.alibaba.excel.metadata.Head head, Integer relativeRowIndex, Boolean isHead) {
-// org.apache.poi.ss.usermodel.Workbook workbook = writeSheetHolder.getSheet().getWorkbook();
-// org.apache.poi.ss.usermodel.Sheet sheet = writeSheetHolder.getSheet();
-//
-// // 璁剧疆鍒楀
-// sheet.setColumnWidth(0, 6000); // 搴忓彿
-// sheet.setColumnWidth(1, 6000); // 鐗╂枡缂栧彿
-// sheet.setColumnWidth(2, 10000); // 鍝佸悕/瑙勬牸
-// sheet.setColumnWidth(3, 4000); // 鍗曚綅
-// sheet.setColumnWidth(4, 4000); // 鏁伴噺
-// sheet.setColumnWidth(5, 6000); // 璁㈠崟鍙�
-// sheet.setColumnWidth(6, 4000); // 鍏卞洓鑱�
-//
-// // 璁剧疆鍗曞厓鏍兼牱寮�
-// org.apache.poi.ss.usermodel.CellStyle style = workbook.createCellStyle();
-// style.setAlignment(org.apache.poi.ss.usermodel.HorizontalAlignment.CENTER);
-// style.setVerticalAlignment(org.apache.poi.ss.usermodel.VerticalAlignment.CENTER);
-// style.setBorderTop(org.apache.poi.ss.usermodel.BorderStyle.THIN);
-// style.setBorderBottom(org.apache.poi.ss.usermodel.BorderStyle.THIN);
-// style.setBorderLeft(org.apache.poi.ss.usermodel.BorderStyle.THIN);
-// style.setBorderRight(org.apache.poi.ss.usermodel.BorderStyle.THIN);
-//
-// // 璁剧疆瀛椾綋
-// org.apache.poi.ss.usermodel.Font font = workbook.createFont();
-// font.setFontName("瀹嬩綋");
-// font.setFontHeightInPoints((short) 11);
-// style.setFont(font);
-//
-// cell.setCellStyle(style);
-// }
+ return date.format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
}
@Override
@@ -732,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);
}
@@ -1009,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,
@@ -1155,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);
}
}
}
@@ -1166,6 +1043,7 @@
private SalesLedger convertToEntity(SalesLedgerDto dto) {
SalesLedger entity = new SalesLedger();
BeanUtils.copyProperties(dto, entity);
+ entity.setProduce(dto.getProduce());
return entity;
}
@@ -1272,4 +1150,4 @@
throw new RuntimeException("鍔ㄦ�佹洿鏂颁富琛ㄩ噾棰濆け璐�", e);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3