From f01fba235d070d174609f4f66642368b1df1ab03 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:37:06 +0800
Subject: [PATCH] 销售台账新增后，对应的生产订单生产后，删除销售台账，此生产工单还存在
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 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 5272932..411a462 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -3,7 +3,6 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,7 +28,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -73,12 +72,22 @@
if (CollectionUtils.isNotEmpty(productWorkOrderFiles)) {
productWorkOrderFiles.forEach(productWorkOrderFile -> {
Map<String, Object> image = new HashMap<>();
- PictureRenderData pictureRenderData = Pictures.ofLocal( productWorkOrderFile.getUrl()).sizeInCm(17, 20).create();
+ PictureRenderData pictureRenderData = Pictures.ofLocal(productWorkOrderFile.getUrl()).sizeInCm(17, 20).create();
image.put("url", pictureRenderData);
images.add(image);
});
}
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());
@@ -89,13 +98,13 @@
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);
+ put("images", images.isEmpty() ? null : images);
}});
try {
@@ -122,25 +131,23 @@
}
@Override
- public String generateProductWorkOrder(String datePrefix,String processName, String npsNo) {
- datePrefix = StrUtil.isBlank(datePrefix) ? LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) : datePrefix;
+ public String generateProductWorkOrder(String processName, String npsNo) {
processName = StrUtil.isBlank(processName) ? "鏈煡" : processName;
Assert.notNull(npsNo, "鐢熶骇璁㈠崟鍙风紪鍙蜂笉鑳戒负绌�");
- ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
- int sequenceNumber = 1; // 榛樿搴忓彿
- if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
- String lastNo = lastWorkOrder.getWorkOrderNo().toString();
- if (lastNo.startsWith(datePrefix)) {
- String seqStr = lastNo.substring(datePrefix.length());
- try {
- sequenceNumber = Integer.parseInt(seqStr) + 1;
- } catch (NumberFormatException e) {
- sequenceNumber = 1;
- }
- }
+ Integer maxNo = productWorkOrderMapper.selectMax(npsNo);
+ int sequenceNumber = maxNo + 1; // 榛樿搴忓彿
+ String processPinyin = StringUtils.getProcessNo(processName);
+ return StrUtil.format("{}{}", processPinyin, npsNo, String.format("%03d", sequenceNumber));
+ }
+
+ /**
+ * 鏍煎紡鍖� LocalDateTime 涓哄瓧绗︿覆
+ */
+ private String formatDateTime(LocalDateTime dateTime, DateTimeFormatter formatter) {
+ if (dateTime == null) {
+ return "";
}
- String processPinyin = StringUtils.getProcessNo(processName);
- return StrUtil.format("{}{}{}",processPinyin,npsNo,String.format("%03d", sequenceNumber));
+ return dateTime.format(formatter);
}
}
--
Gitblit v1.9.3