From 25a40b9c4e6a1b650610b8b13088d486699532ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:21 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复校验;修复考勤异常申请字段不匹配

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java |  429 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 418 insertions(+), 11 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 55262fc..c2ab475 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,6 +2,8 @@
 
 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;
@@ -14,10 +16,14 @@
 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.ErpPurchaseOrderImportDuplicateVO;
+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;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInvoiceOrderMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
@@ -26,7 +32,12 @@
 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 jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -36,16 +47,21 @@
 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 java.util.stream.Collectors;
 
 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.*;
 
 /**
  * ERP 閲囪喘璁㈠崟 Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
@@ -55,12 +71,18 @@
     /**
      * BPM 閲囪喘璁㈠崟瀹℃壒鍒嗙被缂栫爜
      */
-    private static final String PURCHASE_ORDER_APPROVE_CATEGORY_CODE = "purchase_request_approve";
+    private static final String PURCHASE_ORDER_APPROVE_CATEGORY_CODE = "purchase_order_approve";
+    /**
+     * BPM 閲囪喘璁㈠崟瀹℃壒娴佺▼瀹氫箟 Key锛堝垱寤鸿鍗曞悗鑷姩鎻愪氦鍒板崗鍚屽姙鍏鎵癸級
+     */
+    private static final String PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY = "purchase_order_approve";
 
     @Resource
     private ErpPurchaseOrderMapper purchaseOrderMapper;
     @Resource
     private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+    @Resource
+    private ErpPurchaseInvoiceOrderMapper invoiceOrderMapper;
 
     @Resource
     private ErpNoRedisDAO noRedisDAO;
@@ -86,6 +108,14 @@
     @Resource
     private ErpPurchaseRequestMapper purchaseRequestMapper;
 
+    @Resource
+    private StorageAttachmentApi storageAttachmentApi;
+
+    @Resource
+    private SrmSupplierApi srmSupplierApi;
+    @Resource
+    private MdmItemApi mdmItemApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createPurchaseOrder(ErpPurchaseOrderSaveReqVO createReqVO) {
@@ -97,8 +127,10 @@
         if (createReqVO.getAccountId() != null) {
             accountService.validateAccount(createReqVO.getAccountId());
         }
-        // 1.4 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
-        String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
+        // 1.4 纭畾璁㈠崟鍙凤紙鍓嶇濉啓鍒欑敤鑷畾涔夊崟鍙凤紝鐣欑┖鍒欒嚜鍔ㄧ敓鎴愶級锛屽苟鏍¢獙鍞竴鎬�
+        String customNo = StrUtil.trim(createReqVO.getNo());
+        String no = StrUtil.isNotBlank(customNo) ? customNo
+                : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
         if (purchaseOrderMapper.selectByNo(no) != null) {
             throw exception(PURCHASE_ORDER_NO_EXISTS);
         }
@@ -112,6 +144,13 @@
         // 2.2 鎻掑叆璁㈠崟椤�
         purchaseOrderItems.forEach(o -> o.setOrderId(purchaseOrder.getId()));
         purchaseOrderItemMapper.insertBatch(purchaseOrderItems);
+        // 2.3 缁戝畾闄勪欢
+        storageAttachmentApi.bindAttachments("file", "erp_purchase_order",
+                purchaseOrder.getId(), createReqVO.getBlobIds());
+
+        // 3. 鍒涘缓鍚庤嚜鍔ㄦ彁浜ゅ鎵瑰埌鍗忓悓鍔炲叕锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛屼笉鍦ㄦ湰椤甸潰瀹℃壒锛�
+        submitPurchaseOrder(purchaseOrder.getId(), PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY, getLoginUserId());
+
         return purchaseOrder.getId();
     }
 
@@ -139,6 +178,339 @@
         purchaseOrderMapper.updateById(updateObj);
         // 2.2 鏇存柊璁㈠崟椤�
         updatePurchaseOrderItemList(updateReqVO.getId(), purchaseOrderItems);
