From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index 66e1aaa..8553869 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -18,14 +18,14 @@
@Service
@RequiredArgsConstructor
-public class ProductionOperationTaskServiceImpl extends ServiceImpl<ProductionOperationTaskMapper, ProductionOperationTask>
- implements ProductionOperationTaskService {
+public class ProductionOperationTaskServiceImpl extends ServiceImpl<ProductionOperationTaskMapper, ProductionOperationTask> implements ProductionOperationTaskService {
+
+
@Override
- public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page,
- ProductionOperationTaskDto dto) {
- Page<ProductionOperationTask> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
- return this.page(entityPage, buildQueryWrapper(dto)).convert(item -> BeanUtil.copyProperties(item, ProductionOperationTaskVo.class));
+ public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
+ Page<ProductionOperationTaskVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+ return baseMapper.pageProductionOperationTask(voPage, dto);
}
@Override
@@ -54,11 +54,16 @@
return Wrappers.<ProductionOperationTask>lambdaQuery()
.eq(query.getId() != null, ProductionOperationTask::getId, query.getId())
.eq(query.getProductionOrderId() != null, ProductionOperationTask::getProductionOrderId, query.getProductionOrderId())
- .eq(query.getTechnologyRoutingOperationId() != null,
- ProductionOperationTask::getTechnologyRoutingOperationId, query.getTechnologyRoutingOperationId())
+ .eq(query.getProductionOrderRoutingOperationId() != null,
+ ProductionOperationTask::getProductionOrderRoutingOperationId, query.getProductionOrderRoutingOperationId())
.eq(query.getStatus() != null, ProductionOperationTask::getStatus, query.getStatus())
.like(query.getWorkOrderNo() != null && !query.getWorkOrderNo().trim().isEmpty(),
ProductionOperationTask::getWorkOrderNo, query.getWorkOrderNo())
.orderByDesc(ProductionOperationTask::getId);
}
+
+ @Override
+ public int updateProductWorkOrder(ProductionOperationTaskDto dto) {
+ return baseMapper.updateById(dto);
+ }
}
--
Gitblit v1.9.3