From efaa975ca9a7fe133744e353e4eb321f11470fd2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 11:28:45 +0800
Subject: [PATCH] fix: service导入修改
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index cedf8f6..5702c18 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.appendix.service.AppendixService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
@@ -18,6 +17,7 @@
import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.service.IProductionOrderAppendixService;
import com.ruoyi.production.service.ProductMaterialService;
import com.ruoyi.production.service.ProductMaterialSkuService;
import com.ruoyi.production.service.ProductOrderService;
@@ -79,7 +79,7 @@
private ProductMaterialService productMaterialService;
@Autowired
- private AppendixService appendixService;
+ private IProductionOrderAppendixService productionOrderAppendixService;
/**
* 鍚屾閿侊紝纭繚鎵嬪姩鍜屽畾鏃朵换鍔′笉鍚屾椂鎵ц
@@ -147,15 +147,19 @@
productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
+ productOrder.setStrength(productionPlanDto.getStrength());
+
+ Long orderId = productOrderService.insertProductOrder(productOrder);
// 褰撲笅鍙戠殑浜у搧涓虹爩鍧楁垨鏉挎潗锛屽氨鎷夊彇BOM瀛愰泦涓庡伐鑹鸿矾绾垮瓙闆嗘暟鎹瓨鍏ュ埌闄勮〃涓�
if ("鐮屽潡".equals(productionPlanDto.getProductName())) {
- productOrder.setRouteId(appendixService.populateBlocks(productionPlanDto));
+ productOrder.setRouteId(productionOrderAppendixService.populateBlocks(orderId, productionPlanDto));
}
if ("鏉挎潗".equals(productionPlanDto.getProductName())) {
- productOrder.setRouteId(appendixService.populatePlates(productionPlanDto));
+ productOrder.setRouteId(productionOrderAppendixService.populatePlates(orderId, productionPlanDto));
}
- productOrderService.addProductOrder(productOrder);
+ // 鏇存柊缁戝畾鐨勫伐鑹鸿矾绾�
+ productOrderService.updateById(productOrder);
// 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
BigDecimal assignedVolume = BigDecimal.ZERO;
--
Gitblit v1.9.3