From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 46 +++++++---------------------------------------
1 files changed, 7 insertions(+), 39 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 328c358..8ea03f0 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,6 @@
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
@@ -41,9 +40,8 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -96,11 +94,7 @@
public int submit(QualityInspect inspect) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
- //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
- if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
- throw new ServiceException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
- }
-
+ //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍硷紙閫氳繃鍚堟牸鏁伴噺鍜屼笉鍚堟牸鏁伴噺鏉ュ垽鏂級
if (ObjectUtils.isNull(qualityInspect.getQualifiedQuantity())) {
throw new ServiceException("鍚堟牸鏁伴噺涓嶈兘涓虹┖");
}
@@ -131,15 +125,16 @@
stockInventoryDto.setRecordId(qualityInspect.getId());
stockInventoryDto.setProductModelId(qualityInspect.getProductModelId());
stockInventoryDto.setQualitity(qualityInspect.getQualifiedQuantity());
- if (qualityInspect.getCheckTime() != null) {
- LocalDate stockCreateDate = DateUtils.toLocalDate(qualityInspect.getCheckTime()).plusDays(1);
- stockInventoryDto.setCreateTime(LocalDateTime.of(stockCreateDate, java.time.LocalTime.MIDNIGHT));
- }
stockInventoryDto.setBatchNo(resolveProductionBatchNo(
qualityInspect.getProductMainId(),
qualityInspect.getId(),
qualityInspect.getProductModelId()));
stockInventoryService.addStockInRecordOnly(stockInventoryDto);
+ //StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery()
+ // .eq(StockInRecord::getRecordId, qualityInspect.getId())
+ // .eq(StockInRecord::getRecordType, stockInventoryDto.getRecordType())
+ //);
+ //stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1);
}
// 涓嶅悎鏍煎鐞�
if(qualityInspect.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){
@@ -157,33 +152,6 @@
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
- }
-
- @Override
- public R autoSubmit(Long id) {
- if (id == null) {
- return R.fail("妫�楠屽崟ID涓嶈兘涓虹┖");
- }
- QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
- if (qualityInspect == null) {
- return R.fail("妫�楠屽崟涓嶅瓨鍦�");
- }
- if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
- return R.ok("妫�楠屽崟宸叉彁浜�");
- }
-
- if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
- qualityInspect.setCheckResult("鍚堟牸");
- }
- if (ObjectUtils.isNull(qualityInspect.getQualifiedQuantity())) {
- qualityInspect.setQualifiedQuantity(qualityInspect.getQuantity() == null ? BigDecimal.ZERO : qualityInspect.getQuantity());
- }
- if (ObjectUtils.isNull(qualityInspect.getUnqualifiedQuantity())) {
- qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
- }
- qualityInspectMapper.updateById(qualityInspect);
- int rows = submit(qualityInspect);
- return rows > 0 ? R.ok("妫�楠屽崟鎻愪氦鎴愬姛") : R.fail("妫�楠屽崟鎻愪氦澶辫触");
}
private String resolveProductionBatchNo(Long productionProductMainId,
--
Gitblit v1.9.3