From e8aca82ba390af090240ef7fda8d6f5fc5d3fe07 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 03 六月 2026 17:04:51 +0800
Subject: [PATCH] 生产报工报废后不入库
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 35a22b6..411a462 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -28,6 +28,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -76,6 +78,16 @@
});
}
InputStream inputStream = this.getClass().getResourceAsStream("/static/work-order-template.docx");
+
+ // 鏃ユ湡鏃堕棿鏍煎紡鍖栧櫒
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+
+ // 鏍煎紡鍖栨棩鏈熸椂闂村瓧娈�
+ String planStartTimeStr = formatDateTime(productWorkOrderDto.getPlanStartTime(), formatter);
+ String planEndTimeStr = formatDateTime(productWorkOrderDto.getPlanEndTime(), formatter);
+ String actualStartTimeStr = formatDateTime(productWorkOrderDto.getActualStartTime(), formatter);
+ String actualEndTimeStr = formatDateTime(productWorkOrderDto.getActualEndTime(), formatter);
+
XWPFTemplate template = XWPFTemplate.compile(inputStream).render(
new HashMap<String, Object>() {{
put("process", productWorkOrderDto.getProcessName());
@@ -86,10 +98,10 @@
put("model", productWorkOrderDto.getModel());
put("completeQuantity", productWorkOrderDto.getCompleteQuantity());
put("scrapQty", productWorkOrderDto.getScrapQty());
- put("planStartTime", productWorkOrderDto.getPlanStartTime());
- put("planEndTime", productWorkOrderDto.getPlanEndTime());
- put("actualStartTime", productWorkOrderDto.getActualStartTime());
- put("actualEndTime", productWorkOrderDto.getActualEndTime());
+ put("planStartTime", planStartTimeStr);
+ put("planEndTime", planEndTimeStr);
+ put("actualStartTime", actualStartTimeStr);
+ put("actualEndTime", actualEndTimeStr);
put("twoCode", Pictures.ofLocal(codePath).create());
put("deviceName", productWorkOrderDto.getDeviceName());
put("images", images.isEmpty() ? null : images);
@@ -128,4 +140,14 @@
return StrUtil.format("{}{}", processPinyin, npsNo, String.format("%03d", sequenceNumber));
}
+ /**
+ * 鏍煎紡鍖� LocalDateTime 涓哄瓧绗︿覆
+ */
+ private String formatDateTime(LocalDateTime dateTime, DateTimeFormatter formatter) {
+ if (dateTime == null) {
+ return "";
+ }
+ return dateTime.format(formatter);
+ }
+
}
--
Gitblit v1.9.3