From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税,供应商合同补供应商名称与附件

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java |  237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 230 insertions(+), 7 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 8809791..bc3620d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -2,9 +2,12 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
@@ -14,6 +17,8 @@
 import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
@@ -26,8 +31,13 @@
 import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
 import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
 import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
 import cn.iocoder.yudao.module.mes.api.arrivalnotice.MesArrivalNoticeApi;
 import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -37,12 +47,16 @@
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.erp.enums.LogRecordConstants.*;
 
 /**
  * ERP 閲囪喘璁㈠崟 Service 瀹炵幇绫�
@@ -67,6 +81,8 @@
     private ErpPurchaseOrderMapper purchaseOrderMapper;
     @Resource
     private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+    @Resource
+    private ErpSupplierContractService supplierContractService;
 
     @Resource
     private ErpNoRedisDAO noRedisDAO;
@@ -95,6 +111,11 @@
     @Resource
     private StorageAttachmentApi storageAttachmentApi;
 
+    @Resource
+    private SrmSupplierApi srmSupplierApi;
+    @Resource
+    private MdmItemApi mdmItemApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createPurchaseOrder(ErpPurchaseOrderSaveReqVO createReqVO) {
@@ -106,6 +127,8 @@
         if (createReqVO.getAccountId() != null) {
             accountService.validateAccount(createReqVO.getAccountId());
         }
+        // 1.3.1 鏍¢獙骞惰В鏋愬叧鑱斿悎鍚岋紙璁㈠崟蹇呴』涓庡悎鍚屽睘浜庡悓涓�渚涘簲鍟嗭級
+        String contractNo = resolveContractNo(createReqVO.getContractId(), createReqVO.getSupplierId());
         // 1.4 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
         String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
         if (purchaseOrderMapper.selectByNo(no) != null) {
@@ -115,7 +138,8 @@
         // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曞垱寤哄悗涓烘湭瀹℃牳鐘舵�侊紝闇�瑕佹彁浜ゅ鎵癸級
         ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
                 .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
-                .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
+                .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus())
+                .setContractNo(contractNo));
         calculateTotalPrice(purchaseOrder, purchaseOrderItems);
         purchaseOrderMapper.insert(purchaseOrder);
         // 2.2 鎻掑叆璁㈠崟椤�
@@ -148,9 +172,12 @@
         }
         // 1.4 鏍¢獙璁㈠崟椤圭殑鏈夋晥鎬�
         List<ErpPurchaseOrderItemDO> purchaseOrderItems = validatePurchaseOrderItems(updateReqVO.getItems());
+        // 1.5 鏍¢獙骞惰В鏋愬叧鑱斿悎鍚�
+        String contractNo = resolveContractNo(updateReqVO.getContractId(), updateReqVO.getSupplierId());
 
         // 2.1 鏇存柊璁㈠崟
         ErpPurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseOrderDO.class);
+        updateObj.setContractNo(contractNo);
         calculateTotalPrice(updateObj, purchaseOrderItems);
         purchaseOrderMapper.updateById(updateObj);
         // 2.2 鏇存柊璁㈠崟椤�
@@ -159,11 +186,183 @@
         storageAttachmentApi.updateAttachments("file", "erp_purchase_order", updateReqVO.getId(), updateReqVO.getBlobIds());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @LogRecord(type = ERP_PURCHASE_ORDER_TYPE, subType = ERP_PURCHASE_ORDER_IMPORT_SUB_TYPE, bizNo = "0",
+            success = ERP_PURCHASE_ORDER_IMPORT_SUCCESS)
+    public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importList,
+                                                               Boolean directApprove) {
+        ErpPurchaseOrderImportRespVO respVO = ErpPurchaseOrderImportRespVO.builder()
+                .createList(new ArrayList<>())
+                .updateList(new ArrayList<>())
+                .failureList(new LinkedHashMap<>())
+                .build();
+        if (CollUtil.isEmpty(importList)) {
+            // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+            OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
+            return respVO;
+        }
+
+        // 1. 棰勭儹鈥滀緵搴斿晢鍚嶇О/缂栫爜 -> 渚涘簲鍟嗙紪鍙封�濇槧灏勶紙ERP 渚涘簲鍟嗕富鏁版嵁鍦� SRM 妯″潡锛�
+        Map<String, Long> supplierIdMap = new HashMap<>();
+        CommonResult<List<SrmSupplierRespDTO>> supplierResult = srmSupplierApi.getSupplierSimpleList();
+        if (supplierResult != null && CollUtil.isNotEmpty(supplierResult.getData())) {
+            supplierResult.getData().forEach(supplier -> {
+                if (StrUtil.isNotBlank(supplier.getName())) {
+                    supplierIdMap.put(supplier.getName().trim(), supplier.getId());
+                }
+                if (StrUtil.isNotBlank(supplier.getCode())) {
+                    supplierIdMap.putIfAbsent(supplier.getCode().trim(), supplier.getId());
+                }
+            });
+        }
+
+        // 2. 鎸夆�滈噰璐崟缂栧彿鈥濆垎缁勶細鍚岀紪鍙峰琛� = 涓�寮犺鍗曠殑澶氭潯鏄庣粏锛涚紪鍙蜂负绌哄垯姣忚鐙珛鎴愬崟
+        Map<String, List<ErpPurchaseOrderImportExcelVO>> orderGroups = new LinkedHashMap<>();
+        for (int i = 0; i < importList.size(); i++) {
+            ErpPurchaseOrderImportExcelVO row = importList.get(i);
+            if (row == null || (StrUtil.isBlank(row.getSupplierName()) && StrUtil.isBlank(row.getProductCode())
+                    && StrUtil.isBlank(row.getNo()))) {
+                continue; // 璺宠繃绌鸿
+            }
+            String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
+            orderGroups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
+        }
+
+        // 3. 閫愪釜璁㈠崟瀵煎叆锛堝崟寮犺鍗曞け璐ヤ笉褰卞搷鍏跺畠锛�
+        for (Map.Entry<String, List<ErpPurchaseOrderImportExcelVO>> entry : orderGroups.entrySet()) {
+            List<ErpPurchaseOrderImportExcelVO> rows = entry.getValue();
+            String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
+                    : "绗� " + entry.getKey().substring("__row_".length()) + " 琛�";
+            try {
+                ErpPurchaseOrderDO purchaseOrder = createPurchaseOrderByImport(rows, supplierIdMap, directApprove);
+                respVO.getCreateList().add(purchaseOrder.getNo());
+            } catch (Exception ex) {
+                respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
+            }
+        }
+        // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+        OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
+        return respVO;
+    }
+
+    /**
+     * 渚濇嵁瀵煎叆鏁版嵁鍒涘缓涓�寮犻噰璐鍗曪紙鍚槑缁嗭級銆�
+     *
+     * 娉ㄦ剰锛氭澶勪笉璋冪敤 submitPurchaseOrder锛屽洜姝や笉浼氬垱寤� BPM 宸ヤ綔娴侊紱璁㈠崟鐘舵�佺敱 directApprove 鐩存帴鍐冲畾锛�
+     * 鍕鹃�夆�滄槸鍚﹀鏍糕�� => 宸插鏍�(20)锛屾湭鍕鹃�� => 鏈鏍�(10)銆�
+     */
+    private ErpPurchaseOrderDO createPurchaseOrderByImport(List<ErpPurchaseOrderImportExcelVO> rows,
+                                                           Map<String, Long> supplierIdMap, Boolean directApprove) {
+        // 1. 渚涘簲鍟嗭紙鍙栬缁勯琛岋級
+        ErpPurchaseOrderImportExcelVO head = rows.get(0);
+        if (StrUtil.isBlank(head.getSupplierName())) {
+            throw new IllegalArgumentException("渚涘簲鍟嗗悕绉颁笉鑳戒负绌�");
+        }
+        Long supplierId = supplierIdMap.get(head.getSupplierName().trim());
+        if (supplierId == null) {
+            throw new IllegalArgumentException("渚涘簲鍟嗕笉瀛樺湪锛�" + head.getSupplierName());
+        }
+        supplierService.validateSupplier(supplierId);
+
+        // 2. 鏄庣粏
+        List<ErpPurchaseOrderSaveReqVO.Item> items = new ArrayList<>();
+        for (ErpPurchaseOrderImportExcelVO row : rows) {
+            if (StrUtil.isBlank(row.getProductCode())) {
+                throw new IllegalArgumentException("浜у搧缂栫爜涓嶈兘涓虹┖");
+            }
+            CommonResult<MdmItemRespDTO> itemResult = mdmItemApi.getItemByCode(row.getProductCode().trim());
+            MdmItemRespDTO item = itemResult == null ? null : itemResult.getData();
+            if (item == null) {
+                throw new IllegalArgumentException("浜у搧涓嶅瓨鍦細" + row.getProductCode());
+            }
+            if (row.getCount() == null) {
+                throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鐨勬暟閲忎笉鑳戒负绌�");
+            }
+            if (item.getUnitMeasureId() == null) {
+                throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鏈厤缃閲忓崟浣嶏紝璇峰厛鍦ㄧ墿鏂欎腑缁存姢");
+            }
+            ErpPurchaseOrderSaveReqVO.Item itemVO = new ErpPurchaseOrderSaveReqVO.Item();
+            itemVO.setProductId(item.getId());
+            itemVO.setProductUnitId(item.getUnitMeasureId());
+            itemVO.setProductPrice(row.getProductPrice() == null ? BigDecimal.ZERO : row.getProductPrice());
+            itemVO.setCount(row.getCount());
+            itemVO.setTaxPercent(row.getTaxPercent());
+            itemVO.setRemark(row.getRemark());
+            itemVO.setQcCheckFlag("鏄�".equals(StrUtil.trim(row.getQcCheckFlag())));
+            items.add(itemVO);
+        }
+
+        // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
+        String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
+                : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
+        if (purchaseOrderMapper.selectByNo(no) != null) {
+            throw new IllegalArgumentException("閲囪喘鍗曠紪鍙峰凡瀛樺湪锛�" + no);
+        }
+
+        // 4. 缁勮涓昏〃锛氬嬀閫夆�滄槸鍚﹀鏍糕�� => 宸插鏍�(20)锛屽惁鍒欐湭瀹℃牳(10)
+        ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
+        purchaseOrder.setNo(no);
+        purchaseOrder.setSupplierId(supplierId);
+        purchaseOrder.setOrderTime(parseImportOrderTime(head.getOrderTime()));
+        purchaseOrder.setRemark(head.getRemark());
+        purchaseOrder.setStatus(Boolean.TRUE.equals(directApprove)
+                ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
+        purchaseOrder.setDepositPrice(BigDecimal.ZERO); // deposit_price 涓� NOT NULL 涓旀棤榛樿鍊硷紝蹇呴』鏄惧紡璧嬪��
+        purchaseOrder.setInCount(BigDecimal.ZERO);
+        purchaseOrder.setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus());
+
+        List<ErpPurchaseOrderItemDO> itemDOs = validatePurchaseOrderItems(items);
+        calculateTotalPrice(purchaseOrder, itemDOs);
+        purchaseOrderMapper.insert(purchaseOrder);
+        itemDOs.forEach(item -> item.setOrderId(purchaseOrder.getId()));
+        purchaseOrderItemMapper.insertBatch(itemDOs);
+        return purchaseOrder;
+    }
+
+    /**
+     * 瑙f瀽瀵煎叆鐨勯噰璐椂闂达紝鍏煎澶氱甯歌鏍煎紡锛涗负绌哄彇褰撳墠鏃堕棿
+     */
+    private LocalDateTime parseImportOrderTime(String text) {
+        if (StrUtil.isBlank(text)) {
+            return LocalDateTime.now();
+        }
+        String value = text.trim();
+        for (String pattern : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd HH:mm:ss"}) {
+            try {
+                return LocalDateTime.parse(value, DateTimeFormatter.ofPattern(pattern));
+            } catch (Exception ignored) {
+                // 缁х画灏濊瘯涓嬩竴涓牸寮�
+            }
+        }
+        for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
+            try {
+                return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern)).atStartOfDay();
+            } catch (Exception ignored) {
+                // 缁х画灏濊瘯涓嬩竴涓牸寮�
+            }
+        }
+        throw new IllegalArgumentException("閲囪喘鏃堕棿鏍煎紡涓嶆纭細" + text + "锛岀ず渚� 2026-01-01 10:00:00");
+    }
+
+    /**
+     * 鎻愬彇瀵煎叆澶辫触鍘熷洜锛圫erviceException 鍙栦笟鍔℃彁绀猴級
+     */
+    private String resolveImportErrorMessage(Exception ex) {
+        if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
+            return serviceException.getMessage();
+        }
+        return StrUtil.blankToDefault(ex.getMessage(), "瀵煎叆澶辫触");
+    }
+
     private void calculateTotalPrice(ErpPurchaseOrderDO purchaseOrder, List<ErpPurchaseOrderItemDO> purchaseOrderItems) {
         purchaseOrder.setTotalCount(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getCount, BigDecimal::add));
