From 9850352a79244c17f9b7343f85f5abd88227a128 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 10:03:32 +0800
Subject: [PATCH] feat: 已发货导入新增出厂检验数据
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 145 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 142 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 9424ebd..53b8506 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -49,6 +49,13 @@
import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityInspectParamMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
@@ -139,6 +146,9 @@
private final ProductionProductOutputMapper productionProductOutputMapper;
private final ProductionProductInputMapper productionProductInputMapper;
private final QualityInspectMapper qualityInspectMapper;
+ private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final QualityTestStandardMapper qualityTestStandardMapper;
+ private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
private final RedisTemplate<String, String> redisTemplate;
private final ISalesLedgerProductProcessService salesLedgerProductProcessService;
@@ -1867,6 +1877,12 @@
if (selectedProduct.getProductModelId() == null) {
throw new ServiceException("鍏ュ簱澶辫触,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍏ュ簱");
}
+ BigDecimal orderQty = selectedProduct.getQuantity() == null ? BigDecimal.ZERO : selectedProduct.getQuantity();
+ BigDecimal qualifiedStocked = selectedProduct.getStockedQuantity() == null ? BigDecimal.ZERO : selectedProduct.getStockedQuantity();
+ BigDecimal inboundQty = inboundQtyByLineId.getOrDefault(selectedProduct.getId(), BigDecimal.ZERO);
+ if (inboundQty.compareTo(BigDecimal.ZERO) > 0 && qualifiedStocked.add(inboundQty).compareTo(orderQty) > 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,鍚堟牸鍏ュ簱鏁伴噺涔嬪拰涓嶈兘澶т簬璁㈠崟鏁伴噺");
+ }
}
String approveUserIds = resolveApproveUserIds(dto.getApproveUserIds(), salesLedger.getId(), INBOUND_BIZ_TYPE_SCAN_QUALIFIED);
if (StringUtils.isEmpty(approveUserIds)) {
@@ -1924,6 +1940,10 @@
}
BigDecimal oldStocked = dbProduct.getStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getStockedQuantity();
BigDecimal newStocked = oldStocked.add(inboundThisLine);
+ BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
+ if (newStocked.compareTo(orderQty) > 0) {
+ throw new ServiceException("鍏ュ簱澶辫触,鍚堟牸鍏ュ簱鏁伴噺涔嬪拰涓嶈兘澶т簬璁㈠崟鏁伴噺");
+ }
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(dbProduct.getId());
@@ -1934,7 +1954,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;
@@ -2005,6 +2024,20 @@
if (selectedProduct.getProductModelId() == null) {
throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍏ュ簱");
}
+ BigDecimal orderQty = selectedProduct.getQuantity() == null ? BigDecimal.ZERO : selectedProduct.getQuantity();
+ BigDecimal qualifiedStocked = selectedProduct.getStockedQuantity() == null ? BigDecimal.ZERO : selectedProduct.getStockedQuantity();
+ BigDecimal unqualifiedStocked = selectedProduct.getUnqualifiedStockedQuantity() == null ? BigDecimal.ZERO : selectedProduct.getUnqualifiedStockedQuantity();
+ BigDecimal inboundQty = inboundQtyByLineId.getOrDefault(selectedProduct.getId(), BigDecimal.ZERO);
+ BigDecimal remainForUnqualified = orderQty.subtract(qualifiedStocked);
+ if (remainForUnqualified.compareTo(BigDecimal.ZERO) <= 0 && inboundQty.compareTo(BigDecimal.ZERO) > 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,璇ヤ骇鍝佸凡鏃犲彲鍏ヤ笉鍚堟牸搴撴暟閲�");
+ }
+ if (inboundQty.compareTo(BigDecimal.ZERO) > 0 && unqualifiedStocked.add(inboundQty).compareTo(orderQty) > 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,涓嶅悎鏍煎叆搴撴暟閲忎箣鍜屼笉鑳藉ぇ浜庤鍗曟暟閲�");
+ }
+ if (inboundQty.compareTo(BigDecimal.ZERO) > 0 && unqualifiedStocked.add(inboundQty).compareTo(remainForUnqualified) > 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,涓嶅悎鏍煎叆搴撴暟閲忎笉鑳藉ぇ浜庤鍗曟暟閲忓噺鍘诲悎鏍煎叆搴撴暟閲�");
+ }
}
String approveUserIds = resolveApproveUserIds(dto.getApproveUserIds(), salesLedger.getId(), INBOUND_BIZ_TYPE_SCAN_UNQUALIFIED);
if (StringUtils.isEmpty(approveUserIds)) {
@@ -2060,9 +2093,22 @@
if (dbProduct.getProductModelId() == null) {
throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍏ュ簱");
}
- stockUtils.addUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), inboundThisLine, StockInUnQualifiedRecordTypeEnum.SALES_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
+ BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
+ BigDecimal qualifiedStocked = dbProduct.getStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getStockedQuantity();
BigDecimal oldUnStocked = dbProduct.getUnqualifiedStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getUnqualifiedStockedQuantity();
- dbProduct.setUnqualifiedStockedQuantity(oldUnStocked.add(inboundThisLine));
+ BigDecimal newUnStocked = oldUnStocked.add(inboundThisLine);
+ BigDecimal remainForUnqualified = orderQty.subtract(qualifiedStocked);
+ if (remainForUnqualified.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,璇ヤ骇鍝佸凡鏃犲彲鍏ヤ笉鍚堟牸搴撴暟閲�");
+ }
+ if (newUnStocked.compareTo(orderQty) > 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,涓嶅悎鏍煎叆搴撴暟閲忎箣鍜屼笉鑳藉ぇ浜庤鍗曟暟閲�");
+ }
+ if (newUnStocked.compareTo(remainForUnqualified) > 0) {
+ throw new ServiceException("涓嶅悎鏍煎叆搴撳け璐�,涓嶅悎鏍煎叆搴撴暟閲忎笉鑳藉ぇ浜庤鍗曟暟閲忓噺鍘诲悎鏍煎叆搴撴暟閲�");
+ }
+ stockUtils.addUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), inboundThisLine, StockInUnQualifiedRecordTypeEnum.SALES_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
+ dbProduct.setUnqualifiedStockedQuantity(newUnStocked);
dbProduct.fillRemainingQuantity();
salesLedgerProductMapper.updateById(dbProduct);
}
@@ -2278,10 +2324,28 @@
if (dbProduct.getProductModelId() == null) {
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]浜у搧瑙勬牸鏈淮鎶�,鏃犳硶琛ュ綍鍑哄簱");
}
+ // 鍘嗗彶宸插彂璐цˉ褰曪細鐩存帴鍐欏叆鍏ュ簱+鍑哄簱璁板綍
+ stockUtils.addStock(
+ ledger.getId(),
+ dbProduct.getId(),
+ dbProduct.getProductModelId(),
+ allocQty,
+ StockInQualifiedRecordTypeEnum.SALE_STOCK_IN.getCode(),
+ dbProduct.getId()
+ );
+ stockUtils.substractStock(
+ ledger.getId(),
+ dbProduct.getId(),
+ dbProduct.getProductModelId(),
+ allocQty,
+ StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
+ dbProduct.getId()
+ );
BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
BigDecimal newShipped = oldShipped.add(allocQty);
dbProduct.setStockedQuantity(defaultDecimal(dbProduct.getQuantity()));
dbProduct.setShippedQuantity(newShipped);
+ dbProduct.setApproveStatus(3);
updateProductStockStatus(dbProduct);
dbProduct.fillRemainingQuantity();
updateProductShipStatus(dbProduct);
@@ -2300,6 +2364,7 @@
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]瀛樺湪閲嶅鍙戣揣璁板綍,璇峰嬁閲嶅瀵煎叆");
}
shippingInfoMapper.insert(shippingInfo);
+ createShippingQualityInspect(ledger, dbProduct, row, allocQty);
}
}
@@ -2309,9 +2374,16 @@
BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
return shipped.compareTo(qty) >= 0;
});
+ boolean anyInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().anyMatch(p -> defaultDecimal(p.getStockedQuantity()).compareTo(BigDecimal.ZERO) > 0);
+ boolean allInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
+ BigDecimal qty = defaultDecimal(p.getQuantity());
+ BigDecimal stocked = defaultDecimal(p.getStockedQuantity());
+ return qty.compareTo(BigDecimal.ZERO) <= 0 || stocked.compareTo(qty) >= 0;
+ });
if (allShipped && rowList.get(0).getReportDate() != null) {
ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
}
+ ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
ledger.setDeliveryStatus(allShipped ? 5 : 1);
salesLedgerMapper.updateById(ledger);
}
@@ -2796,4 +2868,71 @@
String subCategory = StringUtils.hasText(row.getProductSubCategory()) ? row.getProductSubCategory().trim() : "";
return ledgerId + "|" + subCategory + "|" + shippingNo + "|" + dateStr + "|" + defaultDecimal(row.getQuantity());
}
+
+ private void createShippingQualityInspect(SalesLedger ledger, SalesLedgerProduct dbProduct, SalesShippingImportDto row, BigDecimal inspectQty) {
+ if (ledger == null || dbProduct == null || inspectQty == null || inspectQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ Date checkDate = row.getReportDate() != null ? row.getReportDate() : new Date();
+ QualityInspect qualityInspect = new QualityInspect();
+ qualityInspect.setInspectType(2);
+ qualityInspect.setCheckTime(checkDate);
+ qualityInspect.setCustomer(StringUtils.hasText(ledger.getCustomerName()) ? ledger.getCustomerName() : row.getCustomerName());
+ qualityInspect.setCheckName(StringUtils.hasText(row.getCreator()) ? row.getCreator().trim() : null);
+ qualityInspect.setProductId(dbProduct.getProductId());
+ qualityInspect.setProductName(dbProduct.getProductCategory());
+ qualityInspect.setModel(dbProduct.getSpecificationModel());
+ qualityInspect.setUnit(resolveInspectUnit(dbProduct));
+ qualityInspect.setQuantity(inspectQty);
+ qualityInspect.setCheckResult("鍚堟牸");
+ qualityInspect.setInspectState(1);
+ qualityInspect.setApprovalStatus(1);
+ qualityInspect.setProductModelId(dbProduct.getProductModelId());
+
+ QualityTestStandard selectedStandard = null;
+ if (dbProduct.getProductId() != null) {
+ List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
+ if (CollectionUtils.isNotEmpty(standards)) {
+ selectedStandard = standards.get(0);
+ qualityInspect.setTestStandardId(selectedStandard.getId());
+ }
+ }
+ qualityInspectMapper.insert(qualityInspect);
+
+ if (selectedStandard == null || selectedStandard.getId() == null) {
+ return;
+ }
+ List<QualityTestStandardParam> standardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, selectedStandard.getId()));
+ if (CollectionUtils.isEmpty(standardParams)) {
+ return;
+ }
+ List<QualityInspectParam> inspectParams = standardParams.stream().map(item -> {
+ QualityInspectParam param = new QualityInspectParam();
+ param.setInspectId(qualityInspect.getId());
+ param.setParameterItem(item.getParameterItem());
+ param.setUnit(item.getUnit());
+ param.setStandardValue(item.getStandardValue());
+ param.setControlValue(item.getControlValue());
+ param.setTestValue("鏃犵憰鐤�");
+ return param;
+ }).collect(Collectors.toList());
+ inspectParams.forEach(qualityInspectParamMapper::insert);
+ }
+
+ private String resolveInspectUnit(SalesLedgerProduct dbProduct) {
+ if (dbProduct == null) {
+ return null;
+ }
+ if (StringUtils.hasText(dbProduct.getUnit())) {
+ return dbProduct.getUnit();
+ }
+ if (dbProduct.getProductModelId() == null) {
+ return null;
+ }
+ ProductModel productModel = productModelMapper.selectById(dbProduct.getProductModelId());
+ if (productModel == null || !StringUtils.hasText(productModel.getUnit())) {
+ return null;
+ }
+ return productModel.getUnit();
+ }
}
--
Gitblit v1.9.3