From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
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 ecdd427..a32b3c6 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -22,6 +22,14 @@
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductWorkOrderMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -50,6 +58,14 @@
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
private QualityInspectExportHandle qualityInspectExportHandle;
+
+ private ProductionProductMainMapper productionProductMainMapper;
+
+ private ProductWorkOrderMapper productWorkOrderMapper;
+
+ private ProductOrderMapper productOrderMapper;
+
+ private SalesLedgerMapper salesLedgerMapper;
@Override
public int add(QualityInspectDto qualityInspectDto) {
@@ -138,6 +154,37 @@
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("inspect", inspect);
+ put("customerLabel", inspect.getInspectType() == 0 ? "渚涘簲鍟�" : "瀹㈡埛");
+ // 鏍规嵁妫�楠岀被鍨嬬‘瀹氬鎴�/渚涘簲鍟�
+ String customerValue;
+ if (inspect.getInspectType() == 0) {
+ // 鍘熸潗鏂欐楠岋細鐩存帴浣跨敤渚涘簲鍟�
+ customerValue = inspect.getSupplier();
+ } else {
+ // 杩囩▼妫�楠�/鍑哄巶妫�楠岋細閫氳繃鍏宠仈鍏崇郴鏌ヨ閿�鍞彴璐︾殑瀹㈡埛
+ customerValue = inspect.getCustomer(); // 榛樿浣跨敤鐩存帴瀛樺偍鐨勫鎴�
+ Long workOrderId = inspect.getWorkOrderId();
+ if (inspect.getProductMainId() != null) {
+ // 閫氳繃鎶ュ伐ID鏌ヨ宸ュ崟
+ ProductionProductMain productMain = productionProductMainMapper.selectById(inspect.getProductMainId());
+ if (productMain != null) {
+ workOrderId = productMain.getWorkOrderId();
+ }
+ }
+ if (workOrderId != null) {
+ ProductWorkOrder workOrder = productWorkOrderMapper.selectById(workOrderId);
+ if (workOrder != null && workOrder.getProductOrderId() != null) {
+ ProductOrder productOrder = productOrderMapper.selectById(workOrder.getProductOrderId());
+ if (productOrder != null && productOrder.getSalesLedgerId() != null) {
+ SalesLedger salesLedger = salesLedgerMapper.selectById(productOrder.getSalesLedgerId());
+ if (salesLedger != null && salesLedger.getCustomerName() != null) {
+ customerValue = salesLedger.getCustomerName();
+ }
+ }
+ }
+ }
+ }
+ put("customer", customerValue);
put("inspectType", finalInspectType);
put("paramList", paramList);
put("checkTime", checkTimeStr);
@@ -214,4 +261,4 @@
qualityInspectExportHandle.exportExcel(response, exportList, exportDTO.getInspectType());
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3