From 6ef4265f1859e88e3e5ff22ef1848e12fa849e26 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 12 五月 2026 07:03:43 +0800
Subject: [PATCH] feat: 扫码出库修改为扫码发货
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 536 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 528 insertions(+), 8 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 c9e8734..61777bb 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -11,6 +12,9 @@
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.common.enums.ApproveTypeEnum;
import com.ruoyi.basic.mapper.CustomerMapper;
@@ -31,6 +35,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
+import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -49,6 +54,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 +151,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;
@@ -465,9 +480,10 @@
salesLedger.setReceiptPaymentAmountTotal(receiptPaymentAmountTotal);
salesLedger.setNoReceiptAmount(noReceiptPaymentAmountTotal);
- boolean hasInvoiceOperation = invoiceTotal.compareTo(BigDecimal.ZERO) > 0;
- boolean hasReceiptOperation = receiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) > 0;
- salesLedger.setIsEdit(!(hasInvoiceOperation || hasReceiptOperation));
+ boolean isFh = salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 5;
+ salesLedger.setIsFh(isFh);
+
+ salesLedger.setIsEdit(!isFh);
}
if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {
@@ -713,9 +729,9 @@
product.setRegisterDate(LocalDateTime.now());
// 鍙戣揣淇℃伅
ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerProductId, product.getId()).orderByDesc(ShippingInfo::getCreateTime).last("limit 1"));
- product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
- product.setShippingDate(shippingInfo.getShippingDate());
if (shippingInfo != null) {
+ product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+ product.setShippingDate(shippingInfo.getShippingDate());
product.setShippingStatus(shippingInfo.getStatus());
}
}
@@ -1866,6 +1882,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)) {
@@ -1923,6 +1945,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());
@@ -1933,7 +1959,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;
@@ -2004,6 +2029,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)) {
@@ -2059,9 +2098,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);
}
@@ -2098,9 +2150,13 @@
if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 5) {
throw new ServiceException("鍑哄簱澶辫触,璇ラ攢鍞鍗曞凡鍙戣揣");
}
+ if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 2) {
+ throw new ServiceException("鍑哄簱澶辫触,璇ラ攢鍞鍗曞凡鍙戣捣鍙戣揣瀹℃壒,璇峰厛瀹屾垚瀹℃壒");
+ }
if (CollectionUtils.isEmpty(dto.getSalesLedgerProductList())) {
throw new ServiceException("閿�鍞鍗曞嚭搴撳け璐�,鍑哄簱浜у搧涓嶈兘涓虹┖");
}
+ String scanShippingNo = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SCAN");
int saleType = SaleEnum.SALE.getCode();
Map<Long, BigDecimal> outboundQtyByLineId = new LinkedHashMap<>();
for (SalesLedgerProduct line : dto.getSalesLedgerProductList()) {
@@ -2133,6 +2189,11 @@
if (dbProduct.getProductModelId() == null) {
throw new ServiceException("鍑哄簱澶辫触,浜у搧瑙勬牸鏈淮鎶�,鏃犳硶鍑哄簱");
}
+ BigDecimal orderQty = defaultDecimal(dbProduct.getQuantity());
+ BigDecimal prevShipped = defaultDecimal(dbProduct.getShippedQuantity());
+ if (prevShipped.add(outboundThisLine).compareTo(orderQty) > 0) {
+ throw new ServiceException("鍑哄簱澶辫触,鏈鍑哄簱鍚庣疮璁″彂璐ф暟閲忎笉鑳藉ぇ浜庤浜у搧璁㈠崟鏁伴噺");
+ }
stockUtils.assertQualifiedAvailable(dbProduct.getProductModelId(), outboundThisLine);
StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -2156,7 +2217,74 @@
});
boolean allLinesFull = ledgerAllProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
salesLedger.setStockStatus(allLinesFull ? 2 : (anyInbound ? 1 : 0));
+ List<SalesLedgerProduct> saleLines = ledgerAllProducts.stream()
+ .filter(p -> Objects.equals(p.getType(), saleType))
+ .collect(Collectors.toList());
+ boolean allDelivered = !saleLines.isEmpty() && saleLines.stream().allMatch(p -> {
+ BigDecimal q = defaultDecimal(p.getQuantity());
+ BigDecimal s = defaultDecimal(p.getShippedQuantity());
+ return q.compareTo(BigDecimal.ZERO) <= 0 || s.compareTo(q) >= 0;
+ });
+ if (allDelivered) {
+ salesLedger.setDeliveryStatus(5);
+ } else {
+ boolean anyLineShipped = saleLines.stream()
+ .anyMatch(p -> defaultDecimal(p.getShippedQuantity()).compareTo(BigDecimal.ZERO) > 0);
+ if (anyLineShipped) {
+ salesLedger.setDeliveryStatus(6);
+ }
+ }
baseMapper.updateById(salesLedger);
+ syncShippingLedgerAfterQualifiedScan(ledgerId, scanShippingNo);
+ }
+
+ /**
+ * 鎵爜鍚堟牸鍑哄簱鍚庡悓姝ュ彂璐у彴璐﹁褰�
+ */
+ private void syncShippingLedgerAfterQualifiedScan(Long ledgerId, String shippingBatchNo) {
+ if (shippingBatchNo == null) {
+ shippingBatchNo = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SCAN");
+ }
+ int saleType = SaleEnum.SALE.getCode();
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, ledgerId)
+ .eq(SalesLedgerProduct::getType, saleType));
+ Date now = new Date();
+ for (SalesLedgerProduct p : products) {
+ if (p.getShippedQuantity() == null || p.getShippedQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ ShippingInfo row = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerProductId, p.getId())
+ .orderByDesc(ShippingInfo::getId)
+ .last("LIMIT 1"));
+ BigDecimal lineQty = defaultDecimal(p.getQuantity());
+ BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
+ boolean lineFullyShipped = lineQty.compareTo(BigDecimal.ZERO) <= 0 || shipped.compareTo(lineQty) >= 0;
+ String lineShipStatus = lineFullyShipped ? "宸插彂璐�" : "閮ㄥ垎鍙戣揣";
+
+ if (row == null) {
+ ShippingInfo insert = new ShippingInfo();
+ insert.setSalesLedgerId(ledgerId);
+ insert.setSalesLedgerProductId(p.getId());
+ insert.setShippingNo(shippingBatchNo);
+ insert.setType("鎵爜鍑哄簱");
+ insert.setStatus(lineShipStatus);
+ insert.setShippingDate(now);
+ shippingInfoMapper.insert(insert);
+ } else {
+ if (!StringUtils.hasText(row.getType())) {
+ row.setType("鎵爜鍑哄簱");
+ }
+ row.setStatus(lineShipStatus);
+ row.setShippingDate(now);
+ if (!StringUtils.hasText(row.getShippingNo())) {
+ row.setShippingNo(shippingBatchNo);
+ }
+ shippingInfoMapper.updateById(row);
+ }
+ }
}
@Override
@@ -2277,10 +2405,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);
@@ -2299,6 +2445,7 @@
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]瀛樺湪閲嶅鍙戣揣璁板綍,璇峰嬁閲嶅瀵煎叆");
}
shippingInfoMapper.insert(shippingInfo);
+ createShippingQualityInspect(ledger, dbProduct, row, allocQty);
}
}
@@ -2308,9 +2455,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);
}
@@ -2795,4 +2949,370 @@
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();
+ }
+
+ private static final String SCAN_SHIP_REMARK_PREFIX = "SCAN_SHIP_DELIVERY_JSON:";
+
+ private static final class ScanShipPayload {
+ private String shippingNo;
+ private Long ledgerId;
+ private String car;
+ private String express;
+ private String shipType;
+ private Map<Long, BigDecimal> linesQty = new LinkedHashMap<>();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void scanShipApply(SalesScanShipDto dto) {
+ if (dto == null || dto.getSalesLedgerId() == null) {
+ throw new ServiceException("鎵爜鍙戣揣澶辫触锛岃鍗曚笉鑳戒负绌�");
+ }
+ if (StringUtils.isEmpty(dto.getApproveUserIds())) {
+ throw new ServiceException("璇烽�夋嫨瀹℃壒浜�");
+ }
+ if (CollectionUtils.isEmpty(dto.getSalesLedgerProductList())) {
+ throw new ServiceException("璇峰～鍐欏彂璐т骇鍝佽");
+ }
+ String shipType = StringUtils.hasText(dto.getShipType()) ? dto.getShipType().trim() : "璐ц溅";
+ if ("璐ц溅".equals(shipType)) {
+ if (!StringUtils.hasText(dto.getShippingCarNumber())) {
+ throw new ServiceException("璇峰～鍐欒溅鐗屽彿");
+ }
+ } else if ("蹇��".equals(shipType)) {
+ if (!StringUtils.hasText(dto.getExpressNumber())) {
+ throw new ServiceException("璇峰～鍐欏揩閫掑崟鍙�");
+ }
+ }
+ SalesLedger salesLedger = baseMapper.selectById(dto.getSalesLedgerId());
+ if (salesLedger == null) {
+ throw new ServiceException("閿�鍞鍗曚笉瀛樺湪");
+ }
+ if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 5) {
+ throw new ServiceException("璇ラ攢鍞鍗曞凡鍙戣揣");
+ }
+ if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 2) {
+ throw new ServiceException("璇ラ攢鍞鍗曞凡鍙戣捣鍙戣揣瀹℃壒锛岃鍏堝畬鎴愬鎵�");
+ }
+ List<SalesLedgerProduct> notStocked = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId())
+ .eq(SalesLedgerProduct::getType, 1)
+ .ne(SalesLedgerProduct::getProductStockStatus, 2));
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(notStocked)) {
+ throw new ServiceException("鍙戣揣澶辫触,璇ラ攢鍞鍗曞瓨鍦ㄦ湭鍏ュ簱浜у搧,璇峰厛瀹屾垚鍏ㄩ儴鍏ュ簱鍚庡啀鍙戣揣");
+ }
+ int saleType = SaleEnum.SALE.getCode();
+ Map<Long, BigDecimal> shipQtyByLineId = new LinkedHashMap<>();
+ for (SalesLedgerProduct line : dto.getSalesLedgerProductList()) {
+ if (line == null || line.getId() == null) {
+ throw new ServiceException("浜у搧淇℃伅涓嶅畬鏁�");
+ }
+ BigDecimal q = line.getStockedQuantity();
+ if (q == null) {
+ throw new ServiceException("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
+ }
+ if (q.compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException("鍙戣揣鏁伴噺涓嶈兘涓鸿礋鏁�");
+ }
+ shipQtyByLineId.merge(line.getId(), q, BigDecimal::add);
+ }
+ boolean anyPositive = shipQtyByLineId.values().stream().anyMatch(v -> v.compareTo(BigDecimal.ZERO) > 0);
+ if (!anyPositive) {
+ throw new ServiceException("璇疯嚦灏戝～鍐欎竴琛屽ぇ浜� 0 鐨勫彂璐ф暟閲�");
+ }
+ Long ledgerId = salesLedger.getId();
+ for (Map.Entry<Long, BigDecimal> entry : shipQtyByLineId.entrySet()) {
+ if (entry.getValue().compareTo(BigDecimal.ZERO) == 0) {
+ continue;
+ }
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectById(entry.getKey());
+ if (dbProduct == null) {
+ throw new ServiceException("閿�鍞骇鍝佷笉瀛樺湪");
+ }
+ if (!Objects.equals(dbProduct.getSalesLedgerId(), ledgerId) || !Objects.equals(dbProduct.getType(), saleType)) {
+ throw new ServiceException("閿�鍞骇鍝佷笌璁㈠崟涓嶅尮閰�");
+ }
+ if (dbProduct.getProductModelId() == null) {
+ throw new ServiceException("浜у搧瑙勬牸鏈淮鎶わ紝鏃犳硶鍙戣揣");
+ }
+ BigDecimal orderQty = defaultDecimal(dbProduct.getQuantity());
+ BigDecimal prevShipped = defaultDecimal(dbProduct.getShippedQuantity());
+ if (prevShipped.add(entry.getValue()).compareTo(orderQty) > 0) {
+ throw new ServiceException("绱鍙戣揣鏁伴噺涓嶈兘澶т簬璇ヤ骇鍝佽鍗曟暟閲�");
+ }
+ stockUtils.assertQualifiedAvailable(dbProduct.getProductModelId(), entry.getValue());
+ }
+ String shNo = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");
+ Map<Long, BigDecimal> positiveLines = new LinkedHashMap<>();
+ for (Map.Entry<Long, BigDecimal> e : shipQtyByLineId.entrySet()) {
+ if (e.getValue().compareTo(BigDecimal.ZERO) > 0) {
+ positiveLines.put(e.getKey(), e.getValue());
+ }
+ }
+ for (Map.Entry<Long, BigDecimal> e : positiveLines.entrySet()) {
+ ShippingInfo si = new ShippingInfo();
+ si.setSalesLedgerId(ledgerId);
+ si.setSalesLedgerProductId(e.getKey());
+ si.setShippingNo(shNo);
+ si.setStatus("寰呭鏍�");
+ si.setType(shipType);
+ if ("璐ц溅".equals(shipType)) {
+ si.setShippingCarNumber(dto.getShippingCarNumber().trim());
+ }
+ if ("蹇��".equals(shipType)) {
+ si.setExpressNumber(dto.getExpressNumber().trim());
+ }
+ shippingInfoMapper.insert(si);
+ }
+ String remarkJson = buildScanShipRemarkJson(shNo, ledgerId, dto, positiveLines);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(7);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason("鍙戣揣瀹℃壒:" + salesLedger.getSalesContractNo());
+ approveProcessVO.setApproveRemark(remarkJson);
+ approveProcessVO.setApproveUserIds(dto.getApproveUserIds().trim());
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessVO.setTempFileIds(dto.getTempFileIds());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ } catch (Exception e) {
+ throw new ServiceException("鍙戣捣鍙戣揣瀹℃壒澶辫触: " + e.getMessage());
+ }
+ salesLedger.setDeliveryStatus(2);
+ baseMapper.updateById(salesLedger);
+ }
+
+ private String buildScanShipRemarkJson(String shippingNo, Long ledgerId, SalesScanShipDto dto, Map<Long, BigDecimal> lines) {
+ try {
+ ObjectMapper om = new ObjectMapper();
+ ObjectNode root = om.createObjectNode();
+ root.put("shippingNo", shippingNo);
+ root.put("ledgerId", ledgerId);
+ root.put("car", dto.getShippingCarNumber() == null ? "" : dto.getShippingCarNumber().trim());
+ root.put("express", dto.getExpressNumber() == null ? "" : dto.getExpressNumber().trim());
+ root.put("shipType", dto.getShipType() == null ? "璐ц溅" : dto.getShipType().trim());
+ ObjectNode linesNode = om.createObjectNode();
+ for (Map.Entry<Long, BigDecimal> e : lines.entrySet()) {
+ linesNode.put(String.valueOf(e.getKey()), e.getValue().stripTrailingZeros().toPlainString());
+ }
+ root.set("lines", linesNode);
+ return SCAN_SHIP_REMARK_PREFIX + om.writeValueAsString(root);
+ } catch (Exception e) {
+ throw new ServiceException("鏋勫缓鍙戣揣瀹℃壒鍙傛暟澶辫触");
+ }
+ }
+
+ private ScanShipPayload parseScanShipPayload(String remark) {
+ if (!StringUtils.hasText(remark) || !remark.startsWith(SCAN_SHIP_REMARK_PREFIX)) {
+ return null;
+ }
+ try {
+ String json = remark.substring(SCAN_SHIP_REMARK_PREFIX.length());
+ ObjectMapper om = new ObjectMapper();
+ JsonNode n = om.readTree(json);
+ ScanShipPayload p = new ScanShipPayload();
+ p.shippingNo = n.path("shippingNo").asText(null);
+ p.ledgerId = n.path("ledgerId").asLong(0L);
+ p.car = n.path("car").asText("");
+ p.express = n.path("express").asText("");
+ p.shipType = n.path("shipType").asText("璐ц溅");
+ JsonNode lines = n.path("lines");
+ p.linesQty = new LinkedHashMap<>();
+ if (lines.isObject()) {
+ Iterator<String> it = lines.fieldNames();
+ while (it.hasNext()) {
+ String k = it.next();
+ p.linesQty.put(Long.valueOf(k), new BigDecimal(lines.get(k).asText()));
+ }
+ }
+ return p;
+ } catch (Exception e) {
+ log.warn("瑙ｆ瀽鎵爜鍙戣揣瀹℃壒澶囨敞澶辫触: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void onScanShipDeliveryApproveOutcome(ApproveProcess approveProcess, Integer outcomeStatus) {
+ if (approveProcess == null) {
+ return;
+ }
+ ScanShipPayload ctx = parseScanShipPayload(approveProcess.getApproveRemark());
+ if (ctx == null || ctx.ledgerId == null || ctx.ledgerId <= 0 || !StringUtils.hasText(ctx.shippingNo)) {
+ return;
+ }
+ if (outcomeStatus != null && outcomeStatus == 2) {
+ executeScanShipDeliveryApproved(approveProcess, ctx);
+ } else if (outcomeStatus != null && outcomeStatus == 3) {
+ updateScanShipBatchShippingStatus(ctx.ledgerId, ctx.shippingNo, "瀹℃牳鎷掔粷");
+ SalesLedger sl = baseMapper.selectById(ctx.ledgerId);
+ if (sl != null) {
+ sl.setDeliveryStatus(3);
+ baseMapper.updateById(sl);
+ }
+ } else if (outcomeStatus != null && outcomeStatus == 1) {
+ updateScanShipBatchShippingStatus(ctx.ledgerId, ctx.shippingNo, "瀹℃牳涓�");
+ }
+ }
+
+ private void updateScanShipBatchShippingStatus(Long ledgerId, String shippingNo, String statusText) {
+ if (ledgerId == null || !StringUtils.hasText(shippingNo)) {
+ return;
+ }
+ shippingInfoMapper.update(null, new UpdateWrapper<ShippingInfo>().lambda()
+ .set(ShippingInfo::getStatus, statusText)
+ .eq(ShippingInfo::getSalesLedgerId, ledgerId)
+ .eq(ShippingInfo::getShippingNo, shippingNo));
+ }
+
+ private void executeScanShipDeliveryApproved(ApproveProcess approveProcess, ScanShipPayload ctx) {
+ int saleType = SaleEnum.SALE.getCode();
+ Date now = new Date();
+ List<ShippingInfo> batch = shippingInfoMapper.selectList(Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, ctx.ledgerId)
+ .eq(ShippingInfo::getShippingNo, ctx.shippingNo));
+ if (CollectionUtils.isEmpty(batch)) {
+ log.warn("鎵爜鍙戣揣瀹℃壒閫氳繃浣嗘湭鎵惧埌鍙戣揣鍙拌处 batch ledgerId={} shippingNo={}", ctx.ledgerId, ctx.shippingNo);
+ return;
+ }
+ for (Map.Entry<Long, BigDecimal> entry : ctx.linesQty.entrySet()) {
+ Long productLineId = entry.getKey();
+ BigDecimal shipQty = entry.getValue();
+ if (shipQty == null || shipQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectById(productLineId);
+ if (dbProduct == null) {
+ throw new ServiceException("閿�鍞骇鍝佷笉瀛樺湪");
+ }
+ ShippingInfo row = batch.stream()
+ .filter(si -> Objects.equals(si.getSalesLedgerProductId(), productLineId))
+ .findFirst()
+ .orElse(null);
+ if (row == null) {
+ throw new ServiceException("鏈壘鍒板搴斿彂璐у彴璐﹁");
+ }
+ if (!"宸插彂璐�".equals(row.getStatus())) {
+ stockUtils.substractStock(ctx.ledgerId, productLineId, dbProduct.getProductModelId(), shipQty,
+ StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), row.getId());
+ BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
+ dbProduct.setShippedQuantity(oldShipped.add(shipQty));
+ dbProduct.fillRemainingQuantity();
+ salesLedgerProductMapper.updateById(dbProduct);
+ }
+ row.setStatus("宸插彂璐�");
+ row.setShippingDate(now);
+ if (StringUtils.hasText(ctx.car)) {
+ row.setShippingCarNumber(ctx.car.trim());
+ }
+ if (StringUtils.hasText(ctx.express)) {
+ row.setExpressNumber(ctx.express.trim());
+ }
+ if (StringUtils.hasText(ctx.shipType)) {
+ row.setType(ctx.shipType.trim());
+ }
+ shippingInfoMapper.updateById(row);
+ }
+ List<Long> shippingIds = batch.stream().map(ShippingInfo::getId).filter(Objects::nonNull).collect(Collectors.toList());
+ commonFileService.copyApproveProcessShipAttachmentsToShippingInfos(approveProcess.getId(), shippingIds);
+ List<SalesLedgerProduct> ledgerAllProducts = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, ctx.ledgerId));
+ SalesLedger salesLedger = baseMapper.selectById(ctx.ledgerId);
+ if (salesLedger == null) {
+ return;
+ }
+ boolean anyInbound = ledgerAllProducts.stream().anyMatch(p -> {
+ BigDecimal sq = p.getStockedQuantity();
+ return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
+ });
+ boolean allLinesFull = ledgerAllProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
+ salesLedger.setStockStatus(allLinesFull ? 2 : (anyInbound ? 1 : 0));
+ List<SalesLedgerProduct> saleLines = ledgerAllProducts.stream()
+ .filter(p -> Objects.equals(p.getType(), saleType))
+ .collect(Collectors.toList());
+ boolean allDelivered = !saleLines.isEmpty() && saleLines.stream().allMatch(p -> {
+ BigDecimal q = defaultDecimal(p.getQuantity());
+ BigDecimal s = defaultDecimal(p.getShippedQuantity());
+ return q.compareTo(BigDecimal.ZERO) <= 0 || s.compareTo(q) >= 0;
+ });
+ if (allDelivered) {
+ salesLedger.setDeliveryStatus(5);
+ } else {
+ boolean anyLineShipped = saleLines.stream()
+ .anyMatch(p -> defaultDecimal(p.getShippedQuantity()).compareTo(BigDecimal.ZERO) > 0);
+ if (anyLineShipped) {
+ salesLedger.setDeliveryStatus(6);
+ }
+ }
+ baseMapper.updateById(salesLedger);
+ }
}
--
Gitblit v1.9.3