From 7c060a33ae9399a86db97ad18da965e7a848dfc3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 17:24:10 +0800
Subject: [PATCH] feat(production): 添加生产订单完成功能
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 8a1099c..c7ea9f2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.util.BooleanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,8 +8,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.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -16,7 +15,6 @@
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -67,7 +65,17 @@
@Override
public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
- return productOrderMapper.pageProductOrder(page, productOrder);
+ IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(page, productOrder);
+ List<ProductOrderDto> productOrderDtos = productOrderDtoIPage.getRecords();
+ for (int i = 0; i < productOrderDtos.size(); i++) {
+ ProductOrderDto productOrderDto = productOrderDtos.get(i);
+ if (BooleanUtil.isTrue(productOrderDto.getIsEnd())) {
+ // 濡傛灉鐢熶骇璁㈠崟琚粨鏉燂紝鍒欏皢瀹屾垚杩涘害璁剧疆涓�100%
+ productOrderDto.setCompletionStatus(BigDecimal.valueOf(100));
+ }
+ }
+
+ return productOrderDtoIPage;
}
@Override
@@ -201,4 +209,11 @@
}
+ @Override
+ public int finishOrder(Long orderId) {
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setId(orderId);
+ productOrder.setIsEnd(true);
+ return productOrderMapper.updateById(productOrder);
+ }
}
--
Gitblit v1.9.3