From 61f1de60e6f58dd8e19f01c56f2e56e40885d65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 17:39:58 +0800
Subject: [PATCH] 点击发货-》发货审核-》出厂质检-》出库审核-》出库通过
---
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index 8919523..4cbd6f4 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -4,15 +4,21 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.mapper.sales.AccountInvoiceApplicationMapper;
+import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;
import com.ruoyi.common.enums.ReviewStatusEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+
+import java.time.LocalDateTime;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
@@ -20,17 +26,16 @@
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockOutRecordMapper;
import com.ruoyi.stock.mapper.StockUninventoryMapper;
-import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.stock.pojo.StockOutRecord;
import com.ruoyi.stock.pojo.StockUninventory;
import com.ruoyi.stock.service.StockOutRecordService;
-import lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -42,11 +47,14 @@
* @since 2026-01-21 05:27:04
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class StockOutRecordServiceImpl extends ServiceImpl<StockOutRecordMapper, StockOutRecord> implements StockOutRecordService {
- private StockOutRecordMapper stockOutRecordMapper;
- private StockInventoryMapper stockInventoryMapper;
- private StockUninventoryMapper stockUninventoryMapper;
+ private final StockOutRecordMapper stockOutRecordMapper;
+ private final StockInventoryMapper stockInventoryMapper;
+ private final StockUninventoryMapper stockUninventoryMapper;
+ private final AccountSalesCollectionMapper accountSalesCollectionMapper;
+ private final AccountInvoiceApplicationMapper accountInvoiceApplicationMapper;
+ private final QualityInspectMapper qualityInspectMapper;
@Override
public IPage<StockOutRecordDto> listPage(Page page, StockOutRecordDto stockOutRecordDto) {
@@ -55,10 +63,16 @@
@Override
public int add(StockOutRecordDto stockOutRecordDto) {
- String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches");
- stockOutRecordDto.setOutboundBatches(no);
- StockInRecord stockInRecord = new StockInRecord();
- BeanUtils.copyProperties(stockOutRecordDto, stockInRecord);
+ LocalDateTime createTime = stockOutRecordDto.getCreateTime() != null ? stockOutRecordDto.getCreateTime() : LocalDateTime.now();
+ stockOutRecordDto.setCreateTime(createTime);
+ // 濡傛灉浼犲叆浜唎utboundBatches鍒欎娇鐢紝鍚﹀垯鑷姩鐢熸垚
+ if (stockOutRecordDto.getOutboundBatches() == null || stockOutRecordDto.getOutboundBatches().isEmpty()) {
+ String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches", createTime);
+ stockOutRecordDto.setOutboundBatches(no);
+ }
+ if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){
+ stockOutRecordDto.setApprovalStatus(3);
+ }
return stockOutRecordMapper.insert(stockOutRecordDto);
}
@@ -77,6 +91,11 @@
@Override
public int batchDelete(List<Long> ids) {
+ //todo 濡傛灉鍑哄簱涓庡紑绁ㄦ敹娆炬湁鍏宠仈鍒欐棤娉曞垹闄�
+ if (accountSalesCollectionMapper.existsByStockOutRecordId(ids) ||
+ accountInvoiceApplicationMapper.existsByStockOutRecordId(ids)) {
+ throw new BaseException("鍑哄簱璁板綍瀛樺湪寮�绁ㄦ敹娆惧叧鑱旀暟鎹�,鏃犳硶鍒犻櫎!!!");
+ }
for (Long id : ids) {
StockOutRecord stockOutRecord = stockOutRecordMapper.selectById(id);
if (stockOutRecord.getType().equals("0")) {
@@ -97,7 +116,8 @@
stockInRecordDto.setBatchNo(stockInventory.getBatchNo());
stockInventoryMapper.updateAddStockInventory(stockInRecordDto);
}
- }else if (stockOutRecord.getType().equals("1")) {
+ }
+ else if (stockOutRecord.getType().equals("1")) {
LambdaQueryWrapper<StockUninventory> wrapper = new LambdaQueryWrapper<StockUninventory>()
.eq(StockUninventory::getProductModelId, stockOutRecord.getProductModelId());
if (StringUtils.isEmpty(stockOutRecord.getBatchNo())) {
@@ -127,7 +147,7 @@
if (stockInRecordExportData.getType().equals("0")) {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}else {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInUnQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
+ stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}
}
ExcelUtil<StockOutRecordExportData> util = new ExcelUtil<>(StockOutRecordExportData.class);
@@ -166,6 +186,12 @@
if (stockOutRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockOutRecord.getApprovalStatus())) {
throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘瀹℃壒,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
}
+
+ // 鍑哄簱瀹℃壒閫氳繃鍓嶏紝妫�鏌ユ槸鍚﹂渶瑕佸嚭鍘傝川妫�浠ュ強璐ㄦ鏄惁瀹屾垚
+ if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus) && StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecord.getRecordType())) {
+ checkFactoryInspectCompleted(stockOutRecord);
+ }
+
stockOutRecord.setApprovalStatus(approvalStatus);
stockOutRecordMapper.updateById(stockOutRecord);
// 瀹℃壒閫氳繃鏃讹紝鎵ｅ噺搴撳瓨
@@ -198,6 +224,36 @@
return ids.size();
}
+ /**
+ * 妫�鏌ラ攢鍞嚭搴撴槸鍚﹀凡瀹屾垚鍑哄巶璐ㄦ
+ */
+ private void checkFactoryInspectCompleted(StockOutRecord stockOutRecord) {
+ // 鏌ヨ璇ュ嚭搴撹褰曞搴旂殑鍑哄巶妫�楠屽崟鏄惁宸插畬鎴�
+ Long recordId = stockOutRecord.getRecordId();
+ Long productModelId = stockOutRecord.getProductModelId();
+
+ if (recordId == null || productModelId == null) {
+ return;
+ }
+
+ // 鏌ヨ鍏宠仈鐨勫嚭鍘傛楠屽崟锛坕nspectType=2, shippingInfoId=recordId, productModelId锛�
+ QualityInspect qualityInspect = qualityInspectMapper.selectOne(
+ new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getInspectType, 2)
+ .eq(QualityInspect::getShippingInfoId, recordId)
+ .eq(QualityInspect::getProductModelId, productModelId)
+ .last("limit 1")
+ );
+
+ if (qualityInspect == null) {
+ throw new BaseException("璇ュ嚭搴撹褰曟湭鐢熸垚鍑哄巶妫�楠屽崟锛岃鍏堝畬鎴愬彂璐у鎵�");
+ }
+
+ if (qualityInspect.getInspectState() == null || qualityInspect.getInspectState() != 1) {
+ throw new BaseException("鍑哄巶妫�楠屽崟灏氭湭鎻愪氦瀹屾垚锛岃鍏堝畬鎴愬嚭鍘傝川妫�鍚庡啀杩涜鍑哄簱瀹℃壒");
+ }
+ }
+
private StockInventory getStockInventory(Long productModelId, String batchNo) {
LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>();
eq.eq(StockInventory::getProductModelId, productModelId);
--
Gitblit v1.9.3