From 4c6168cf60426dc1e9c95d575c5efc66bf8d9af9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 03 六月 2026 18:08:57 +0800
Subject: [PATCH] 生产报工更新实际开始时间和结束时间
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 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 b0f663d..411a462 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -1,25 +1,24 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
-import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.MatrixToImageWriter;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductWorkOrderFile;
import com.ruoyi.production.service.ProductWorkOrderService;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -29,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;
@@ -39,7 +40,7 @@
public class ProductWorkOrderServiceImpl extends ServiceImpl<ProductWorkOrderMapper, ProductWorkOrder> implements ProductWorkOrderService {
@Autowired
- private ProductWorkOrderMapper productWorkOrdermapper;
+ private ProductWorkOrderMapper productWorkOrderMapper;
@Autowired
private ProductWorkOrderFileMapper productWorkOrderFileMapper;
@@ -48,17 +49,17 @@
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
- return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
+ return productWorkOrderMapper.pageProductWorkOrder(page, productWorkOrder);
}
@Override
public int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto) {
- return productWorkOrdermapper.updateById(productWorkOrderDto);
+ return productWorkOrderMapper.updateById(productWorkOrderDto);
}
@Override
public void down(HttpServletResponse response, ProductWorkOrder productWorkOrder) {
- ProductWorkOrderDto productWorkOrderDto = productWorkOrdermapper.getProductWorkOrderFlowCard(productWorkOrder.getId());
+ ProductWorkOrderDto productWorkOrderDto = productWorkOrderMapper.getProductWorkOrderFlowCard(productWorkOrder.getId());
String codePath;
try {
codePath = new MatrixToImageWriter().code(productWorkOrderDto.getId().toString(), tempDir);
@@ -71,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());
@@ -87,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 {
@@ -114,4 +125,29 @@
}
}
+ @Override
+ public ProductWorkOrderDto getProductWorkOrderById(Long id) {
+ return productWorkOrderMapper.getProductWorkOrderFlowCard(id);
+ }
+
+ @Override
+ public String generateProductWorkOrder(String processName, String npsNo) {
+ processName = StrUtil.isBlank(processName) ? "鏈煡" : processName;
+ Assert.notNull(npsNo, "鐢熶骇璁㈠崟鍙风紪鍙蜂笉鑳戒负绌�");
+ 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 "";
+ }
+ return dateTime.format(formatter);
+ }
+
}
--
Gitblit v1.9.3