From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 28a76e0..d030eac 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -11,7 +11,12 @@
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.common.enums.ApproveTypeEnum;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.QualityInspectDto;
@@ -27,6 +32,7 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.framework.security.LoginUser;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -61,6 +67,7 @@
private PurchaseLedgerMapper purchaseLedgerMapper;
private ProcurementRecordService procurementRecordService;
+ private IApproveProcessService approveProcessService;
@Override
public int add(QualityInspectDto qualityInspectDto) {
@@ -104,15 +111,111 @@
qualityUnqualified.setInspectId(qualityInspect.getId());
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
- //鍚堟牸鐩存帴鍏ュ簱
- stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
- // 閲囪喘鍘熸潗鏂欐楠岋細鍚堟牸鍏ュ簱鍚庡悓姝ュ埌閲囪喘浜у搧鈥滃凡鍏ュ簱鏁伴噺鈥濓紝涓庢壂鐮佸叆搴撳叡鐢ㄤ竴浠芥暟鎹彛寰�
- syncQualifiedInboundToPurchaseProducts(qualityInspect);
+ // 鍘熸潗鏂欐楠屽悎鏍煎悗锛屽厛鍙戣捣鈥滃叆搴撳鎵光�濓紝瀹℃壒閫氳繃鍚庡啀鍏ュ簱
+ if (Objects.equals(qualityInspect.getInspectType(), 0)) {
+ submitQualifiedInboundApprove(qualityInspect);
+ } else {
+ // 鐩存帴鍏ュ簱
+ stockUtils.addStock(
+ qualityInspect.getPurchaseLedgerId() == null ? null : qualityInspect.getPurchaseLedgerId().longValue(),
+ null,
+ qualityInspect.getProductModelId(),
+ qualityInspect.getQuantity(),
+ StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
+ qualityInspect.getId()
+ );
+ syncQualifiedInboundToPurchaseProducts(qualityInspect);
+ }
}
qualityInspect.setInspectState(1);//宸叉彁浜�
int updated = qualityInspectMapper.updateById(qualityInspect);
refreshPurchaseLedgerStockStatusByInspect(qualityInspect.getPurchaseLedgerId());
return updated;
+ }
+
+ private void submitQualifiedInboundApprove(QualityInspect qualityInspect) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(qualityInspect.getPurchaseLedgerId());
+ if (purchaseLedger == null) {
+ throw new RuntimeException("鎻愪氦澶辫触锛岄噰璐彴璐︿笉瀛樺湪");
+ }
+ String approveUserIds = ObjectUtils.isNotEmpty(qualityInspect.getApproveUserIds())
+ ? qualityInspect.getApproveUserIds()
+ : purchaseLedger.getApproveUserIds();
+ if (ObjectUtils.isEmpty(approveUserIds)) {
+ throw new RuntimeException("鎻愪氦澶辫触锛岃鍏堢淮鎶よ川妫�鍗曞鎵逛汉锛堟垨閲囪喘鍙拌处瀹℃壒浜猴級");
+ }
+
+ String approveReason = "鍘熸潗鏂欒川妫�鍏ュ簱瀹℃壒:" + purchaseLedger.getPurchaseContractNumber();
+ String approveRemark = "qualityQualifiedInbound:" + qualityInspect.getId() + ":" + purchaseLedger.getId();
+ ApproveProcess exist = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
+ .eq(ApproveProcess::getApproveRemark, approveRemark)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .orderByDesc(ApproveProcess::getCreateTime)
+ .last("limit 1"));
+ if (exist != null && !Objects.equals(exist.getApproveStatus(), 3)) {
+ throw new RuntimeException("鎻愪氦澶辫触锛岃璐ㄦ鍗曞凡鍙戣捣鍏ュ簱瀹℃壒锛屽鎵瑰畬鎴愬墠涓嶈兘閲嶅鎻愪氦");
+ }
+
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(ApproveTypeEnum.STOCK_IN.getCode());
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(approveReason);
+ approveProcessVO.setApproveRemark(approveRemark);
+ approveProcessVO.setApproveUserIds(approveUserIds);
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(java.time.LocalDate.now().toString());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ } catch (Exception e) {
+ throw new RuntimeException("鎻愪氦澶辫触锛屽叆搴撳鎵瑰彂璧峰紓甯�:" + e.getMessage());
+ }
+ qualityInspect.setApprovalStatus(2);
+ qualityInspect.setApproveUserIds(approveUserIds);
+ qualityInspectMapper.updateById(qualityInspect);
+ }
+
+ @Override
+ public void executeQualifiedInboundApproval(Integer inspectId) {
+ if (inspectId == null) {
+ throw new RuntimeException("瀹℃壒澶辫触锛岃川妫�鍗旾D涓嶈兘涓虹┖");
+ }
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(inspectId);
+ if (qualityInspect == null) {
+ throw new RuntimeException("瀹℃壒澶辫触锛岃川妫�鍗曚笉瀛樺湪");
+ }
+ if (!Objects.equals(qualityInspect.getInspectType(), 0)) {
+ throw new RuntimeException("瀹℃壒澶辫触锛屼粎鍘熸潗鏂欐楠屾敮鎸佸叆搴撳鎵�");
+ }
+ if (!Objects.equals(qualityInspect.getInspectState(), 1) || !"鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ throw new RuntimeException("瀹℃壒澶辫触锛屽綋鍓嶈川妫�鍗曠姸鎬佷笉鍏佽鍏ュ簱");
+ }
+ stockUtils.addStock(
+ qualityInspect.getPurchaseLedgerId() == null ? null : qualityInspect.getPurchaseLedgerId().longValue(),
+ null,
+ qualityInspect.getProductModelId(),
+ qualityInspect.getQuantity(),
+ StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
+ qualityInspect.getId()
+ );
+ syncQualifiedInboundToPurchaseProducts(qualityInspect);
+ refreshPurchaseLedgerStockStatusByInspect(qualityInspect.getPurchaseLedgerId());
+ qualityInspect.setApprovalStatus(3);
+ qualityInspectMapper.updateById(qualityInspect);
+ }
+
+ @Override
+ public void markQualifiedInboundApprovalStatus(Integer inspectId, Integer approvalStatus) {
+ if (inspectId == null || approvalStatus == null) {
+ return;
+ }
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(inspectId);
+ if (qualityInspect == null) {
+ return;
+ }
+ qualityInspect.setApprovalStatus(approvalStatus);
+ qualityInspectMapper.updateById(qualityInspect);
}
/*鐢熸垚妫�楠屾姤鍛�*/
@@ -182,7 +285,7 @@
}
@Override
- public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
+ public IPage<QualityInspect> qualityInspectListPage(Page<?> page, QualityInspect qualityInspect) {
return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
}
--
Gitblit v1.9.3