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 | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 260 insertions(+), 28 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 f29bedf..d030eac 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -2,32 +2,37 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
-import com.ruoyi.common.exception.base.BaseException;
+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;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityInspectParamMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffOnJobService;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+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;
@@ -36,16 +41,19 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@AllArgsConstructor
@Service
@Transactional(rollbackFor = Exception.class)
-public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect> implements IQualityInspectService {
+public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect> implements IQualityInspectService {
+ private final StockUtils stockUtils;
private QualityInspectMapper qualityInspectMapper;
private IQualityInspectParamService qualityInspectParamService;
@@ -54,10 +62,17 @@
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+
+ private ProcurementRecordService procurementRecordService;
+ private IApproveProcessService approveProcessService;
+
@Override
public int add(QualityInspectDto qualityInspectDto) {
QualityInspect qualityInspect = new QualityInspect();
- BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
+ BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
qualityInspectMapper.insert(qualityInspect);
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
@@ -72,7 +87,7 @@
QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
List<QualityInspectParam> qualityInspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
QualityInspectDto qualityInspectDto = new QualityInspectDto();
- BeanUtils.copyProperties(qualityInspect,qualityInspectDto);
+ BeanUtils.copyProperties(qualityInspect, qualityInspectDto);
qualityInspectDto.setQualityInspectParams(qualityInspectParams);
return qualityInspectDto;
}
@@ -81,34 +96,142 @@
@Override
public int submit(QualityInspect inspect) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
+ //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
+ if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
+ throw new RuntimeException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
+ }
/*鍒ゆ柇涓嶅悎鏍�*/
- if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
+ if (qualityInspect.getCheckResult().equals("涓嶅悎鏍�")) {
QualityUnqualified qualityUnqualified = new QualityUnqualified();
- BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
+ BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
qualityUnqualified.setInspectState(0);//寰呭鐞�
List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
- qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+ qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+ qualityUnqualified.setInspectId(qualityInspect.getId());
qualityUnqualifiedMapper.insert(qualityUnqualified);
+ } else {
+ // 鍘熸潗鏂欐楠屽悎鏍煎悗锛屽厛鍙戣捣鈥滃叆搴撳鎵光�濓紝瀹℃壒閫氳繃鍚庡啀鍏ュ簱
+ 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);//宸叉彁浜�
- return qualityInspectMapper.updateById(qualityInspect);
+ 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);
}
/*鐢熸垚妫�楠屾姤鍛�*/
@Override
public void down(HttpServletResponse response, QualityInspect qualityInspect) {
QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
- String inspectType="";
- switch (inspect.getInspectType()){
+ String inspectType = "";
+ switch (inspect.getInspectType()) {
case 0:
- inspectType="鍘熸潗鏂欐楠�";
+ inspectType = "鍘熸潗鏂欐楠�";
break;
case 1:
- inspectType="杩囩▼妫�楠�";
+ inspectType = "杩囩▼妫�楠�";
break;
case 2:
- inspectType="鍑哄巶妫�楠�";
+ inspectType = "鍑哄巶妫�楠�";
break;
}
List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
@@ -150,31 +273,31 @@
@Override
public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
- qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
+ qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspectDto.getId()));
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspectDto.getId());
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
}
QualityInspect qualityInspect = new QualityInspect();
- BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
+ BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
return qualityInspectMapper.updateById(qualityInspect);
}
@Override
- public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
- return qualityInspectMapper.qualityInspectListPage(page,qualityInspect);
+ public IPage<QualityInspect> qualityInspectListPage(Page<?> page, QualityInspect qualityInspect) {
+ return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
}
@Override
public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
- List<QualityInspect> qualityInspects =qualityInspectMapper.qualityInspectExport(qualityInspect);
+ List<QualityInspect> qualityInspects = qualityInspectMapper.qualityInspectExport(qualityInspect);
ExcelUtil<QualityInspect> util = new ExcelUtil<QualityInspect>(QualityInspect.class);
- switch (qualityInspect.getInspectType()){
+ switch (qualityInspect.getInspectType()) {
case 0:
util.exportExcel(response, qualityInspects, "鍘熸潗鏂欐楠屽鍑�");
break;
- case 1:
+ case 1:
util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
break;
case 2:
@@ -184,5 +307,114 @@
}
+ private void refreshPurchaseLedgerStockStatusByInspect(Long purchaseLedgerId) {
+ if (purchaseLedgerId == null) {
+ return;
+ }
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
+ .eq(SalesLedgerProduct::getType, 2));
+ if (products == null || products.isEmpty()) {
+ return;
+ }
+ boolean allInbound = true;
+ boolean anyInbound = false;
+ for (SalesLedgerProduct product : products) {
+ BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
+ BigDecimal totalInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
+ if (totalInboundQty.compareTo(BigDecimal.ZERO) > 0) {
+ anyInbound = true;
+ }
+ if (totalInboundQty.compareTo(orderQty) < 0) {
+ allInbound = false;
+ }
+ }
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerId);
+ if (purchaseLedger == null) {
+ return;
+ }
+ int targetStockStatus = allInbound ? 2 : (anyInbound ? 1 : 0);
+ if (!Objects.equals(purchaseLedger.getStockStatus(), targetStockStatus)) {
+ purchaseLedger.setStockStatus(targetStockStatus);
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
+
+ private void syncQualifiedInboundToPurchaseProducts(QualityInspect qualityInspect) {
+ if (qualityInspect == null) {
+ return;
+ }
+ if (!Objects.equals(qualityInspect.getInspectType(), 0) || qualityInspect.getPurchaseLedgerId() == null) {
+ return;
+ }
+ if (qualityInspect.getProductModelId() == null || qualityInspect.getQuantity() == null) {
+ return;
+ }
+ BigDecimal inboundQty = qualityInspect.getQuantity();
+ if (inboundQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+
+ List<SalesLedgerProduct> lines = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, qualityInspect.getPurchaseLedgerId())
+ .eq(SalesLedgerProduct::getType, 2)
+ .eq(SalesLedgerProduct::getProductModelId, qualityInspect.getProductModelId())
+ .eq(SalesLedgerProduct::getIsChecked, true)
+ .orderByAsc(SalesLedgerProduct::getId));
+ if (lines == null || lines.isEmpty()) {
+ return;
+ }
+
+ BigDecimal remaining = inboundQty;
+ SalesLedgerProduct fallbackLine = null;
+ for (SalesLedgerProduct line : lines) {
+ if (remaining.compareTo(BigDecimal.ZERO) <= 0) {
+ break;
+ }
+ BigDecimal orderQty = line.getQuantity() == null ? BigDecimal.ZERO : line.getQuantity();
+ BigDecimal stocked = line.getStockedQuantity() == null ? BigDecimal.ZERO : line.getStockedQuantity();
+ BigDecimal canFill = orderQty.subtract(stocked);
+ if (canFill.compareTo(BigDecimal.ZERO) <= 0) {
+ fallbackLine = line;
+ continue;
+ }
+ BigDecimal add = canFill.min(remaining);
+ BigDecimal newStocked = stocked.add(add);
+ int status;
+ if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
+ status = 0;
+ } else if (orderQty.compareTo(BigDecimal.ZERO) > 0 && newStocked.compareTo(orderQty) < 0) {
+ status = 1;
+ } else {
+ status = 2;
+ }
+ line.setStockedQuantity(newStocked);
+ line.setProductStockStatus(status);
+ line.fillRemainingQuantity();
+ salesLedgerProductMapper.updateById(line);
+ remaining = remaining.subtract(add);
+ fallbackLine = line;
+ }
+
+ // 鍏佽澶氬叆搴擄細鑻ヤ粛鏈夊墿浣欙紝绱鍒版渶鍚庝竴琛岋紝纭繚 remaining_shipped_quantity 鑳藉悓姝ュ闀�
+ if (remaining.compareTo(BigDecimal.ZERO) > 0 && fallbackLine != null) {
+ BigDecimal orderQty = fallbackLine.getQuantity() == null ? BigDecimal.ZERO : fallbackLine.getQuantity();
+ BigDecimal stocked = fallbackLine.getStockedQuantity() == null ? BigDecimal.ZERO : fallbackLine.getStockedQuantity();
+ BigDecimal newStocked = stocked.add(remaining);
+ int status;
+ if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
+ status = 0;
+ } else if (orderQty.compareTo(BigDecimal.ZERO) > 0 && newStocked.compareTo(orderQty) < 0) {
+ status = 1;
+ } else {
+ status = 2;
+ }
+ fallbackLine.setStockedQuantity(newStocked);
+ fallbackLine.setProductStockStatus(status);
+ fallbackLine.fillRemainingQuantity();
+ salesLedgerProductMapper.updateById(fallbackLine);
+ }
+ }
+
}
--
Gitblit v1.9.3