From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
index 41b091b..0ffb34f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.mapper.ProductionOrderRoutingMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;
import com.ruoyi.production.pojo.ProductionOrderRouting;
-import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.service.ProductionOrderRoutingService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -21,6 +21,7 @@
@Override
public ProductionOrderRouting listMain(Long orderId) {
+ // 鏌ヨ涓昏〃ID闆嗗悎
return productionOrderRoutingMapper.selectOne(
Wrappers.<ProductionOrderRouting>lambdaQuery()
.eq(ProductionOrderRouting::getProductionOrderId, orderId)
@@ -29,11 +30,8 @@
}
@Override
- public List<ProductionOrderRoutingOperation> listItem(Long orderId) {
- return productionOrderRoutingOperationMapper.selectList(
- Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getProductionOrderId, orderId)
- .orderByAsc(ProductionOrderRoutingOperation::getDragSort)
- .orderByAsc(ProductionOrderRoutingOperation::getId));
+ public List<ProductionOrderRoutingOperationVo> listItem(Long orderId) {
+ // 鏌ヨ宸ヨ壓璺嚎宸ュ簭鏄庣粏
+ return productionOrderRoutingOperationMapper.selectVoListByOrderId(orderId);
}
}
--
Gitblit v1.9.3