From df1f128feb96f999f6b2fcbcae8eae72f584dbe5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:55:24 +0800
Subject: [PATCH] 过程检、成品检报告需展示客户名称（生产订单对应带出来的），检测单位固定是 天津阳光彩印股份有限公司
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 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 a1bdb1d..a2c8120 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -32,6 +32,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -90,7 +91,9 @@
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
//鍚堟牸鐩存帴鍏ュ簱
- stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId(), "-", "-", "-");
+ if (qualityInspect.getInspectType() == 2 || qualityInspect.getInspectType() == 0) {
+ stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId(), "-", "-", "-");
+ }
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
@@ -117,6 +120,16 @@
detail.setIndex(index);
index++;
}
+
+ // 鏍煎紡鍖栨楠屾棩鏈�
+ String checkTimeStr;
+ if (inspect.getCheckTime() != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ checkTimeStr = sdf.format(inspect.getCheckTime());
+ } else {
+ checkTimeStr = "";
+ }
+
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
Configure configure = Configure.builder()
.bind("paramList", new HackLoopTableRenderPolicy())
@@ -125,8 +138,11 @@
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("inspect", inspect);
+ put("customerLabel", inspect.getInspectType() == 0 ? "渚涘簲鍟�" : "瀹㈡埛");
+ put("customer", inspect.getInspectType() == 0 ? inspect.getSupplier() : inspect.getCustomer());
put("inspectType", finalInspectType);
put("paramList", paramList);
+ put("checkTime", checkTimeStr);
}});
try {
--
Gitblit v1.9.3