+        // 2.3 鏇存柊闄勪欢
+        storageAttachmentApi.updateAttachments("file", "erp_purchase_order", updateReqVO.getId(), updateReqVO.getBlobIds());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importList,
+                                                               Boolean directApprove, Boolean overwrite) {
+        ErpPurchaseOrderImportRespVO respVO = ErpPurchaseOrderImportRespVO.builder()
+                .createList(new ArrayList<>())
+                .updateList(new ArrayList<>())
+                .failureList(new LinkedHashMap<>())
+                .duplicateList(new ArrayList<>())
+                .build();
+        if (CollUtil.isEmpty(importList)) {
+            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. 棰勭儹绯荤粺鍐呮湁鏁堥噰璐鍗曪細鎸夊崟鍙枫�佹寜鈥滀緵搴斿晢 + 鏄庣粏鈥濇寚绾瑰缓绱㈠紩锛岀敤浜庤瘑鍒噸澶嶅鍏�
+        List<ErpPurchaseOrderDO> existingOrders = purchaseOrderMapper.selectList();
+        Map<Long, List<ErpPurchaseOrderItemDO>> existingItemsMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(existingOrders)) {
+            purchaseOrderItemMapper.selectListByOrderIds(
+                            existingOrders.stream().map(ErpPurchaseOrderDO::getId).toList())
+                    .forEach(item -> existingItemsMap.computeIfAbsent(item.getOrderId(), k -> new ArrayList<>()).add(item));
+        }
+        Map<String, ErpPurchaseOrderDO> existingNoMap = new HashMap<>();
+        Map<String, List<ErpPurchaseOrderDO>> existingFingerprintMap = new HashMap<>();
+        for (ErpPurchaseOrderDO order : existingOrders) {
+            if (StrUtil.isNotBlank(order.getNo())) {
+                existingNoMap.put(order.getNo(), order);
+            }
+            String fingerprint = buildOrderFingerprint(order.getSupplierId(), existingItemsMap.get(order.getId()));
+            if (fingerprint != null) {
+                existingFingerprintMap.computeIfAbsent(fingerprint, k -> new ArrayList<>()).add(order);
+            }
+        }
+
+        // 3. 鎸夆�滈噰璐崟缂栧彿鈥濆垎缁勶細鍚岀紪鍙峰琛� = 涓�寮犺鍗曠殑澶氭潯鏄庣粏锛涚紪鍙蜂负绌哄垯姣忚鐙珛鎴愬崟
+        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);
+        }
+
+        // 4. 閫愪釜璁㈠崟瀵煎叆锛堝崟寮犺鍗曞け璐ヤ笉褰卞搷鍏跺畠锛�
+        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 {
+                ImportOrderData importData = prepareImportOrder(rows, supplierIdMap);
+
+                // 4.1 鍏堟寜鍗曞彿鎵撅紱鍙湁鈥滃崟鍙蜂负绌恒�佺敱绯荤粺鐢熸垚缂栧彿鈥濈殑琛屾墠鎸夆�滀緵搴斿晢 + 瀹屾暣鏄庣粏鈥濇寚绾规壘銆�
+                //     鏂囦欢閲屽啓浜嗘槑纭崟鍙风殑锛岃涓虹敤鎴锋槑纭鏂板璇ュ崟鍙凤紝鎸囩汗鐩稿悓涔熶笉鎷︽埅锛岄伩鍏嶆甯哥殑閲嶅閲囪喘琚鍒ゃ��
+                ErpPurchaseOrderDO existing = importData.order.getNo() == null ? null
+                        : existingNoMap.get(importData.order.getNo());
+                String duplicateReason = existing != null ? "閲囪喘鍗曠紪鍙峰凡瀛樺湪" : null;
+                boolean matchedByFingerprint = false;
+                List<ErpPurchaseOrderDO> fingerprintCandidates = null;
+                if (existing == null && importData.generatedNo && importData.fingerprint != null) {
+                    fingerprintCandidates = existingFingerprintMap.get(importData.fingerprint);
+                    if (CollUtil.isNotEmpty(fingerprintCandidates)) {
+                        existing = fingerprintCandidates.get(0);
+                        matchedByFingerprint = true;
+                        duplicateReason = "渚涘簲鍟嗐�佹槑缁嗐�佹暟閲忋�佸崟浠枫�侀噾棰濅笌宸叉湁璁㈠崟涓�鑷�";
+                    }
+                }
+
+                // 4.2 鍙戠幇閲嶅锛氶粯璁や笉瀵煎叆锛岃繑鍥炵粰鍓嶇寮规鎻愮ず锛涘嬀閫夎鐩栧悗鎵嶆洿鏂板凡鏈夎鍗�
+                if (existing != null) {
+                    if (!Boolean.TRUE.equals(overwrite)) {
+                        respVO.getDuplicateList().add(buildImportDuplicate(label, existing, duplicateReason));
+                        continue;
+                    }
+                    if (matchedByFingerprint && fingerprintCandidates.size() > 1) {
+                        String nos = fingerprintCandidates.stream().map(ErpPurchaseOrderDO::getNo)
+                                .collect(Collectors.joining("銆�"));
+                        throw new IllegalArgumentException("鎵惧埌澶氬紶鐩稿悓璁㈠崟锛�" + nos
+                                + "锛夛紝鏃犳硶鑷姩瑕嗙洊锛岃鍏堜繚鐣欎竴寮犲悗鍐嶅鍏�");
+                    }
+                    updatePurchaseOrderByImport(existing, importData, directApprove);
+                    respVO.getUpdateList().add(existing.getNo());
+                    continue;
+                }
+
+                // 4.3 娌℃湁閲嶅锛屾甯告柊澧�
+                createPurchaseOrderByImport(importData, directApprove);
+                respVO.getCreateList().add(importData.order.getNo());
+            } catch (Exception ex) {
+                respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
+            }
+        }
+        return respVO;
+    }
+
+    /**
+     * 鏍¢獙骞剁粍瑁呬竴寮犲鍏ヨ鍗曪紙涓嶈惤搴擄級銆�
+     */
+    private ImportOrderData prepareImportOrder(List<ErpPurchaseOrderImportExcelVO> rows,
+                                               Map<String, Long> supplierIdMap) {
+        // 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. 鍗曞彿锛氬~浜嗗氨鐢紱鐣欑┖鏃跺厛涓嶇敓鎴愶紝绛夌‘璁よ鏂板鏃跺啀鐢熸垚锛岄伩鍏嶉噸澶嶈琚烦杩囦篃娑堣�楁祦姘村彿
+        boolean generatedNo = StrUtil.isBlank(head.getNo());
+
+        // 4. 缁勮涓昏〃锛堢姸鎬佺敱璋冪敤鏂瑰喅瀹氾級
+        ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
+        purchaseOrder.setNo(generatedNo ? null : head.getNo().trim());
+        purchaseOrder.setSupplierId(supplierId);
+        purchaseOrder.setOrderTime(parseImportOrderTime(head.getOrderTime()));
+        purchaseOrder.setRemark(head.getRemark());
+        purchaseOrder.setDepositPrice(BigDecimal.ZERO); // deposit_price 涓� NOT NULL 涓旀棤榛樿鍊硷紝蹇呴』鏄惧紡璧嬪��
+
+        List<ErpPurchaseOrderItemDO> itemDOs = validatePurchaseOrderItems(items);
+        calculateTotalPrice(purchaseOrder, itemDOs);
+        return new ImportOrderData(purchaseOrder, itemDOs,
+                buildOrderFingerprint(supplierId, itemDOs), generatedNo,
+                StrUtil.isNotBlank(head.getOrderTime()));
+    }
+
+    /**
+     * 鏂板瀵煎叆璁㈠崟锛堝惈鏄庣粏锛夈��
+     */
+    private void createPurchaseOrderByImport(ImportOrderData importData, Boolean directApprove) {
+        ErpPurchaseOrderDO purchaseOrder = importData.order;
+        if (StrUtil.isBlank(purchaseOrder.getNo())) {
+            purchaseOrder.setNo(noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX));
+        }
+        purchaseOrder.setStatus(Boolean.TRUE.equals(directApprove)
+                ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
+        purchaseOrder.setInCount(BigDecimal.ZERO);
+        purchaseOrder.setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus());
+        purchaseOrderMapper.insert(purchaseOrder);
+        importData.items.forEach(item -> item.setOrderId(purchaseOrder.getId()));
+        purchaseOrderItemMapper.insertBatch(importData.items);
+    }
+
+    /**
+     * 瑕嗙洊宸叉湁瀵煎叆璁㈠崟锛堝惈鏄庣粏锛夈��
+     */
+    private void updatePurchaseOrderByImport(ErpPurchaseOrderDO existing, ImportOrderData importData,
+                                             Boolean directApprove) {
+        // 1. 鏈変笅娓稿崟鎹殑璁㈠崟涓嶅厑璁歌鐩栵紝閬垮厤鎶婂凡鍏ュ簱/宸插紑绁ㄧ殑鏁版嵁鏀规帀
+        if (existing.getInCount() != null && existing.getInCount().compareTo(BigDecimal.ZERO) > 0) {
+            throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo() + "]宸插叆搴擄紙宸插叆搴撴暟閲� "
+                    + normalizeNumber(existing.getInCount()) + "锛夛紝涓嶈兘瑕嗙洊锛涜鍏堝垹闄ゅ搴斿叆搴撹褰曞悗鍐嶅鍏�");
+        }
+        if (existing.getReturnCount() != null && existing.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+            throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo() + "]宸查��璐э紙宸查��璐ф暟閲� "
+                    + normalizeNumber(existing.getReturnCount()) + "锛夛紝涓嶈兘瑕嗙洊锛涜鍏堝垹闄ゅ搴旈��璐ц褰曞悗鍐嶅鍏�");
+        }
+        if (CollUtil.isNotEmpty(invoiceOrderMapper.selectListByPurchaseOrderId(existing.getId()))) {
+            throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+                    + "]宸插叧鑱斿彂绁紝涓嶈兘瑕嗙洊锛涜鍏堣В闄ゅ彂绁ㄥ叧鑱斿悗鍐嶅鍏�");
+        }
+        if (StrUtil.isNotBlank(existing.getProcessInstanceId())) {
+            throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+                    + "]宸叉彁浜ゅ鎵规祦绋嬶紝涓嶈兘瑕嗙洊锛涜鍏堝湪鍗忓悓鍔炲叕鎾ゅ洖鎴栦綔搴熻瀹℃壒鍚庡啀瀵煎叆");
+        }
+        List<ErpPurchaseOrderItemDO> oldItems = purchaseOrderItemMapper.selectListByOrderId(existing.getId());
+        boolean linkedRequest = oldItems.stream().anyMatch(item -> item.getRequestItemId() != null);
+        if (linkedRequest) {
+            throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+                    + "]宸插叧鑱旈噰璐敵璇凤紝涓嶈兘瑕嗙洊锛涜鍏堝湪閲囪喘鐢宠涓挙閿�鎴栧垹闄ゅ搴旂敵璇峰悗鍐嶅鍏�");
+        }
+
+        // 2. 鏇存柊涓昏〃锛堜繚鐣欏師鍗曞彿銆佸師鍏ュ簱鐘舵�侊級
+        ErpPurchaseOrderDO updateObj = importData.order;
+        updateObj.setId(existing.getId());
+        updateObj.setNo(existing.getNo());
+        // 鏂囦欢娌″~閲囪喘鏃堕棿鏃朵繚鐣欏師璁㈠崟鏃堕棿锛岄伩鍏嶈鐩栨椂鎶婃棩鏈熸敼鎴愬綋鍓嶆椂闂�
+        if (!importData.orderTimeProvided) {
+            updateObj.setOrderTime(existing.getOrderTime());
+        }
+        updateObj.setStatus(Boolean.TRUE.equals(directApprove)
+                ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
+        updateObj.setInCount(existing.getInCount() == null ? BigDecimal.ZERO : existing.getInCount());
+        updateObj.setInStatus(existing.getInStatus());
+        purchaseOrderMapper.updateById(updateObj);
+
+        // 3. 鏄庣粏鏁寸粍鏇挎崲
+        purchaseOrderItemMapper.deleteByOrderId(existing.getId());
+        importData.items.forEach(item -> item.setOrderId(existing.getId()));
+        purchaseOrderItemMapper.insertBatch(importData.items);
+    }
+
+    private ErpPurchaseOrderImportDuplicateVO buildImportDuplicate(String label, ErpPurchaseOrderDO existing,
+                                                                   String reason) {
+        return ErpPurchaseOrderImportDuplicateVO.builder()
+                .key(label)
+                .existingNo(existing.getNo())
+                .existingId(existing.getId())
+                .reason(reason)
+                .build();
+    }
+
+    /**
+     * 鐢熸垚鈥滀緵搴斿晢 + 瀹屾暣鏄庣粏鈥濈殑璁㈠崟鎸囩汗锛岀敤浜庤瘑鍒噸澶嶅鍏ャ��
+     * 鏄庣粏鎸夌墿鏂欍�佹暟閲忋�佸崟浠枫�佺◣鐜囨帓搴忓悗姣旇緝锛屼笉鍙楄椤哄簭褰卞搷銆�
+     */
+    private String buildOrderFingerprint(Long supplierId, List<ErpPurchaseOrderItemDO> items) {
+        if (supplierId == null || CollUtil.isEmpty(items)) {
+            return null;
+        }
+        List<String> parts = items.stream()
+                .map(item -> String.join(":",
+                        String.valueOf(item.getProductId()),
+                        normalizeNumber(item.getCount()),
+                        normalizeNumber(item.getProductPrice()),
+                        normalizeNumber(item.getTaxPercent())))
+                .sorted()
+                .toList();
+        return supplierId + "|" + String.join(",", parts);
+    }
+
+    private String normalizeNumber(BigDecimal value) {
+        return value == null ? "" : value.stripTrailingZeros().toPlainString();
+    }
+
+    private static class ImportOrderData {
+
+        private final ErpPurchaseOrderDO order;
+        private final List<ErpPurchaseOrderItemDO> items;
+        private final String fingerprint;
+        /**
+         * 閲囪喘鍗曠紪鍙锋槸鍚︾敱绯荤粺鑷姩鐢熸垚锛堟枃浠堕噷鐣欑┖锛�
+         */
+        private final boolean generatedNo;
+        /**
+         * 鏂囦欢閲屾槸鍚﹀~鍐欎簡閲囪喘鏃堕棿
+         */
+        private final boolean orderTimeProvided;
+
+        private ImportOrderData(ErpPurchaseOrderDO order, List<ErpPurchaseOrderItemDO> items, String fingerprint,
+                                boolean generatedNo, boolean orderTimeProvided) {
+            this.order = order;
+            this.items = items;
+            this.fingerprint = fingerprint;
+            this.generatedNo = generatedNo;
+            this.orderTimeProvided = orderTimeProvided;
+        }
+    }
+
+    /**
+     * 瑙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) {
@@ -279,7 +651,7 @@
         if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
             return ErpAuditStatus.APPROVE.getStatus();
         } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
-            return ErpAuditStatus.PROCESS.getStatus();
+            return ErpAuditStatus.REJECT.getStatus();
         } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
             return ErpAuditStatus.CANCEL.getStatus();
         }
@@ -289,13 +661,17 @@
     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) {
+            // 鍗曚环涓哄惈绋庡崟浠凤細鍚◣閲戦 = 鍗曚环 脳 鏁伴噺锛涚◣棰� = 鍚◣閲戦 脳 绋庣巼锛涗笉鍚◣閲戦 = 鍚◣閲戦 - 绋庨
+            BigDecimal taxInclusivePrice = MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount());
+            if (taxInclusivePrice == null) {
                 return;
             }
+            BigDecimal taxPrice = null;
             if (item.getTaxPercent() != null) {
-                item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+                taxPrice = MoneyUtils.priceMultiplyPercent(taxInclusivePrice, item.getTaxPercent());
             }
+            item.setTaxPrice(taxPrice);
+            item.setTotalPrice(taxPrice != null ? taxInclusivePrice.subtract(taxPrice) : taxInclusivePrice);
         }));
     }
 
@@ -374,7 +750,11 @@
 
         // 2. 閬嶅巻鍒犻櫎
         purchaseOrders.forEach(purchaseOrder -> {
+            // 2.1 鍒犻櫎闄勪欢
+            storageAttachmentApi.deleteAttachmentsByRecord("erp_purchase_order", purchaseOrder.getId());
+            // 2.2 鍒犻櫎璁㈠崟
             purchaseOrderMapper.deleteById(purchaseOrder.getId());
+            // 2.3 鍒犻櫎璁㈠崟椤�
             purchaseOrderItemMapper.deleteByOrderId(purchaseOrder.getId());
         });
     }
@@ -390,6 +770,11 @@
     @Override
     public ErpPurchaseOrderDO getPurchaseOrder(Long id) {
         return purchaseOrderMapper.selectById(id);
+    }
+
+    @Override
+    public ErpPurchaseOrderDO getPurchaseOrderByProcessInstanceId(String processInstanceId) {
+        return purchaseOrderMapper.selectByProcessInstanceId(processInstanceId);
     }
 
     @Override
@@ -438,6 +823,14 @@
     }
 
     @Override
+    public List<ErpPurchaseOrderDO> getPurchaseOrderListBySource(Integer sourceType, Long sourceId) {
+        if (sourceType == null || sourceId == null) {
+            return Collections.emptyList();
+        }
+        return purchaseOrderMapper.selectListBySource(sourceType, sourceId);
+    }
+
+    @Override
     public void updatePurchaseOrderInStatus(Long orderId) {
         // 1. 鑾峰彇閲囪喘璁㈠崟
         ErpPurchaseOrderDO order = validatePurchaseOrderExists(orderId);
@@ -446,17 +839,31 @@
         if (CollUtil.isEmpty(items)) {
             return;
         }
-        // 3. 璁$畻鍏ュ簱鐘舵��
+        // 3. 璁$畻鍏ュ簱鐘舵�佸拰鎬诲叆搴撴暟閲�
         int inStatus = calculateInStatus(items);
-        // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵��
+        BigDecimal totalInCount = calculateTotalInCount(items);
+        // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵�佸拰鍏ュ簱鏁伴噺
         purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
-                .setId(orderId).setInStatus(inStatus));
+                .setId(orderId).setInStatus(inStatus).setInCount(totalInCount));
 
         // 5. 鍥炲啓閲囪喘鐢宠鏄庣粏鐨勫叆搴撴暟閲忓拰閲囪喘鐢宠鐨勫叆搴撶姸鎬�
         updatePurchaseRequestInStatus(items, inStatus);
     }
 
     /**
+     * 璁$畻鎬诲叆搴撴暟閲�
+     */
+    private BigDecimal calculateTotalInCount(List<ErpPurchaseOrderItemDO> items) {
+        BigDecimal total = BigDecimal.ZERO;
+        for (ErpPurchaseOrderItemDO item : items) {
+            if (item.getInCount() != null) {
+                total = total.add(item.getInCount());
+            }
+        }
+        return total;
+    }
+
+    /**
      * 鍥炲啓閲囪喘鐢宠鍏ュ簱鏁伴噺鍜屽叆搴撶姸鎬�
      *
      * @param orderItems 閲囪喘璁㈠崟鏄庣粏鍒楄〃

--
Gitblit v1.9.3