From fc830b7f62af651acedb8c11f1e2634fe2a3e497 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 14:20:46 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 0 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 889f0a2..dec920d 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.quality.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -11,7 +12,13 @@
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.procurementrecord.dto.Details;
+import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityInspectParamMapper;
@@ -23,6 +30,8 @@
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
@@ -36,7 +45,10 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -53,6 +65,10 @@
private QualityTestStandardMapper qualityTestStandardMapper;
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private ProcurementRecordService procurementRecordService;
@Override
public int add(QualityInspectDto qualityInspectDto) {
@@ -90,6 +106,80 @@
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualifiedMapper.insert(qualityUnqualified);
+ }
+
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (qualityInspect.getInspectType() == 0) {
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(1);
+ procurementRecordOutAdd.setTypeName("閲囪喘鍏ュ簱");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
+ if (qualityInspect.getPurchaseLedgerId() == null) {
+ throw new BaseException("璇烽�夋嫨閲囪喘鍗�");
+ }
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(qualityInspect.getProductId());
+
+ ArrayList<Details> detailss = new ArrayList<>();
+ Details details = new Details();
+ details.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details.setInboundQuantity(qualityInspect.getQuantity());
+ details.setWarnNum(salesLedgerProduct.getWarnNum());
+ details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details.setProductModelId(qualityInspect.getProductModelId());
+ detailss.add( details);
+ procurementRecordOutAdd.setDetails(detailss);
+ procurementRecordService.add(procurementRecordOutAdd);
+ }
+ }else if (qualityInspect.getInspectType() == 1) {
+ //鏌ヨUnitPrice/TotalPrice
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍏ュ簱");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setProductModelId(qualityInspect.getProductModelId());
+ procurementRecordOutAdd.setDetails(details);
+
+ ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
+ .salesLedgerProductId(details1.getId())
+ .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
+ .inboundNum(details1.getInboundQuantity())
+ .type(2)
+ .warnNum(new BigDecimal(0))
+ .unitPrice(new BigDecimal(0))
+ .totalPrice(new BigDecimal(0))
+ .createTime(LocalDateTime.now())
+ .createUser(loginUser.getUserId())
+ .updateTime(LocalDateTime.now())
+ .updateUser(loginUser.getUserId())
+ .createBy(procurementRecordOutAdd.getNickName())
+ .productModelId(details1.getProductModelId());
+ procurementRecordService.save(procurementRecordBuilder.build());
+
+
+
+ }else if (qualityInspect.getInspectType() == 2) {
+ //鏌ヨUnitPrice/TotalPrice
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍏ュ簱");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setId(Math.toIntExact(salesLedgerProduct.getProductId()));
+ details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details1.setProductModelId(salesLedgerProduct.getProductModelId());
+ details.add(details1);
+ procurementRecordOutAdd.setDetails(details);
+ procurementRecordService.add(procurementRecordOutAdd);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
@@ -133,6 +223,7 @@
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
"妫�楠屾姤鍛�", "UTF-8");
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
--
Gitblit v1.9.3