From 66a7e9eed2705534e66fa48a2f0bd4e777a362dc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 四月 2026 16:11:06 +0800
Subject: [PATCH] feat(production): 添加BOM UUID字段支持
---
src/main/java/com/ruoyi/production/pojo/ProductBom.java | 15 +++++++--------
src/main/java/com/ruoyi/production/service/ProcessRouteService.java | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 7 ++++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductBom.java b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
index f80cafe..109042c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
@@ -1,19 +1,15 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -72,4 +68,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @ApiModelProperty("uuid")
+ private String uuid;
}
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
index 4ddff4c..6ce345b 100644
--- a/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
@@ -17,5 +17,5 @@
int batchDelete(List<Long> ids);
- Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId);
+ Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderI,String uuidd);
}
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