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 | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 ff5e1c6..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
@@ -24,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;
@@ -81,6 +83,8 @@
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private AdminUserApi adminUserApi;
@@ -132,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;
}
@@ -192,7 +202,7 @@
.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(100).contractPrice(new BigDecimal("20.00")).remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
+ .count(new BigDecimal("100")).contractPrice(new BigDecimal("20.00")).remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
ExcelUtils.write(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓", CrmContractImportExcelVO.class, list);
}
@@ -201,7 +211,8 @@
@Operation(summary = "瀵煎叆鍚堝悓")
@PreAuthorize("@ss.hasPermission('crm:contract:import')")
public CommonResult<CrmContractImportRespVO> importContractExcel(@RequestParam("file") MultipartFile file) throws Exception {
- List<CrmContractImportExcelVO> list = ExcelUtils.read(file, CrmContractImportExcelVO.class);
+ // readFlat锛氭妸绾靛悜鍚堝苟鍗曞厓鏍硷紙鍚屼竴寮犲悎鍚岀殑澶氳鏄庣粏锛夋媺骞筹紝鍚﹀垯闄ら琛屽鐨勪富琛ㄥ瓧娈典細璇讳笉鍒�
+ List<CrmContractImportExcelVO> list = ExcelUtils.readFlat(file, CrmContractImportExcelVO.class);
return success(contractService.importContractList(list));
}
--
Gitblit v1.9.3