From 32e4f30a848e159081986f93d189f0e80fa56a77 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 29 五月 2026 18:03:52 +0800
Subject: [PATCH] 采购手动入库
---
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index 1fb2333..39bf20c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -140,7 +140,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(ApprovalInstanceDto approvalInstanceDto) {
- String instanceNo = OrderUtils.countTodayByCreateTime(approvalInstanceMapper, "SP", "instance_no");
+ String instanceNo = OrderUtils.countTodayByCreateTime(approvalInstanceMapper, "SP", "instance_no", approvalInstanceDto.getCreateTime() != null ? approvalInstanceDto.getCreateTime() : LocalDateTime.now());
approvalInstanceDto.setInstanceNo(instanceNo);
approvalInstanceDto.setStatus("PENDING");
approvalInstanceDto.setCurrentLevel(1);
@@ -507,7 +507,7 @@
private void handlePurchaseApprovalFinished(ApprovalInstance instance, String status) {
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(
new LambdaQueryWrapper<PurchaseLedger>()
- .eq(PurchaseLedger::getPurchaseContractNumber, instance.getTitle())
+ .eq(PurchaseLedger::getId, instance.getBusinessId())
.last("limit 1")
);
if (purchaseLedger == null) {
@@ -523,16 +523,10 @@
);
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
if (salesLedgerProduct.getIsChecked()) {
+ // 闇�瑕佽川妫�鐨勪骇鍝� -> 鐢熸垚璐ㄦ鍗�
qualityInspectHelper.addQualityInspect(purchaseLedger, salesLedgerProduct);
- } else {
- stockUtils.addStockWithBatchNo(
- salesLedgerProduct.getProductModelId(),
- salesLedgerProduct.getQuantity(),
- StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
- purchaseLedger.getId(),
- purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId()
- );
}
+ // 涓嶉渶瑕佽川妫�鐨勪骇鍝侊細涓嶅啀鑷姩鍏ュ簱锛屾敼涓烘墜鍔ㄥ叆搴撴寜閽Е鍙�
}
} else if ("REJECTED".equals(status)) {
purchaseLedger.setApprovalStatus(ApprovalStatusEnum.REJECTED.getCode());
@@ -545,7 +539,7 @@
private void handleSalesQuotationApprovalFinished(ApprovalInstance instance, String status) {
SalesQuotation salesQuote = salesQuotationMapper.selectOne(
new LambdaQueryWrapper<SalesQuotation>()
- .eq(SalesQuotation::getQuotationNo, instance.getTitle())
+ .eq(SalesQuotation::getId, instance.getBusinessId())
.last("limit 1")
);
if (salesQuote == null) {
@@ -565,7 +559,7 @@
private void handleShippingApprovalFinished(ApprovalInstance instance, String status) {
ShippingInfo shippingInfo = shippingInfoMapper.selectOne(
new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getShippingNo, instance.getTitle())
+ .eq(ShippingInfo::getId, instance.getTitle())
.orderByDesc(ShippingInfo::getCreateTime)
.last("limit 1")
);
--
Gitblit v1.9.3