From 61ad48645e045591a0e82df746faba8f70d75674 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 31 三月 2026 17:59:29 +0800
Subject: [PATCH] fix:1.质检增加批号和供应商（区分质检和不质检）
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 18 ++++++++++++++----
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 1 +
2 files changed, 15 insertions(+), 4 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 f9c45e5..17f1a29 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -230,6 +230,7 @@
QualityInspect qualityInspect = new QualityInspect();
qualityInspect.setInspectType(0);
qualityInspect.setSupplier(purchaseLedger.getSupplierName());
+ qualityInspect.setBatchNo(saleProduct.getBatchNo());
qualityInspect.setPurchaseLedgerId(purchaseLedger.getId());
qualityInspect.setProductId(saleProduct.getProductId());
qualityInspect.setProductName(saleProduct.getProductCategory());
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 1c46b5f..d13dfc9 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -99,8 +99,19 @@
public int submit(QualityInspect inspect) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
ProductionProductMain productionProductMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());
- ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
- ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+
+ String batchNo;
+ String customer;
+ if (productionProductMain != null) {
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ batchNo = productOrder.getBatchNo();
+ customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ } else {
+ batchNo = qualityInspect.getBatchNo();
+ customer = qualityInspect.getSupplier();
+ }
+
//鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
throw new RuntimeException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
@@ -117,9 +128,8 @@
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
//鍚堟牸鐩存帴鍏ュ簱
- String customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
- qualityInspect.getId(),productOrder.getBatchNo(),customer
+ qualityInspect.getId(), batchNo, customer
);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
--
Gitblit v1.9.3