From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 640 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 621 insertions(+), 19 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 3f24246..ac676ab 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,18 +1,20 @@
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;
-
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.ruoyi.account.service.AccountIncomeService;
+import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.common.enums.ApproveTypeEnum;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
@@ -21,34 +23,32 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.ICustomerRegionsService;
-import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.enums.SaleEnum;
-import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.EnumUtil;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProductionProductMainService;
-
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.procurementrecord.utils.StockUtils;
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.*;
@@ -58,6 +58,7 @@
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.mapper.StockInRecordMapper;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockOutRecordMapper;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.pojo.StockOutRecord;
@@ -88,8 +89,8 @@
import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.time.YearMonth;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -139,6 +140,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;
@@ -150,6 +154,7 @@
private final StockInventoryService stockInventoryService;
private final StockInRecordMapper stockInRecordMapper;
private final StockOutRecordMapper stockOutRecordMapper;
+ private final StockInventoryMapper stockInventoryMapper;
private final StockInRecordService stockInRecordService;
private final StockOutRecordService stockOutRecordService;
private final StockUtils stockUtils;
@@ -385,6 +390,7 @@
@Override
public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
+ // 娣诲姞 reviewStatus 鐨勭瓫閫夋潯浠�
IPage<SalesLedger> iPage = salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
if (CollectionUtils.isEmpty(iPage.getRecords())) {
@@ -469,6 +475,14 @@
salesLedger.setIsFh(isFh);
salesLedger.setIsEdit(!isFh);
+
+ // 鏍规嵁 reviewStatus 鎺у埗鍙嶅鐩稿叧瀛楁鐨勬樉绀�
+ if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() != 2) {
+ // 褰� reviewStatus 涓嶄负 2 鏃讹紝闅愯棌鍙嶅鏃堕棿銆佸弽瀹′汉鍜屽弽瀹′汉ID
+ salesLedger.setCounterReviewTime(null);
+ salesLedger.setCounterReviewPerson(null);
+ salesLedger.setCounterReviewPersonId(null);
+ }
}
if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {
@@ -714,9 +728,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());
}
}
@@ -887,6 +901,13 @@
} else {
if (salesLedger.getDeliveryStatus() == 5) {
throw new ServiceException("璁㈠崟宸插彂璐�,绂佹缂栬緫");
+ }
+ if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 1) {
+ salesLedger.setReviewStatus(salesLedgerDto.getReviewStatus());
+ } else if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 2) {
+ handleCounterReview(salesLedger);
+ } else {
+ salesLedger.setReviewStatus(0);
}
salesLedgerMapper.updateById(salesLedger);
}
@@ -2135,9 +2156,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()) {
@@ -2170,6 +2195,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();
@@ -2193,7 +2223,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
@@ -2354,6 +2451,7 @@
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]瀛樺湪閲嶅鍙戣揣璁板綍,璇峰嬁閲嶅瀵煎叆");
}
shippingInfoMapper.insert(shippingInfo);
+ createShippingQualityInspect(ledger, dbProduct, row, allocQty);
}
}
@@ -2857,4 +2955,508 @@
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.setQualifiedQuantity(inspectQty);
+ qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+ qualityInspect.setPassRate(BigDecimal.valueOf(100));
+ 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);
+ }
+
+
+ /**
+ * 澶勭悊閿�鍞彴璐﹀弽瀹￠�昏緫
+ * 1. 璁剧疆鍙嶅鐩稿叧淇℃伅锛堟椂闂淬�佷汉鍛橈級
+ * 2. 澶嶅埗鍘熼攢鍞彴璐﹀強浜у搧鏁版嵁锛岀敓鎴愭柊鐨勫彴璐�
+ * 3. 瀵瑰師鍙拌处鐨勫簱瀛樻暟鎹繘琛屽弽鍚戞搷浣�
+ */
+ private void handleCounterReview(SalesLedger salesLedger) {
+ // 1. 璁剧疆鍙嶅鐩稿叧淇℃伅
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ salesLedger.setCounterReviewTime(LocalDateTime.now());
+ salesLedger.setCounterReviewPerson(loginUser.getUser().getNickName());
+ salesLedger.setCounterReviewPersonId(loginUser.getUserId());
+ salesLedger.setReviewStatus(2);
+
+ Long originalSalesLedgerId = salesLedger.getId();
+
+ // 2. 鏌ヨ鍘熼攢鍞彴璐︽暟鎹�
+ SalesLedger originalLedger = salesLedgerMapper.selectById(originalSalesLedgerId);
+ if (originalLedger == null) {
+ throw new ServiceException("鍘熻鍗曚笉瀛樺湪锛屾棤娉曞弽瀹�");
+ }
+
+ // 3. 鍒涘缓鏂扮殑閿�鍞彴璐︼紝澶嶅埗鍘熷彴璐︽暟鎹�
+ SalesLedger newLedger = new SalesLedger();
+ BeanUtils.copyProperties(originalLedger, newLedger);
+ newLedger.setId(null); // 娓呯┖ID锛屽噯澶囨彃鍏ユ柊璁板綍
+ newLedger.setSalesContractNo(generateSalesContractNo()); // 鐢熸垚鏂板悎鍚屽彿
+ newLedger.setDeliveryStatus(1); // 璁剧疆涓烘湭鍙戣揣鐘舵��
+ newLedger.setStockStatus(0); // 璁剧疆涓烘湭鍏ュ簱鐘舵��
+ newLedger.setReviewStatus(0); // 璁剧疆涓烘湭瀹℃牳鐘舵��
+ newLedger.setCounterReviewTime(null); // 娓呯┖鍙嶅鏃堕棿
+ newLedger.setCounterReviewPerson(null); // 娓呯┖鍙嶅浜�
+ newLedger.setCounterReviewPersonId(null); // 娓呯┖鍙嶅浜篒D
+
+ // 4. 鎻掑叆鏂扮殑閿�鍞彴璐�
+ salesLedgerMapper.insert(newLedger);
+
+ // 5. 鏌ヨ骞跺鍒跺師鍙拌处鐨勬墍鏈変骇鍝佹暟鎹�
+ List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ for (SalesLedgerProduct originalProduct : originalProducts) {
+ // 5.1 鍒涘缓鏂颁骇鍝佽褰曪紝澶嶅埗鍘熶骇鍝佹暟鎹�
+ SalesLedgerProduct newProduct = new SalesLedgerProduct();
+ BeanUtils.copyProperties(originalProduct, newProduct);
+ newProduct.setId(null); // 娓呯┖ID锛屽噯澶囨彃鍏ユ柊璁板綍
+ newProduct.setSalesLedgerId(newLedger.getId()); // 鍏宠仈鍒版柊鐨勫彴璐D
+ newProduct.setStockedQuantity(BigDecimal.ZERO); // 宸插叆搴撴暟閲忛噸缃负0
+ newProduct.setShippedQuantity(BigDecimal.ZERO); // 宸插嚭搴撴暟閲忛噸缃负0
+ newProduct.setUnqualifiedStockedQuantity(BigDecimal.ZERO); // 涓嶅悎鏍煎叆搴撴暟閲忛噸缃负0
+ newProduct.setUnqualifiedShippedQuantity(BigDecimal.ZERO); // 涓嶅悎鏍煎嚭搴撴暟閲忛噸缃负0
+ newProduct.setReturnQuality(BigDecimal.ZERO); // 閫�璐ф暟閲忛噸缃负0
+ newProduct.setAvailableQuality(newProduct.getQuantity().subtract(newProduct.getReturnQuality())); // 閲嶆柊璁＄畻鍙敤鏁伴噺
+ newProduct.setProductStockStatus(0); // 浜у搧搴撳瓨鐘舵�侀噸缃负0
+ newProduct.fillRemainingQuantity(); // 閲嶆柊璁＄畻鍓╀綑鏁伴噺
+
+ // 5.2 鎻掑叆鏂颁骇鍝佽褰�
+ salesLedgerProductMapper.insert(newProduct);
+ }
+
+ // 6. 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁锛堢敓鎴愬弽瀹″嚭鍏ュ簱璁板綍锛�
+ processOriginalOrderStock(originalSalesLedgerId);
+ }
+
+ /**
+ * 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁
+ * 1. 瀵瑰師璁㈠崟鐨勫叆搴撴暟鎹敓鎴愬弽瀹″嚭搴撹褰曪紙閿�鍞�-鍙嶅鍑哄簱锛�
+ * 2. 瀵瑰師璁㈠崟鐨勫嚭搴撴暟鎹敓鎴愬弽瀹″叆搴撹褰曪紙閿�鍞�-鍙嶅鍏ュ簱锛�
+ * 3. 鏇存柊搴撳瓨琛ㄦ暟鎹�
+ */
+ private void processOriginalOrderStock(Long originalSalesLedgerId) {
+ // 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊叆搴撹褰�
+ List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 2. 瀵规瘡鏉″叆搴撹褰曠敓鎴愬搴旂殑鍙嶅鍑哄簱璁板綍
+ for (StockInRecord stockInRecord : stockInRecords) {
+ // 2.1 鍒涘缓鍙嶅鍑哄簱璁板綍
+ StockOutRecord stockOutRecord = new StockOutRecord();
+ stockOutRecord.setOutboundBatches(OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK")); // 鐢熸垚鍑哄簱鎵规鍙�
+ stockOutRecord.setStockOutNum(stockInRecord.getStockInNum()); // 鍑哄簱鏁伴噺绛変簬鍘熷叆搴撴暟閲�
+ stockOutRecord.setRecordId(stockInRecord.getId()); // 璁板綍鍘熷叆搴撹褰旾D
+ stockOutRecord.setRecordType(StockOutQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_OUT.getCode()); // 璁剧疆涓洪攢鍞弽瀹″嚭搴撶被鍨�
+ stockOutRecord.setProductModelId(stockInRecord.getProductModelId()); // 浜у搧瑙勬牸ID
+ stockOutRecord.setRemark("閿�鍞�-鍙嶅鍑哄簱"); // 澶囨敞
+ stockOutRecord.setType(stockInRecord.getType()); // 绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+ stockOutRecord.setSalesLedgerId(stockInRecord.getSalesLedgerId()); // 閿�鍞鍗旾D
+ stockOutRecord.setSalesLedgerProductId(stockInRecord.getSalesLedgerProductId()); // 閿�鍞鍗曚骇鍝両D
+
+ // 2.2 鎻掑叆鍙嶅鍑哄簱璁板綍
+ stockOutRecordMapper.insert(stockOutRecord);
+
+ // 2.3 浠庡簱瀛樿〃涓墸鍑忕浉搴旀暟閲�
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
+ stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ }
+
+ // 3. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰�
+ List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 4. 瀵规瘡鏉″嚭搴撹褰曠敓鎴愬搴旂殑鍙嶅鍏ュ簱璁板綍
+ for (StockOutRecord stockOutRecord : stockOutRecords) {
+ // 4.1 鍒涘缓鍙嶅鍏ュ簱璁板綍
+ StockInRecord stockInRecord = new StockInRecord();
+ stockInRecord.setInboundBatches(OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK")); // 鐢熸垚鍏ュ簱鎵规鍙�
+ stockInRecord.setStockInNum(stockOutRecord.getStockOutNum()); // 鍏ュ簱鏁伴噺绛変簬鍘熷嚭搴撴暟閲�
+ stockInRecord.setRecordId(stockOutRecord.getId()); // 璁板綍鍘熷嚭搴撹褰旾D
+ stockInRecord.setRecordType(StockInQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_IN.getCode()); // 璁剧疆涓洪攢鍞弽瀹″叆搴撶被鍨�
+ stockInRecord.setProductModelId(stockOutRecord.getProductModelId()); // 浜у搧瑙勬牸ID
+ stockInRecord.setRemark("閿�鍞�-鍙嶅鍏ュ簱"); // 澶囨敞
+ stockInRecord.setType(stockOutRecord.getType()); // 绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+ stockInRecord.setSalesLedgerId(stockOutRecord.getSalesLedgerId()); // 閿�鍞鍗旾D
+ stockInRecord.setSalesLedgerProductId(stockOutRecord.getSalesLedgerProductId()); // 閿�鍞鍗曚骇鍝両D
+
+ // 4.2 鎻掑叆鍙嶅鍏ュ簱璁板綍
+ stockInRecordMapper.insert(stockInRecord);
+
+ // 4.3 鍚戝簱瀛樿〃涓鍔犵浉搴旀暟閲�
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
+ stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3