From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index c6d90cf..5ec666b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -62,7 +63,7 @@
private final FileUtil fileUtil;
@Override
- public com.baomidou.mybatisplus.core.metadata.IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
+ public IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
Page<ProductionOrderVo> result = (Page<ProductionOrderVo>) baseMapper.pageProductionOrder(page, dto);
fillProductImages(result.getRecords());
return result;
@@ -359,18 +360,18 @@
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("quantity must be greater than 0");
}
- if (productionOrder.getTechnologyRoutingId() == null) {
- // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
- TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
- Wrappers.<TechnologyRouting>lambdaQuery()
- .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
- .orderByDesc(TechnologyRouting::getId)
- .last("limit 1"));
- if (technologyRouting == null) {
- throw new ServiceException("No technology routing found for the product model");
- }
- productionOrder.setTechnologyRoutingId(technologyRouting.getId());
- }
+// if (productionOrder.getTechnologyRoutingId() == null) {
+// // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
+// TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
+// Wrappers.<TechnologyRouting>lambdaQuery()
+// .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
+// .orderByDesc(TechnologyRouting::getId)
+// .last("limit 1"));
+// if (technologyRouting == null) {
+// throw new ServiceException("No technology routing found for the product model");
+// }
+// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
+// }
if (oldOrder != null && ProductOrderStatusEnum.isStarted(oldOrder.getStatus())) {
// 寮�宸ュ悗鍙厑璁镐慨姝ｉ潪鏍稿績瀛楁锛屾牳蹇冪敓浜т緷鎹攣瀹氥��
if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
--
Gitblit v1.9.3