From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
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