From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 12 ++++++++----
1 files changed, 8 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 886e9a0..ab8fae4 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -174,16 +174,18 @@
*/
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);
item.setProcessId(dto.getProcessId());
- item.setProductModelId(dto.getProductModelId());
+ item.setProductModelId(productModelId);
item.setProcessRouteName(dto.getProcessRouteName());
item.setProcessRouteOpenNum(dto.getProcessRouteOpenNum());
item.setProcessRouteNum(dto.getProcessRouteNum());
item.setProcessRouteAddNum(dto.getProcessRouteAddNum());
item.setProcessRouteRequire(dto.getProcessRouteRequire());
+ item.setDragSort(num++);
items.add(item);
}
return items;
@@ -208,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);
@@ -218,6 +221,7 @@
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());
@@ -225,11 +229,11 @@
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(item.getId());
productWorkOrder.setProductOrderId(productOrderId);
- ProductOrder order = productOrderMapper.selectById(productOrderId);
- productWorkOrder.setPlanQuantity(order.getQuantity());
+ productWorkOrder.setPlanQuantity(new BigDecimal(dto.getProcessRouteNum()));
productWorkOrder.setDeviceId(dto.getDeviceId());
productWorkOrder.setUserIds(dto.getUserIds());
- productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcess.getName(), byId.getNpsNo()));
+ productWorkOrder.setUserNames(dto.getUserNames());
+ productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder( productProcess.getName(), byId.getNpsNo()));
productWorkOrder.setStatus(1);
productWorkOrderService.save(productWorkOrder);
}
--
Gitblit v1.9.3