-        purchaseOrder.setTotalProductPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
-        purchaseOrder.setTotalTaxPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
-        purchaseOrder.setTotalPrice(purchaseOrder.getTotalProductPrice().add(purchaseOrder.getTotalTaxPrice()));
+        // 鏄庣粏鐨� totalPrice 鏄�屾暟閲� 脳 鍚◣鍗曚环銆嶏紝鍗冲惈绋庢�讳环锛涗笉鍚◣閲戦 = 鍚◣鎬讳环 鈭� 绋庨
+        BigDecimal totalPriceWithTax = getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO);
+        BigDecimal totalTaxPrice = getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO);
+        purchaseOrder.setTotalTaxPrice(totalTaxPrice);
+        purchaseOrder.setTotalPrice(totalPriceWithTax);
+        purchaseOrder.setTotalProductPrice(totalPriceWithTax.subtract(totalTaxPrice));
         // 璁$畻浼樻儬浠锋牸
         if (purchaseOrder.getDiscountPercent() == null) {
             purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
@@ -211,6 +410,16 @@
         }
 
         // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+        // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+        if (processInstanceApi.isGlobalAutoApprove()) {
+            purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
+                    .setId(id)
+                    .setStatus(ErpAuditStatus.APPROVING.getStatus())
+                    .setProcessInstanceId(""));
+            updatePurchaseOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+            return;
+        }
+
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO()
                         .setProcessDefinitionKey(processDefinitionKey)
