From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 48f39f1..afa8098 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -15,6 +15,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.service.ISysDictDataService;
+import com.ruoyi.quality.dto.QualityInspectDto;
+import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -30,7 +32,8 @@
import com.ruoyi.stock.service.StockOutRecordService;
import com.ruoyi.stock.service.StockUninventoryService;
import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -52,7 +55,6 @@
* @since 2026-01-21 04:16:36
*/
@Service
-@RequiredArgsConstructor
public class StockInventoryServiceImpl extends ServiceImpl<StockInventoryMapper, StockInventory> implements StockInventoryService {
private final StockInventoryMapper stockInventoryMapper;
@@ -62,6 +64,26 @@
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final ProductModelMapper productModelMapper;
private final ISysDictDataService sysDictDataService;
+ private final IQualityInspectService qualityInspectService;
+
+ public StockInventoryServiceImpl(
+ StockInventoryMapper stockInventoryMapper,
+ StockInRecordService stockInRecordService,
+ StockOutRecordService stockOutRecordService,
+ StockUninventoryService stockUninventoryService,
+ SalesLedgerProductMapper salesLedgerProductMapper,
+ ProductModelMapper productModelMapper,
+ ISysDictDataService sysDictDataService,
+ @Lazy IQualityInspectService qualityInspectService) {
+ this.stockInventoryMapper = stockInventoryMapper;
+ this.stockInRecordService = stockInRecordService;
+ this.stockOutRecordService = stockOutRecordService;
+ this.stockUninventoryService = stockUninventoryService;
+ this.salesLedgerProductMapper = salesLedgerProductMapper;
+ this.productModelMapper = productModelMapper;
+ this.sysDictDataService = sysDictDataService;
+ this.qualityInspectService = qualityInspectService;
+ }
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
@@ -122,6 +144,51 @@
return true;
}
+ /**
+ * 鍒涘缓璐ㄦ鍗�
+ * 鏍规嵁 inspectType 鍐冲畾璐ㄦ绫诲瀷锛�
+ * - 0: 鍘熸潗鏂欐楠�
+ * - 1: 杩囩▼妫�楠�
+ * 濡傛灉鏈寚瀹� inspectType锛屽垯鏍规嵁浜у搧淇℃伅鑷姩鍒ゆ柇
+ */
+ private void createQualityInspect(StockInventoryDto stockInventoryDto) {
+ // 鏌ヨ浜у搧淇℃伅
+ ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
+ if (productModel == null) {
+ throw new ServiceException("浜у搧瑙勬牸涓嶅瓨鍦�");
+ }
+
+ // 纭畾 inspectType
+ Integer inspectType = stockInventoryDto.getInspectType();
+ if (inspectType == null) {
+ // 榛樿浣跨敤鍘熸潗鏂欐楠�
+ inspectType = 0;
+ }
+
+ // 鏋勫缓璐ㄦ鍗�
+ QualityInspectDto qualityInspectDto = new QualityInspectDto();
+ qualityInspectDto.setInspectType(inspectType);
+ qualityInspectDto.setProductModelId(stockInventoryDto.getProductModelId());
+ qualityInspectDto.setProductId(productModel.getProductId());
+ qualityInspectDto.setProductName(stockInventoryDto.getProductName());
+ qualityInspectDto.setQuantity(stockInventoryDto.getQualitity());
+ qualityInspectDto.setInspectState(0); // 鏈彁浜�
+// qualityInspectDto.setRemark(stockInventoryDto.getRemark());
+
+ // 璁剧疆浜у搧淇℃伅
+ if (productModel.getProductName() != null) {
+ qualityInspectDto.setProductName(productModel.getProductName());
+ }
+ qualityInspectDto.setModel(productModel.getModel());
+ qualityInspectDto.setUnit(productModel.getUnit());
+
+ // 鍒濆鍖栫┖鐨勬楠屽弬鏁板垪琛�
+ qualityInspectDto.setQualityInspectParams(new ArrayList<>());
+
+ // 淇濆瓨璐ㄦ鍗�
+ qualityInspectService.add(qualityInspectDto);
+ }
+
//鍑哄簱璋冪敤
@Override
@Transactional(rollbackFor = Exception.class)
@@ -171,6 +238,14 @@
}
stockInventoryDto.setBatchNo(batchNo);
+ // 鍒ゆ柇鏄惁闇�瑕佽川妫�
+ if (Boolean.TRUE.equals(stockInventoryDto.getNeedInspect())) {
+ // 鍒涘缓璐ㄦ鍗�
+ createQualityInspect(stockInventoryDto);
+ return true;
+ }
+
+ // 涓嶉渶瑕佽川妫�锛岀洿鎺ュ垱寤哄叆搴撹褰�
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
--
Gitblit v1.9.3