From 6c7f3a2e780f45e57bb341a5faedac932928a10e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 四月 2026 16:33:16 +0800
Subject: [PATCH] feat(process): 添加工艺路线单位数量默认值设置
---
src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java | 2 ++
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 3 +--
src/main/java/com/ruoyi/production/pojo/ProductBom.java | 2 --
src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java | 2 ++
src/main/java/com/ruoyi/production/service/ProcessRouteService.java | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 8 ++++----
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
index d510db0..d193f35 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
@@ -24,4 +24,6 @@
private String userIds;
// 鏈哄彴id
private Long deviceId;
+
+ private String uuid;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductBom.java b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
index 109042c..294c8b4 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
@@ -69,6 +69,4 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("uuid")
- private String uuid;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
index 5b35d17..a2f8e41 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
@@ -59,4 +59,6 @@
//宸ヨ壓瑕佹眰
private String processRouteRequire;
+ 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 6ce345b..56bddc3 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 productOrderI,String uuidd);
+ Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderI);
}
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..886e9a0 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()));
@@ -219,6 +218,7 @@
item.setProcessRouteNum(dto.getProcessRouteNum());
item.setProcessRouteAddNum(dto.getProcessRouteAddNum());
item.setProcessRouteRequire(dto.getProcessRouteRequire());
+ item.setUuid(dto.getUuid());
productProcessRouteItemService.save(item);
ProductProcess productProcess = productProcessService.getById(item.getProcessId());
//鍚屾鏂板鐢熶骇宸ュ崟
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 23f93f2..e8587ac 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -2,7 +2,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.dto.SimplePersonDto;
@@ -10,10 +9,10 @@
import com.ruoyi.production.dto.ProcessRouteAnticlockwiseDto;
import com.ruoyi.production.dto.SaveProductionPrintOrderDto;
import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.pojo.ProductionPrintOrder;
import com.ruoyi.production.service.ProductionPrintOrderService;
-import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
--
Gitblit v1.9.3