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/service/impl/ProcessRouteServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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 5daf864..8fad87c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -93,10 +93,10 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId,String uuid) {
+ public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId) {
ProductOrder byId = productOrderService.getById(productOrderId);
// 1. 鏂板BOM
- ProductBom productBom = createProductBom(productModelId,uuid);
+ ProductBom productBom = createProductBom(productModelId);
// 2. 鏂板BOM瀛愯〃
List<ProductStructure> productStructures = buildProductStructures(processRouteAnticlockwiseDtos, productBom.getId());
@@ -120,11 +120,10 @@
/**
* 鍒涘缓浜у搧BOM
*/
- private ProductBom createProductBom(Long productModelId,String uuid) {
+ private ProductBom createProductBom(Long productModelId) {
ProductBom productBom = new ProductBom();
productBom.setProductModelId(productModelId);
productBom.setVersion("1.0.0");
- productBom.setUuid(uuid);
productBomService.save(productBom);
productBom.setBomNo("BM." + String.format("%05d", productBom.getId()));
@@ -175,6 +174,7 @@
*/
private List<ProcessRouteItem> buildProcessRouteItems(List<ProcessRouteAnticlockwiseDto> dtos, Long routeId, Long productModelId) {
List<ProcessRouteItem> items = new ArrayList<>(dtos.size());
+ Integer num = 0;
for (ProcessRouteAnticlockwiseDto dto : dtos) {
ProcessRouteItem item = new ProcessRouteItem();
item.setRouteId(routeId);
@@ -185,6 +185,7 @@
item.setProcessRouteNum(dto.getProcessRouteNum());
item.setProcessRouteAddNum(dto.getProcessRouteAddNum());
item.setProcessRouteRequire(dto.getProcessRouteRequire());
+ item.setDragSort(num++);
items.add(item);
}
return items;
@@ -209,6 +210,7 @@
*/
private void buildProductProcessRouteItems(List<ProcessRouteAnticlockwiseDto> dtos, Long productRouteId, Long productModelId,Long productOrderId) {
ProductOrder byId = productOrderService.getById(productOrderId);
+ Integer num = 0;
for (ProcessRouteAnticlockwiseDto dto : dtos) {
ProductProcessRouteItem item = new ProductProcessRouteItem();
item.setProductRouteId(productRouteId);
@@ -219,6 +221,8 @@
item.setProcessRouteNum(dto.getProcessRouteNum());
item.setProcessRouteAddNum(dto.getProcessRouteAddNum());
item.setProcessRouteRequire(dto.getProcessRouteRequire());
+ item.setDragSort(num++);
+ item.setUuid(dto.getUuid());
productProcessRouteItemService.save(item);
ProductProcess productProcess = productProcessService.getById(item.getProcessId());
//鍚屾鏂板鐢熶骇宸ュ崟
@@ -229,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);
--
Gitblit v1.9.3