From 6b7bd186b3216dbc991eba9db751b59dd95492ad Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 11:21:45 +0800
Subject: [PATCH] feat:1.生产订单增加清场记录弹框（保存查看）
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 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..65498fc 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,7 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.util.BooleanUtil;
+import com.alibaba.fastjson2.JSON;
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 +9,7 @@
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.common.exception.base.BaseException;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -16,7 +17,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;
@@ -24,6 +24,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Service
@@ -67,7 +68,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 +212,21 @@
}
+ @Override
+ public int finishOrder(Long orderId) {
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setId(orderId);
+ productOrder.setIsEnd(true);
+ return productOrderMapper.updateById(productOrder);
+ }
+
+ @Override
+ public int cleanRecord(Long id, Map<String, Object> cleanRecord) {
+ ProductOrder productOrder = productOrderMapper.selectById(id);
+ if (productOrder == null) {
+ throw new BaseException("璁㈠崟涓嶅瓨鍦�");
+ }
+ productOrder.setCleanRecord(JSON.toJSONString(cleanRecord));
+ return productOrderMapper.updateById(productOrder);
+ }
}
--
Gitblit v1.9.3