From d3a5c4420a7daf89bc9832f22ca8ed9d7e1adaf9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 17:34:32 +0800
Subject: [PATCH] yys 1.完善销售下单，生成生产订单
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index fe78782..39c4591 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -33,6 +33,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -137,8 +138,7 @@
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
- ProductOrder order = productOrderMapper.selectById(productOrder.getId());
- productWorkOrder.setPlanQuantity(order.getQuantity());
+ productWorkOrder.setPlanQuantity(BigDecimal.valueOf(productProcessRouteItem.getPlanNum()));
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setPlanStartTime(productProcessRouteItem.getPlanStartTime());
productWorkOrder.setPlanEndTime(productProcessRouteItem.getPlanEndTime());
@@ -197,14 +197,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean delete(Long[] ids) {
+ public Boolean delete(Long[] idList) {
//鎵归噺鏌ヨproductOrder
List<ProductOrder> productOrders = productOrderMapper.selectList(
new LambdaQueryWrapper<ProductOrder>()
- .in(ProductOrder::getId, ids)
+ .in(ProductOrder::getId, Arrays.asList(idList))
);
if (!org.springframework.util.CollectionUtils.isEmpty(productOrders)) {
-
+ List<Long> ids = productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList());
// 鎵归噺鏌ヨprocessRouteItems
List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(
@@ -240,7 +240,7 @@
// 鍒犻櫎浜у嚭琛ㄣ�佹姇鍏ヨ〃鏁版嵁
if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(productMainIds)) {
productionProductOutputMapper.deleteByProductMainIds(productMainIds);
- productionProductInputMapper.deleteByProductMainIds(productMainIds);
+ productionProductInputMapper.deleteByProductMainIds(ids);
List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
new LambdaQueryWrapper<QualityInspect>()
.in(QualityInspect::getProductMainId, productMainIds)
@@ -283,7 +283,7 @@
productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
.in(ProductOrder::getId, ids));
// 鍒犻櫎闄勪欢
- commonFileService.deleteByBusinessIds(Arrays.asList(ids), FileNameType.PRODUCT_ORDER.getValue());
+ commonFileService.deleteByBusinessIds(ids, FileNameType.PRODUCT_ORDER.getValue());
// 鍒犻櫎鐢熶骇璁㈠崟-鐗╂枡娓呭崟
productStructureRecordMapper.delete(new LambdaQueryWrapper<ProductStructureRecord>()
.in(ProductStructureRecord::getProductOrderId, ids));
--
Gitblit v1.9.3