From 06df28e9434e6b6287aa7aacf42a8a2e00f31454 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 21 五月 2026 09:28:20 +0800
Subject: [PATCH] null 调整
---
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 87 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
index e0ab30b..c97b22b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -2,22 +2,31 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.excel.ProductionPrintOrderExcel;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.dto.SimplePersonDto;
import com.ruoyi.production.dto.*;
-import com.ruoyi.production.mapper.ProductOrderMapper;
-import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
-import com.ruoyi.production.pojo.ProductOrder;
-import com.ruoyi.production.pojo.ProductionPrintOrder;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.*;
+import com.ruoyi.production.service.ProductBomService;
+import com.ruoyi.production.service.ProductProcessRouteService;
import com.ruoyi.production.service.ProductionPrintOrderService;
import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -36,13 +45,31 @@
private final ProductOrderMapper productOrderMapper;
private final ProcessRouteServiceImpl processRouteService;
+ private final ProductionPrintOrderExcel productionPrintOrderExcel;
+ private final ProductWorkOrderMapper productWorkOrderMapper;
+ private final ProductProcessRouteService productProcessRouteService;
+ private final ProductBomService productBomService;
private final CustomerFollowUpFileService customerFollowUpFileService;
@Override
@Transactional
public void save(SaveProductionPrintOrderDto dto) {
ProductionPrintOrder productionPrintOrder = BeanUtil.copyProperties(dto, ProductionPrintOrder.class);
-
+ if(dto.getId() != null){
+ // 鍏堝垹闄ょ敓浜у伐鍗曟暟鎹�
+ LambdaQueryWrapper<ProductWorkOrder> l1 = new LambdaQueryWrapper<>();
+ l1.eq(ProductWorkOrder::getProductOrderId,dto.getProductOrderId());
+ productWorkOrderMapper.delete(l1);
+ LambdaQueryWrapper<ProductProcessRoute> l2 = new LambdaQueryWrapper<>();
+ l2.eq(ProductProcessRoute::getProductOrderId,dto.getProductOrderId());
+ List<ProductProcessRoute> needDeleteRoute = productProcessRouteService.list(l2);
+ List<Long> needDeleteRouteIds = needDeleteRoute.stream().map(ProductProcessRoute::getId).collect(Collectors.toList());
+ if(CollUtil.isNotEmpty(needDeleteRouteIds)){
+ productProcessRouteService.removeBatchByIds(needDeleteRouteIds);
+ List<Integer> needDeleteBom = needDeleteRoute.stream().map(ProductProcessRoute::getBomId).collect(Collectors.toList());
+ productProcessRouteService.removeByIds(needDeleteBom);
+ }
+ }
List<ProcessContentDto> processContentDtoList = productionPrintOrder.getProcessContent();
// 缁欐病鏈塱d鐨勪俊鎭缃畊uid
processContentDtoList.forEach(processContentDto -> {
@@ -58,7 +85,7 @@
pdto.setProcessRouteName(it.getProcessName());
pdto.setProcessRouteOpenNum(it.getOpenCount());
pdto.setProcessRouteNum(it.getProcessPositive());
- pdto.setProcessRouteAddNum(it.getProcessPositive());
+ pdto.setProcessRouteAddNum(it.getAllowanceQty());
// pdto.setProcessRouteRequire(); 宸ヨ壓瑕佹眰
pdto.setProductModelId(Long.valueOf(materialInfoDtoFirst.getProductModelId()));
pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
@@ -75,7 +102,19 @@
productOrder.setId(dto.getProductOrderId());
productOrder.setRemark(remark);
productOrderMapper.updateById(productOrder);
- int i = dto.getId() == null ? productionPrintOrderMapper.insert(productionPrintOrder) : productionPrintOrderMapper.updateById(productionPrintOrder);
+
+ LambdaQueryWrapper<ProductionPrintOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductionPrintOrder::getProductOrderId,dto.getProductOrderId());
+ queryWrapper.last("limit 1");
+ ProductionPrintOrder ifExitPrint = productionPrintOrderMapper.selectOne(queryWrapper);
+ if (ifExitPrint == null) {
+ productionPrintOrder.setId(null);
+ productionPrintOrderMapper.insert(productionPrintOrder);
+ }else {
+ productionPrintOrder.setId(ifExitPrint.getId());
+ productionPrintOrderMapper.updateById(productionPrintOrder);
+ }
+
}
@Override
@@ -111,6 +150,47 @@
map -> new ArrayList<>(map.values())
));
}
+
+ @Override
+ public byte[] exportPrintExcelByWordId(@Nullable Long orderId) {
+ ProductionPrintOrderDto printOrderDto = this.getByProductWordId(orderId);
+ List<MaterialInfoDto> materialInfo = printOrderDto.getMaterialInfo();
+ Assert.isTrue(CollUtil.isNotEmpty(materialInfo),"鏈湁鏉愭枡淇℃伅锛岃娣诲姞鏀逛俊鎭�!");
+ MaterialInfoDto materialInfoDto = materialInfo.get(0);
+ ExportProductionPrintOrderDto exportProductionPrintOrderDto = BeanUtil.copyProperties(printOrderDto, ExportProductionPrintOrderDto.class);
+ exportProductionPrintOrderDto.setNumSuffix(materialInfoDto.getNumSuffix());
+ exportProductionPrintOrderDto.setUnitSuffix(materialInfoDto.getUnitSuffix());
+ exportProductionPrintOrderDto.setPriceSuffix(materialInfoDto.getPriceSuffix());
+ StringUtils.fillStringNull(exportProductionPrintOrderDto);
+ // 鏃ユ湡淇涓� yyyy骞� MM 鏈� mm 鏃yyy-MM-dd
+ exportProductionPrintOrderDto.setPrintOrderTimeStr(DateUtil.format(exportProductionPrintOrderDto.getPrintOrderTime(),"yyyy骞� MM 鏈� dd 鏃�"));
+ exportProductionPrintOrderDto.setFinishTimeStr(DateUtil.format(exportProductionPrintOrderDto.getFinishTime(),"yyyy骞� MM 鏈� dd 鏃�"));
+
+ // 浠嬬粛淇� 鍕鹃�夋
+ String introductionLetter = exportProductionPrintOrderDto.getIntroductionLetter();
+ List<String> introductionLetterItem = StrUtil.split(introductionLetter, ",");
+ exportProductionPrintOrderDto.setIntroductionLetter1(introductionLetterItem.contains("浠嬬粛淇�")?"R" : "拢");
+ exportProductionPrintOrderDto.setIntroductionLetter2(introductionLetterItem.contains("鍟嗘爣娉ㄥ唽")?"R" : "拢");
+ exportProductionPrintOrderDto.setIntroductionLetter3(introductionLetterItem.contains("濮斿嵃鍗�")?"R" : "拢");
+ exportProductionPrintOrderDto.setIntroductionLetter4(introductionLetterItem.contains("涔﹀彿")?"R" : "拢");
+
+ // 鍒囨枡鍥剧ず
+ exportProductionPrintOrderDto.setCuttingDiagramCheckout1("骞冲紶".equals(exportProductionPrintOrderDto.getCuttingDiagramCheckout())?"R" : "拢");
+ exportProductionPrintOrderDto.setCuttingDiagramCheckout2("鍗风瓛".equals(exportProductionPrintOrderDto.getCuttingDiagramCheckout())?"R" : "拢");
+
+ // 璇诲彇鍥剧墖淇℃伅
+ if(exportProductionPrintOrderDto.getCuttingFileVo() != null){
+ byte[] bytes = FileUtil.readBytes(exportProductionPrintOrderDto.getCuttingFileVo().getFileUrl());
+ exportProductionPrintOrderDto.setCuttingImage(bytes);
+ }
+ // cutNum 涓哄皬鐩掓暟閲�+涓洅鏁伴噺
+ exportProductionPrintOrderDto.setCutNum(String.valueOf(NumberUtil.add(exportProductionPrintOrderDto.getSmallBoxQty(),exportProductionPrintOrderDto.getMediumBoxQty())));
+
+ byte[] printOrderTemplate = productionPrintOrderExcel.createPrintOrderTemplate(exportProductionPrintOrderDto, this.getClass().getResourceAsStream("/static/printOrderTemp.xlsx"));
+ return printOrderTemplate;
+ }
+
+
}
--
Gitblit v1.9.3