From 6d3a76f894052209cad136ec9bff6ddcd43fc4e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 四月 2026 17:55:48 +0800
Subject: [PATCH] feat: 扫码时做限制，若采购台账已全部质检入库，APP扫码 入库时提示已入库。并且联动质检
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 186 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 181 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 3e3bafc..935cb78 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -141,6 +141,8 @@
@Autowired
private QualityInspectMapper qualityInspectMapper;
@Autowired
+ private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ @Autowired
private CommonFileServiceImpl commonFileService;
@Autowired
private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
@@ -212,6 +214,7 @@
purchaseLedger.setRecorderName(sysUser.getNickName());
purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
purchaseLedger.setApprovalStatus(1);
+ purchaseLedger.setStockStatus(0);
// 3. 鏂板鎴栨洿鏂颁富琛�
if (purchaseLedger.getId() == null) {
purchaseLedgerMapper.insert(purchaseLedger);
@@ -336,6 +339,7 @@
if (!updateList.isEmpty()) {
for (SalesLedgerProduct product : updateList) {
product.setType(type);
+ product.setProductStockStatus(calculateProductStockStatus(product));
product.fillRemainingQuantity();
salesLedgerProductMapper.updateById(product);
}
@@ -351,6 +355,7 @@
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setProductStockStatus(calculateProductStockStatus(salesLedgerProduct));
salesLedgerProduct.fillRemainingQuantity();
salesLedgerProductMapper.insert(salesLedgerProduct);
}
@@ -481,7 +486,8 @@
.in(StockInRecord::getSalesLedgerProductId, productIds)
.or(q -> q.in(StockInRecord::getRecordId, productIds)
.in(StockInRecord::getRecordType, Arrays.asList(
- StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode()
+ StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(),
+ StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_QUALITY_UNSTOCK_IN.getCode()
))))
.select(StockInRecord::getId))
.stream().map(StockInRecord::getId).collect(Collectors.toList());
@@ -567,7 +573,7 @@
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
.eq(SalesLedgerProduct::getType, purchaseLedgerDto.getType());
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
- products.forEach(SalesLedgerProduct::fillRemainingQuantity);
+ applyQualityInboundToProducts(purchaseLedger.getId(), products);
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -837,7 +843,7 @@
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
.eq(SalesLedgerProduct::getType, 2);
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
- products.forEach(SalesLedgerProduct::fillRemainingQuantity);
+ applyQualityInboundToProducts(purchaseLedger.getId(), products);
// 4. 杞崲 DTO
PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
@@ -908,7 +914,57 @@
if (dbProduct.getProductModelId() == null) {
throw new ServiceException("鍏ュ簱澶辫触,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍏ュ簱");
}
+ BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
+ if (orderQty.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,閲囪喘浜у搧鏁伴噺寮傚父");
+ }
+ // 闇�瑕佽川妫�锛氭壂鐮佸叆搴撹繘鍏ュ師鏉愭枡妫�楠岋紝涓嶇洿鎺ュ叆鍚堟牸搴撳瓨
+ if (Boolean.TRUE.equals(dbProduct.getIsChecked())) {
+ // 瀛樺湪鏈�氳繃/鏈鐞嗙殑鍘熸潗鏂欐楠屽崟锛屽垯绂佹缁х画鎵爜鍏ュ簱
+ Long pendingInspectCount = qualityInspectMapper.selectCount(new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getInspectType, 0)
+ .eq(QualityInspect::getPurchaseLedgerId, purchaseId)
+ .eq(QualityInspect::getProductModelId, dbProduct.getProductModelId())
+ .and(w -> w
+ .isNull(QualityInspect::getInspectState)
+ .or(q0 -> q0.eq(QualityInspect::getInspectState, 0))
+ // inspect_state=1 涔熻涓衡�滄湭澶勭悊鈥�
+ .or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
+ .isNull(QualityInspect::getCheckResult))));
+ if (pendingInspectCount != null && pendingInspectCount > 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,瀛樺湪鏈�氳繃鎴栨湭澶勭悊鐨勮川妫�璁板綍,璇峰厛澶勭悊鍚庡啀鎵爜鍏ュ簱");
+ }
+ // 闇�瑕佽川妫�鏃讹紝鎸夆�滃緟妫�/宸插悎鏍尖�濈殑妫�楠屾暟閲忔帶鍒舵壂鐮佷笂闄�
+ BigDecimal inspectQty = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getInspectType, 0)
+ .eq(QualityInspect::getPurchaseLedgerId, purchaseId)
+ .eq(QualityInspect::getProductModelId, dbProduct.getProductModelId())
+ .and(w -> w
+ .isNull(QualityInspect::getInspectState)
+ .or(q0 -> q0.eq(QualityInspect::getInspectState, 0))
+ .or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
+ .and(r -> r.isNull(QualityInspect::getCheckResult)
+ .or()
+ .eq(QualityInspect::getCheckResult, "鍚堟牸")))))
+ .stream()
+ .map(QualityInspect::getQuantity)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (inspectQty.add(inboundThisLine).compareTo(orderQty) > 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,鎵爜鍚堟牸鍏ュ簱鏁伴噺涓嶈兘瓒呰繃閲囪喘浜у搧鏁伴噺");
+ }
+ SalesLedgerProduct scanInspectProduct = new SalesLedgerProduct();
+ BeanUtils.copyProperties(dbProduct, scanInspectProduct);
+ scanInspectProduct.setQuantity(inboundThisLine);
+ addQualityInspect(purchaseLedger, scanInspectProduct);
+ continue;
+ }
+
+ // 涓嶉渶瑕佽川妫�锛氭壂鐮佺洿鎺ュ叆搴擄紙鍏佽澶氬叆搴擄紝涓嶅仛涓婇檺闄愬埗锛�
BigDecimal oldStocked = dbProduct.getStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getStockedQuantity();
+ if (oldStocked.add(inboundThisLine).compareTo(orderQty) > 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,鎵爜鍚堟牸鍏ュ簱鏁伴噺涓嶈兘瓒呰繃閲囪喘浜у搧鏁伴噺");
+ }
BigDecimal newStocked = oldStocked.add(inboundThisLine);
StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -920,7 +976,6 @@
stockInventoryDto.setSalesLedgerProductId(dbProduct.getId());
stockInventoryService.addstockInventory(stockInventoryDto);
- BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
int lineStockStatus;
if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
lineStockStatus = 0;
@@ -934,6 +989,7 @@
dbProduct.fillRemainingQuantity();
salesLedgerProductMapper.updateById(dbProduct);
}
+ refreshPurchaseLedgerStockStatus(purchaseLedger.getId());
}
@Override
@@ -1051,7 +1107,28 @@
throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍏ュ簱");
}
stockUtils.addUnStock(null, null, dbProduct.getProductModelId(), inboundThisLine,
- StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
+ Boolean.TRUE.equals(dbProduct.getIsChecked())
+ ? StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_QUALITY_UNSTOCK_IN.getCode()
+ : StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(),
+ dbProduct.getId());
+
+ // 閲囪喘涓嶅悎鏍煎叆搴撳悗锛岃嚜鍔ㄨ繘鍏ヤ笉鍚堟牸绠＄悊锛岀瓑寰呯敤鎴峰鐞�
+ QualityUnqualified qualityUnqualified = new QualityUnqualified();
+ qualityUnqualified.setInspectType(0); // 鍘熸潗鏂欎笉鍚堟牸
+ qualityUnqualified.setInspectState(0); // 寰呭鐞�
+ qualityUnqualified.setCheckTime(new Date());
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (loginUser != null && loginUser.getUser() != null) {
+ qualityUnqualified.setCheckName(loginUser.getUser().getNickName());
+ }
+ qualityUnqualified.setProductId(dbProduct.getProductId());
+ qualityUnqualified.setProductModelId(dbProduct.getProductModelId());
+ qualityUnqualified.setProductName(dbProduct.getProductCategory());
+ qualityUnqualified.setModel(dbProduct.getSpecificationModel());
+ qualityUnqualified.setUnit(dbProduct.getUnit());
+ qualityUnqualified.setQuantity(inboundThisLine);
+ qualityUnqualified.setDefectivePhenomena("閲囪喘璁㈠崟鎵爜涓嶅悎鏍煎叆搴擄紝寰呭鐞�");
+ qualityUnqualifiedMapper.insert(qualityUnqualified);
BigDecimal oldUnStocked = dbProduct.getUnqualifiedStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getUnqualifiedStockedQuantity();
dbProduct.setUnqualifiedStockedQuantity(oldUnStocked.add(inboundThisLine));
@@ -1124,6 +1201,105 @@
}
}
+ private void applyQualityInboundToProducts(Long purchaseLedgerId, List<SalesLedgerProduct> products) {
+ if (CollectionUtils.isEmpty(products)) {
+ return;
+ }
+ Map<Long, BigDecimal> qualityInboundQtyByLine = getQualifiedInspectInboundQtyByLine(purchaseLedgerId);
+ for (SalesLedgerProduct product : products) {
+ product.fillRemainingQuantity();
+ if (!Boolean.TRUE.equals(product.getIsChecked())) {
+ continue;
+ }
+ BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
+ BigDecimal scanInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
+ BigDecimal qualityInboundQty = qualityInboundQtyByLine.getOrDefault(product.getId(), BigDecimal.ZERO);
+ BigDecimal totalQualifiedInbound = qualityInboundQty.add(scanInboundQty);
+ BigDecimal remainingInbound = orderQty.subtract(totalQualifiedInbound);
+ product.setRemainingQuantity(remainingInbound.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remainingInbound);
+ BigDecimal shippedQty = product.getShippedQuantity() == null ? BigDecimal.ZERO : product.getShippedQuantity();
+ BigDecimal remainingShipped = totalQualifiedInbound.subtract(shippedQty);
+ product.setRemainingShippedQuantity(remainingShipped.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remainingShipped);
+ }
+ }
+
+ private Map<Long, BigDecimal> getQualifiedInspectInboundQtyByLine(Long purchaseLedgerId) {
+ Map<Long, BigDecimal> qualityInboundByModel = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getInspectType, 0)
+ .eq(QualityInspect::getPurchaseLedgerId, purchaseLedgerId)
+ .eq(QualityInspect::getInspectState, 1)
+ .eq(QualityInspect::getCheckResult, "鍚堟牸"))
+ .stream()
+ .filter(qualityInspect -> qualityInspect.getProductModelId() != null && qualityInspect.getQuantity() != null)
+ .collect(Collectors.groupingBy(QualityInspect::getProductModelId,
+ Collectors.reducing(BigDecimal.ZERO, QualityInspect::getQuantity, BigDecimal::add)));
+ if (qualityInboundByModel.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ List<SalesLedgerProduct> purchaseProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
+ .eq(SalesLedgerProduct::getType, PURCHASE.getCode()));
+ Map<Long, BigDecimal> qualityInboundByLine = new HashMap<>();
+ for (SalesLedgerProduct product : purchaseProducts) {
+ if (product.getId() == null || product.getProductModelId() == null) {
+ continue;
+ }
+ qualityInboundByLine.put(product.getId(), qualityInboundByModel.getOrDefault(product.getProductModelId(), BigDecimal.ZERO));
+ }
+ return qualityInboundByLine;
+ }
+
+ private void refreshPurchaseLedgerStockStatus(Long purchaseLedgerId) {
+ if (purchaseLedgerId == null) {
+ return;
+ }
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
+ .eq(SalesLedgerProduct::getType, PURCHASE.getCode()));
+ if (CollectionUtils.isEmpty(products)) {
+ return;
+ }
+ Map<Long, BigDecimal> qualityInboundQtyByLine = getQualifiedInspectInboundQtyByLine(purchaseLedgerId);
+ boolean allInbound = true;
+ boolean anyInbound = false;
+ for (SalesLedgerProduct product : products) {
+ BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
+ BigDecimal scanInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
+ BigDecimal qualityInboundQty = qualityInboundQtyByLine.getOrDefault(product.getId(), BigDecimal.ZERO);
+ BigDecimal totalInboundQty = scanInboundQty.add(qualityInboundQty);
+ if (totalInboundQty.compareTo(BigDecimal.ZERO) > 0) {
+ anyInbound = true;
+ }
+ if (totalInboundQty.compareTo(orderQty) < 0) {
+ allInbound = false;
+ }
+ }
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerId);
+ if (purchaseLedger == null) {
+ return;
+ }
+ int targetStockStatus = allInbound ? 2 : (anyInbound ? 1 : 0);
+ if (!Objects.equals(purchaseLedger.getStockStatus(), targetStockStatus)) {
+ purchaseLedger.setStockStatus(targetStockStatus);
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
+
+ private Integer calculateProductStockStatus(SalesLedgerProduct product) {
+ if (product == null) {
+ return 0;
+ }
+ BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
+ BigDecimal stockedQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
+ if (stockedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return 0;
+ }
+ if (orderQty.compareTo(BigDecimal.ZERO) > 0 && stockedQty.compareTo(orderQty) < 0) {
+ return 1;
+ }
+ return 2;
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3