From 74a29854bb8ff92d2ff2fcb55fa5028609ec6a33 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 七月 2026 15:26:47 +0800
Subject: [PATCH] 采购删除导致审批报错+发货台账导入关联销售台账+生成出库记录
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e3ad55a..0155e1b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -232,7 +232,7 @@
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setRecorderName(sysUser.getNickName());
purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
- purchaseLedger.setApprovalStatus(1);
+ purchaseLedger.setApprovalStatus(3);
List<SalesLedgerProduct> productList = Optional.ofNullable(purchaseLedgerDto.getProductData()).orElse(Collections.emptyList());
// 3. 鏂板鎴栨洿鏂颁富琛�
@@ -849,7 +849,9 @@
if(salesLedger1 != null){
salesLedger.setSalesLedgerId(salesLedger1.getId());
}
- // 閲囪喘瀹℃牳
+ // 璁剧疆涓哄緟瀹℃壒鐘舵��
+ salesLedger.setApprovalStatus(3);
+ /* // 閲囪喘瀹℃牳 - 宸插簾寮冿紝涓嶅啀鍙戣捣瀹℃壒娴佺▼
// 閫氳繃鏄电О鑾峰彇鐢ㄦ埛ID
String[] split = salesLedger.getApproveUserIds().split("锛�");
List<Long> ids = new ArrayList<>();
@@ -862,7 +864,7 @@
}
// 灏嗛泦鍚堣浆涓哄瓧绗︿覆锛岄殧寮�
String collect = ids.stream().map(Object::toString).collect(Collectors.joining(","));
- salesLedger.setApproveUserIds(collect);
+ salesLedger.setApproveUserIds(collect); */
purchaseLedgerMapper.insert(salesLedger);
for (PurchaseLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
@@ -933,7 +935,7 @@
salesLedgerProductMapper.insert(salesLedgerProduct);
}
// 閲囪喘瀹℃牳
- addApproveByPurchase(loginUser,salesLedger);
+// addApproveByPurchase(loginUser,salesLedger);
}
return AjaxResult.success("瀵煎叆鎴愬姛");
--
Gitblit v1.9.3