From 12c10aa909598ee023f7b6a9618fd6121dd3922a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 14:02:46 +0800
Subject: [PATCH] feat(stock): 库存枚举调整
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 111 +++++++++++++++++++++----------------------------------
1 files changed, 42 insertions(+), 69 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 b2633a8..bdcff3a 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -3,31 +3,26 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.StockQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
+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.sales.mapper.SalesLedgerProductMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -44,8 +39,9 @@
@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,32 +50,20 @@
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private ProcurementRecordService procurementRecordService;
+
@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()) {
qualityInspectParam.setInspectId(qualityInspect.getId());
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
-// String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
-// //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
-// List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
-// .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
-// if (qualityTestStandards.size()>0){
-//
-// List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
-// QualityInspectParam qualityInspectParam = new QualityInspectParam();
-// BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
-// qualityInspectParam.setInspectId(qualityInspect.getId());
-// return qualityInspectParam;
-// }).collect(Collectors.toList());
-// qualityInspectParamService.saveBatch(qualityInspectParams);
-// }else{
-// throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
-// }
return 0;
}
@@ -88,24 +72,28 @@
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;
}
//鎻愪氦
@Override
- public int submit(Integer id) {
- QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ public int submit(QualityInspect inspect) {
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
/*鍒ゆ柇涓嶅悎鏍�*/
- if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
+ if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && 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, id));
+ 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 {
+ //鍚堟牸鐩存帴鍏ュ簱
+ stockUtils.addStock(inspect.getProductModelId(), inspect.getQuantity(), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), inspect.getId());
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
@@ -113,21 +101,21 @@
/*鐢熸垚妫�楠屾姤鍛�*/
@Override
- public void down(HttpServletResponse response, Integer id) {
- QualityInspect inspect = qualityInspectMapper.selectById(id);
- String inspectType="";
- switch (inspect.getInspectType()){
+ public void down(HttpServletResponse response, QualityInspect qualityInspect) {
+ QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
+ 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, id));
+ List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
int index = 1;
for (QualityInspectParam detail : paramList) {
detail.setIndex(index);
@@ -149,6 +137,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();
@@ -164,48 +153,32 @@
@Override
public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
- if (qualityInspectDto.getQualityInspectParams().size()>0) {
- qualityInspectParamService.updateBatchById(qualityInspectDto.getQualityInspectParams());
+ if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
+ 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);
-
-// String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
-// //鍏堝垹闄ゆ墍鏈夋楠屽弬鏁板啀鏂板
-// qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
-// .eq(QualityInspectParam::getInspectId,qualityInspect.getId()));
-// //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
-// List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
-// .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
-// if (qualityTestStandards.size()>0){
-// List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
-// QualityInspectParam qualityInspectParam = new QualityInspectParam();
-// BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
-// qualityInspectParam.setInspectId(qualityInspect.getId());
-// return qualityInspectParam;
-// }).collect(Collectors.toList());
-// qualityInspectParamService.saveBatch(qualityInspectParams);
-// }else{
-// throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
-// }
-// return qualityInspectMapper.updateById(qualityInspect);
}
@Override
public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
- return qualityInspectMapper.qualityInspectListPage(page,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:
--
Gitblit v1.9.3