From 6f68532e0612ea1b4384610b4da2fb5bff8433c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 15 四月 2026 15:15:50 +0800
Subject: [PATCH] fix:生产-质量-仓储（合格，不合格），批号，供应商
---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index 7cf0307..ba34331 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -67,15 +67,21 @@
QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
String batchNo;
+ String customer;
if (qualityInspect.getProductMainId() != null) {
ProductionProductMain productionProductMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());
ProductWorkOrder workOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
ProductOrder orders = productOrderMapper.selectById(workOrder.getProductOrderId());
batchNo = orders.getBatchNo();
+ customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
} else {
batchNo = qualityInspect.getBatchNo();
+ if (qualityInspect.getSupplier() != null) {
+ customer = qualityInspect.getCustomer();
+ } else {
+ customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ }
}
- String customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
switch (qualityUnqualified.getDealResult()) {
case "杩斾慨":
@@ -162,7 +168,6 @@
break;
case "璁╂鏀捐":
//璋冪敤鎻愪氦鍚堟牸鐨勬帴鍙�
- customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
stockUtils.addStock(modelId, unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId(), batchNo, customer, qualityInspect.getProductionDate() != null ? qualityInspect.getProductionDate() : LocalDate.now());
break;
default:
--
Gitblit v1.9.3