From 3777b6430fe0ed70186cbbcdcf38c464e3adf47f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 7 ++
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 6 ++
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 6 ++
src/main/resources/static/sale-outbound.docx | 0
src/main/java/com/ruoyi/production/service/ProductOrderService.java | 3 +
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 3 +
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 4 +
pom.xml | 6 ++
9 files changed, 139 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 553dbf2..8a25e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,6 +333,12 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
+ <!-- 閲戦杞ぇ鍐� -->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>5.8.26</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 5fb6ec4..448892f 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -85,6 +85,12 @@
return R.ok(productOrderService.cleanRecord(id, cleanRecord));
}
+ @ApiOperation("鏌ヨ鎵�鏈夋壒鍙�")
+ @GetMapping("/getProductOrderBatchNo")
+ public R getProductOrderBatchNo() {
+ return R.ok(productOrderService.getProductOrderBatchNo());
+ }
+
@ApiOperation("鏌ヨ鐢熶骇璁㈠崟瀵瑰簲鐨凚OM鐨勫師鏉愭枡")
@GetMapping("/getByBomId")
public R getByBomId(Long bomId) {
diff --git a/src/main/java/com/ruoyi/production/service/ProductOrderService.java b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
index 3292f8f..0519fd3 100644
--- a/src/main/java/com/ruoyi/production/service/ProductOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.SelectOptionDTO;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProcessRoute;
@@ -30,6 +31,8 @@
int cleanRecord(Long id, Map<String, Object> cleanRecord);
+ List<SelectOptionDTO<String>> getProductOrderBatchNo();
+
List getByBomId(Long bomId);
int drawMaterials(ProductOrderDto productOrderDto);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 597822d..0ed4db6 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -11,6 +11,7 @@
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.basic.dto.SelectOptionDTO;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
@@ -245,6 +246,12 @@
}
@Override
+ public List<SelectOptionDTO<String>> getProductOrderBatchNo() {
+ List<ProductOrder> productOrders = productOrderMapper.selectList(null);
+ return productOrders.stream().map(productOrder -> new SelectOptionDTO<>(productOrder.getBatchNo(), productOrder.getBatchNo())).collect(Collectors.toList());
+ }
+
+ @Override
public List<StockInventoryDto> getByBomId(Long bomId) {
List<ProductStructureDto> structureList = productStructureMapper.listBybomId(bomId);
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index cbef46f..12a33b1 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -349,4 +349,10 @@
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
}
+
+ @ApiOperation("瀵煎嚭")
+ @PostMapping ("/exportSaleOutbound")
+ public void export(HttpServletResponse response, @RequestBody SalesLedger salesLedger) {
+ salesLedgerService.export(response,salesLedger.getId());
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 6885652..dff5d64 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -238,4 +238,7 @@
@TableField(exist = false)
private String uidNo;
+
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batchNo;
}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index 79aea98..e921b83 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.LossProductModelDto;
@@ -13,6 +12,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@@ -52,4 +52,6 @@
List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page);
+
+ public void export(HttpServletResponse response, Long id);
}
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 2f9632b..eedc54f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.service.impl;
+import cn.hutool.core.convert.NumberChineseFormatter;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,11 +9,15 @@
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.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
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.enums.SaleEnum;
import com.ruoyi.common.exception.base.BaseException;
@@ -26,6 +31,10 @@
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
@@ -48,11 +57,14 @@
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.io.OutputStream;
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;
@@ -879,4 +891,97 @@
throw new RuntimeException("鍔ㄦ�佹洿鏂颁富琛ㄩ噾棰濆け璐�", e);
}
}
+
+ @Override
+ public void export(HttpServletResponse response, Long id) {
+ SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+ salesLedgerProduct.setSalesLedgerId(id);
+ salesLedgerProduct.setType(1);
+ List<SalesLedgerProduct> list = salesLedgerProductServiceImpl.selectSalesLedgerProductList(salesLedgerProduct);
+ List<Map<String, Object>> products = new ArrayList<>();
+ BigDecimal amount = BigDecimal.ZERO;
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = new HashMap<>();
+ SalesLedgerProduct product = list.get(i);
+ map.put("index", i + 1);
+ map.put("productCategory", product.getProductCategory());
+ map.put("specificationModel", product.getSpecificationModel());
+ map.put("unit", product.getUnit());
+ map.put("quantity", product.getQuantity());
+ map.put("taxInclusiveUnitPrice", product.getTaxInclusiveUnitPrice().setScale(2, RoundingMode.HALF_UP).toString());
+ map.put("taxInclusiveTotalPrice", product.getTaxInclusiveTotalPrice().setScale(2, RoundingMode.HALF_UP).toString());
+ map.put("batchNo", product.getBatchNo());
+ // 鏌ヨ鍑瘉
+ ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
+ if (productModel != null) {
+ map.put("filingCertificateNo", productModel.getFilingCertificateNo());
+ }
+ amount = amount.add(product.getTaxInclusiveTotalPrice());
+ List<ProductOrder> productOrders = productOrderMapper.selectList(new LambdaQueryWrapper<ProductOrder>()
+ .eq(ProductOrder::getBatchNo, product.getBatchNo()));
+ if (CollectionUtils.isEmpty(productOrders)) {
+ throw new RuntimeException("鎵瑰彿涓嶅瓨鍦�");
+ }
+ List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(new LambdaQueryWrapper<ProductWorkOrder>()
+ .eq(ProductWorkOrder::getProductOrderId, productOrders.get(0).getId()));
+ List<Long> ids = productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList());
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(new LambdaQueryWrapper<ProductionProductMain>()
+ .in(ProductionProductMain::getWorkOrderId, ids)
+ .orderByDesc(ProductionProductMain::getCreateTime));
+ List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(new LambdaQueryWrapper<ProductProcessRouteItem>()
+ .in(ProductProcessRouteItem::getId, productionProductMains.stream()
+ .map(ProductionProductMain::getProductProcessRouteItemId).collect(Collectors.toList()))
+ .eq(ProductProcessRouteItem::getProductModelId, product.getProductModelId())
+ .orderByDesc(ProductProcessRouteItem::getCreateTime));
+ if (CollectionUtils.isEmpty(productProcessRouteItems)) {
+ throw new RuntimeException("鐢熶骇鏁版嵁涓嶅瓨鍦�");
+ }
+ String productionDate = productProcessRouteItems.get(0).getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ if (productModel.getValidityPeriod() == null) {
+ throw new RuntimeException("鏈夋晥鏈熶笉鑳戒负绌�");
+ }
+ String expiryDate = productProcessRouteItems.get(0).getCreateTime().plusYears(productModel.getValidityPeriod().longValue()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ map.put("productionDate", productionDate);
+ map.put("expiryDate", expiryDate);
+ products.add(map);
+ }
+ Map<String, Object> data = new HashMap<>();
+ data.put("products", products);
+ data.put("amount", amount);
+ data.put("amountBig", NumberChineseFormatter.format(amount, true, false));
+ SalesLedger salesLedger = salesLedgerMapper.selectById(id);
+ data.put("customerName ", salesLedger.getCustomerName());
+ data.put("executionDate", salesLedger.getExecutionDate());
+ data.put("salesContractNo", salesLedger.getSalesContractNo());
+ Customer customer = customerMapper.selectById(salesLedger.getCustomerId());
+ data.put("companyPhone", customer.getCompanyPhone());
+ data.put("companyAddress", customer.getCompanyAddress());
+ data.put("salesman", salesLedger.getSalesman());
+
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/sale-outbound.docx");
+
+ LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
+
+ Configure config = Configure.builder()
+ .bind("products", policy).build();
+
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, config).render(data);
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "閿�鍞嚭搴撳崟", "UTF-8");
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ inputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+
+ }
}
diff --git a/src/main/resources/static/sale-outbound.docx b/src/main/resources/static/sale-outbound.docx
new file mode 100644
index 0000000..781a210
--- /dev/null
+++ b/src/main/resources/static/sale-outbound.docx
Binary files differ
--
Gitblit v1.9.3