From da78c6cd6cfa63c09fc8b41c18af6f06393847aa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 26 一月 2026 15:53:53 +0800
Subject: [PATCH] yys 修改采购审核模块
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 101 +++++++++++++++++++++++---------------------------
1 files changed, 46 insertions(+), 55 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 257313f..c4fef55 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -10,6 +11,9 @@
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
@@ -29,14 +33,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
-import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
-import com.ruoyi.purchase.mapper.ProductRecordMapper;
-import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
-import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
-import com.ruoyi.purchase.pojo.PaymentRegistration;
-import com.ruoyi.purchase.pojo.ProductRecord;
-import com.ruoyi.purchase.pojo.PurchaseLedger;
-import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.purchase.mapper.*;
+import com.ruoyi.purchase.pojo.*;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.quality.mapper.*;
import com.ruoyi.quality.pojo.*;
@@ -111,7 +109,13 @@
private final QualityTestStandardMapper qualityTestStandardMapper;
private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final ApproveProcessServiceImpl approveProcessService;
+
private final ProcurementRecordMapper procurementRecordStorageMapper;
+
+ private final PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ private final SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@Value("${file.upload-dir}")
private String uploadDir;
@@ -123,52 +127,10 @@
}
return purchaseLedgerMapper.selectList(queryWrapper);
}
+
@Override
@Transactional(rollbackFor = Exception.class)
- public int addPurchaseTemplate(PurchaseLedgerDto purchaseLedgerDto)throws IOException {
- //褰曞叆浜�
- SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
-
- SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
- PurchaseLedger purchaseLedger = new PurchaseLedger();
-// BeanUtils.copyProperties(purchaseLedger,purchaseLedgerDto);
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if(ObjectUtils.isNotEmpty(loginUser) && null != loginUser.getTenantId()) {
- purchaseLedger.setTenantId(loginUser.getTenantId());
- }
- purchaseLedger.setPaymentMethod(purchaseLedgerDto.getPaymentMethod());
- purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
- purchaseLedger.setSupplierId(purchaseLedgerDto.getSupplierId());
- purchaseLedger.setTemplateName(purchaseLedgerDto.getTemplateName());
-// purchaseLedger.setSalesLedgerPId(purchaseLedgerDto.getSalesLedgerId());
- purchaseLedger.setApprovalStatus(3);
- purchaseLedger.setSupplierName(supplierManage.getSupplierName());
- purchaseLedger.setRecorderName(sysUser.getNickName());
- purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
- purchaseLedger.setPurchaseContractNumber(UUID.randomUUID().toString().replaceAll("-", ""));
- purchaseLedger.setEntryDate(Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()));
- int insert = purchaseLedgerMapper.insert(purchaseLedger);
-
- LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(PurchaseLedger::getSupplierName, purchaseLedger.getSupplierName())
- .eq(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber())
- .eq(PurchaseLedger::getApprovalStatus,3);
- PurchaseLedger purchaseLedger1 = purchaseLedgerMapper.selectOne(queryWrapper);
-
- if(ObjectUtils.isNotEmpty(purchaseLedgerDto.getProductData())) {
- // 4. 澶勭悊瀛愯〃鏁版嵁
- List<SalesLedgerProduct> salesLedgerProductList = purchaseLedgerDto.getProductData();
- salesLedgerProductList.forEach(salesLedgerProduct -> {
- salesLedgerProduct.setSalesLedgerId(purchaseLedger1.getId());
- salesLedgerProduct.setType(2);
- });
- salesLedgerProductList.forEach(salesLedgerProductMapper::insert);
- }
- return insert;
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException {
+ public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception {
SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
//褰曞叆浜�
@@ -193,9 +155,26 @@
if (purchaseLedger.getId() == null) {
purchaseLedgerMapper.insert(purchaseLedger);
} else {
+ // 鍒犻櫎閲囪喘瀹℃壒锛岄噸鏂版彁浜�
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 5)
+ .eq(ApproveProcess::getApproveReason, purchaseLedger.getPurchaseContractNumber())
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .last("limit 1"));
+ if (one != null) {
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
purchaseLedgerMapper.updateById(purchaseLedger);
}
-
+ // 6.閲囪喘瀹℃壒鏂板
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(5);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(purchaseLedger.getPurchaseContractNumber());
+ approveProcessVO.setApproveUserIds(purchaseLedgerDto.getApproveUserIds());
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessService.addApprove(approveProcessVO);
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
@@ -214,7 +193,6 @@
if (purchaseLedgerDto.getTempFileIds() != null && !purchaseLedgerDto.getTempFileIds().isEmpty()) {
migrateTempFilesToFormal(purchaseLedger.getId(), purchaseLedgerDto.getTempFileIds());
}
-
return 1;
}
@@ -461,7 +439,20 @@
qualityStandardLambdaQueryWrapper.in(QualityInspectParam::getInspectId, inspectIds);
qualityInspectParamMapper.delete(qualityStandardLambdaQueryWrapper);
}
-
+ // 鍒犻櫎閲囪喘瀹℃壒璁板綍
+ for (Long id : ids) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
+ if(purchaseLedger != null){
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 5)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveReason, purchaseLedger.getPurchaseContractNumber())
+ .last("limit 1"));
+ if (one != null) {
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
+ }
+ }
//鎵归噺鍒犻櫎鍘熸潗鏂欐楠屾暟鎹�
qualityInspectMapper.delete(materialInspectLambdaQueryWrapper);
// 鎵归噺鍒犻櫎閲囪喘鍙拌处
--
Gitblit v1.9.3