@@ -307,13 +516,12 @@
     private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
         // 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
         return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
+            // 浜у搧鍗曚环涓哄惈绋庡崟浠凤細琛屾�讳环 = 鏁伴噺 脳 鍚◣鍗曚环锛岀◣棰濆啀浠庡惈绋庢�讳环閲屽�掔畻
             item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
             if (item.getTotalPrice() == null) {
                 return;
             }
-            if (item.getTaxPercent() != null) {
-                item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
-            }
+            item.setTaxPrice(MoneyUtils.priceCalculateTaxIncluded(item.getTotalPrice(), item.getTaxPercent()));
         }));
     }
 
@@ -401,6 +609,21 @@
         });
     }
 
+    /**
+     * 鏍¢獙鍏宠仈鍚堝悓锛岃繑鍥炲啑浣欑殑鍚堝悓缂栫爜锛涙湭鍏宠仈鍚堝悓鏃惰繑鍥� null
+     */
+    private String resolveContractNo(Long contractId, Long supplierId) {
+        if (contractId == null) {
+            return null;
+        }
+        cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierContractDO contract =
+                supplierContractService.validateContractExists(contractId);
+        if (!Objects.equals(contract.getSupplierId(), supplierId)) {
+            throw exception(SUPPLIER_CONTRACT_SUPPLIER_MISMATCH);
+        }
+        return contract.getCode();
+    }
+
     private ErpPurchaseOrderDO validatePurchaseOrderExists(Long id) {
         ErpPurchaseOrderDO purchaseOrder = purchaseOrderMapper.selectById(id);
         if (purchaseOrder == null) {

--
Gitblit v1.9.3