From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index d78cba5..183ce36 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -13,6 +13,8 @@
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportExcelVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
@@ -22,6 +24,8 @@
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
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.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
@@ -41,9 +45,11 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -77,6 +83,8 @@
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private AdminUserApi adminUserApi;
@@ -128,7 +136,13 @@
contractVO.setProducts(BeanUtils.toBean(businessProducts, CrmContractRespVO.Product.class, businessProductVO ->
MapUtils.findAndThen(itemMap, businessProductVO.getItemId(),
item -> businessProductVO.setItemCode(item.getCode())
- .setItemName(item.getName()).setItemBarCode(item.getBarCode()))));
+ .setItemName(item.getName()).setBarCode(item.getBarCode())
+ .setItemSpecification(item.getSpecification()))));
+ // 鎷兼帴璁￠噺鍗曚綅鍚嶇О
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(businessProducts, CrmContractProductDO::getItemUnitId));
+ contractVO.getProducts().forEach(product -> MapUtils.findAndThen(unitMap, product.getItemUnitId(),
+ unit -> product.setItemUnitName(unit.getName())));
return contractVO;
}
@@ -163,7 +177,8 @@
public void exportContractExcel(@Valid CrmContractPageReqVO exportReqVO,
HttpServletResponse response) throws IOException {
PageResult<CrmContractDO> pageResult = contractService.getContractPage(exportReqVO, getLoginUserId());
- List<CrmContractRespVO> list = BeanUtils.toBean(pageResult.getList(), CrmContractRespVO.class);
+ // 鎷兼帴瀹㈡埛銆佸晢鏈恒�佺绾︿汉銆佸洖娆鹃噾棰濈瓑鍏宠仈淇℃伅
+ List<CrmContractRespVO> list = buildContractDetailList(pageResult.getList());
// 璁＄畻鏈洖娆鹃噾棰濄�佽浆鎹㈠鎵圭姸鎬佷负涓枃
list.forEach(vo -> {
if (vo.getTotalPrice() != null && vo.getTotalReceivablePrice() != null) {
@@ -177,6 +192,30 @@
ExcelUtils.write(response, "鍚堝悓.xls", "鏁版嵁", CrmContractRespVO.class, list);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鍚堝悓妯℃澘")
+ @PreAuthorize("@ss.hasPermission('crm:contract:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<CrmContractImportExcelVO> list = Collections.singletonList(
+ CrmContractImportExcelVO.builder()
+ .no("HT20260101000001").name("绀轰緥鍚堝悓").customerName("绀轰緥瀹㈡埛")
+ .orderDate("2026-01-01 10:00:00").startTime("2026-01-01").endTime("2026-12-31")
+ .discountPercent(new BigDecimal("0")).depositPrice(new BigDecimal("0"))
+ .productCode("ITEM001").productName("绀轰緥浜у搧A")
+ .count(new BigDecimal("100")).contractPrice(new BigDecimal("20.00")).remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
+ .build());
+ ExcelUtils.write(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓", CrmContractImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鍚堝悓")
+ @PreAuthorize("@ss.hasPermission('crm:contract:import')")
+ public CommonResult<CrmContractImportRespVO> importContractExcel(@RequestParam("file") MultipartFile file) throws Exception {
+ // readFlat锛氭妸绾靛悜鍚堝苟鍗曞厓鏍硷紙鍚屼竴寮犲悎鍚岀殑澶氳鏄庣粏锛夋媺骞筹紝鍚﹀垯闄ら琛屽鐨勪富琛ㄥ瓧娈典細璇讳笉鍒�
+ List<CrmContractImportExcelVO> list = ExcelUtils.readFlat(file, CrmContractImportExcelVO.class);
+ return success(contractService.importContractList(list));
+ }
+
@PutMapping("/transfer")
@Operation(summary = "鍚堝悓杞Щ")
@PreAuthorize("@ss.hasPermission('crm:contract:update')")
--
Gitblit v1.9.3