From e8d0bdce89ae0937763736f75868a43bd8690985 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:34:09 +0800
Subject: [PATCH] feat(production): 增加报工用户names支持
---
src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java | 1 +
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 3 +++
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 11 +++++------
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 1 +
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
index d193f35..bae81b1 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
@@ -22,6 +22,7 @@
//浜哄憳ids
private String userIds;
+ private String userNames;
// 鏈哄彴id
private Long deviceId;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index 4e1f5ea..9c4f22e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -144,6 +144,9 @@
@ApiModelProperty(value = "鎶ュ伐鐢ㄦ埛ids")
private String userIds;
+ @ApiModelProperty(value = "鎶ュ伐鐢ㄦ埛names")
+ private String userNames;
+
@ApiModelProperty("鏈哄彴id")
private Long deviceId;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index 3df9df2..8fad87c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -233,6 +233,7 @@
productWorkOrder.setPlanQuantity(order.getQuantity());
productWorkOrder.setDeviceId(dto.getDeviceId());
productWorkOrder.setUserIds(dto.getUserIds());
+ productWorkOrder.setUserNames(dto.getUserNames());
productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcess.getName(), byId.getNpsNo()));
productWorkOrder.setStatus(1);
productWorkOrderService.save(productWorkOrder);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
index 24de514..380ad00 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.dto.SimplePersonDto;
-import com.ruoyi.production.dto.ProcessContentDto;
-import com.ruoyi.production.dto.ProcessRouteAnticlockwiseDto;
-import com.ruoyi.production.dto.ProductionPrintOrderDto;
-import com.ruoyi.production.dto.SaveProductionPrintOrderDto;
+import com.ruoyi.production.dto.*;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
import com.ruoyi.production.pojo.ProductOrder;
@@ -53,6 +50,7 @@
processContentDto.setId(IdUtil.simpleUUID());
}
});
+ MaterialInfoDto materialInfoDtoFirst = dto.getMaterialInfo().get(0);
// 璋冪敤宸ュ簭鏂瑰 鍑芥暟
List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos = processContentDtoList.stream().map(it -> {
ProcessRouteAnticlockwiseDto pdto = new ProcessRouteAnticlockwiseDto();
@@ -62,8 +60,9 @@
pdto.setProcessRouteNum(it.getProcessPositive());
pdto.setProcessRouteAddNum(it.getProcessPositive());
// pdto.setProcessRouteRequire(); 宸ヨ壓瑕佹眰
- pdto.setProductModelId(dto.getProductModelId());
- pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
+ pdto.setProductModelId(materialInfoDtoFirst.getId());
+ pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
+ pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
pdto.setDeviceId(it.getDeviceId());
pdto.setUuid(it.getId());
return pdto;
--
Gitblit v1.9.3