From f4589ce8974e49a9c1522eb71970e816d47ec34f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 23 四月 2026 16:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 6d4692e..b2f3dac 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -92,10 +92,10 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId) {
+ public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId,String uuid) {
ProductOrder byId = productOrderService.getById(productOrderId);
// 1. 鏂板BOM
- ProductBom productBom = createProductBom(productModelId);
+ ProductBom productBom = createProductBom(productModelId,uuid);
// 2. 鏂板BOM瀛愯〃
List<ProductStructure> productStructures = buildProductStructures(processRouteAnticlockwiseDtos, productBom.getId());
@@ -119,10 +119,11 @@
/**
* 鍒涘缓浜у搧BOM
*/
- private ProductBom createProductBom(Long productModelId) {
+ private ProductBom createProductBom(Long productModelId,String uuid) {
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()));
--
Gitblit v1.9.3