From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
index 0853b68..f4efd0f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
@@ -15,9 +15,17 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import cn.iocoder.yudao.module.mes.service.wm.document.MesWmDocumentRenderer;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,11 +37,16 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_SALES_NOT_EXISTS;
@Tag(name = "绠＄悊鍚庡彴 - MES 閿�鍞嚭搴撳崟")
@RestController
@@ -44,9 +57,17 @@
@Resource
private MesWmProductSalesService productSalesService;
@Resource
+ private MesWmProductSalesLineService productSalesLineService;
+ @Resource
private CrmCustomerApi crmCustomerApi;
@Resource
private MesWmSalesNoticeService salesNoticeService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞嚭搴撳崟")
@@ -103,6 +124,83 @@
buildRespVOList(pageResult.getList()));
}
+ @GetMapping("/export-word")
+ @Operation(summary = "瀵煎嚭鎴愬搧鍑哄簱鍗� Word锛堝甫鐢靛瓙绔狅紝鍙墜濉瀛楀悗褰掓。锛�")
+ @Parameter(name = "id", description = "閿�鍞嚭搴撳崟缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportProductSalesWord(@RequestParam("id") Long id,
+ HttpServletResponse response) throws IOException {
+ MesWmProductSalesDO sales = productSalesService.getProductSales(id);
+ if (sales == null) {
+ throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
+ }
+ List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(id);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(lines, MesWmProductSalesLineDO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi
+ .getUnitMeasureList(convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId))
+ .getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+
+ Map<String, String> fields = new LinkedHashMap<>();
+ fields.put("clientName", resolveClientName(sales.getClientId()));
+ fields.put("code", sales.getCode());
+ fields.put("salesDate", sales.getSalesDate() == null ? null
+ : sales.getSalesDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ fields.put("saleOrderCode", sales.getSalesOrderCode());
+ fields.put("noticeCode", resolveNoticeCode(sales.getNoticeId()));
+ fields.put("contactName", sales.getContactName());
+ fields.put("contactTelephone", sales.getContactTelephone());
+ fields.put("contactAddress", sales.getContactAddress());
+ fields.put("carrier", sales.getCarrier());
+ fields.put("shippingNumber", sales.getShippingNumber());
+ fields.put("remark", sales.getRemark());
+
+ List<Map<String, String>> items = new ArrayList<>();
+ for (MesWmProductSalesLineDO line : lines) {
+ MdmItemRespDTO item = itemMap.get(line.getItemId());
+ Map<String, String> row = new LinkedHashMap<>();
+ row.put("itemName", item != null ? item.getName() : null);
+ row.put("itemSpecification", item != null ? item.getSpecification() : null);
+ MdmUnitMeasureRespDTO unit = item != null ? unitMap.get(item.getUnitMeasureId()) : null;
+ row.put("unitName", unit != null ? unit.getName() : null);
+ row.put("quantity", line.getQuantity() == null ? null : line.getQuantity().toPlainString());
+ row.put("price", line.getPrice() == null ? null : line.getPrice().toPlainString());
+ row.put("amount", line.getTotalPrice() == null ? null : line.getTotalPrice().toPlainString());
+ row.put("batchCode", line.getBatchCode());
+ items.add(row);
+ }
+
+ var companyConfig = companyConfigService.getCompanyConfig();
+ byte[] content = MesWmDocumentRenderer.renderProductOutbound(fields, items,
+ companyConfig != null ? companyConfig.getCompanyName() : null);
+ writeWord(response, "鎴愬搧鍑哄簱鍗�-" + sales.getCode() + ".docx", content);
+ }
+
+ private String resolveClientName(Long clientId) {
+ if (clientId == null) {
+ return null;
+ }
+ CrmCustomerRespDTO customer = crmCustomerApi.getCustomer(clientId);
+ return customer != null ? customer.getName() : null;
+ }
+
+ private String resolveNoticeCode(Long noticeId) {
+ if (noticeId == null) {
+ return null;
+ }
+ MesWmSalesNoticeDO notice = salesNoticeService.getSalesNotice(noticeId);
+ return notice != null ? notice.getCode() : null;
+ }
+
+ private static void writeWord(HttpServletResponse response, String filename, byte[] content) throws IOException {
+ String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
+ response.getOutputStream().write(content);
+ }
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦閿�鍞嚭搴撳崟")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3