From 2bbd50fb56275986e2a8658c373686d56804b99b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 29 八月 2025 14:14:52 +0800
Subject: [PATCH] yml配置
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 134 ++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 72 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 43fcea6..95c5e8d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -18,8 +18,9 @@
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.properties.WechatProperty;
+import com.ruoyi.common.config.WechatProperty;
import com.ruoyi.common.utils.LimsDateUtil;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
@@ -57,7 +58,6 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
/**
* @Author zhuo
@@ -75,48 +75,30 @@
private InsSampleMapper insSampleMapper;
private final NumberGenerator<InsOrder> numberGenerator;
private InsReportService insReportService;
- private WechatProperty wechatProperty;
+// private WechatProperty wechatProperty;
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
private InsProductMapper insProductMapper;
private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
@Override
- public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) {
- if (StringUtils.isBlank(partNo)) {
- throw new ErrorException("闆朵欢鍙蜂涪澶�");
- }
+ public Result selectStandardTreeListByPartNo(String partNo) {
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo);
if (CollectionUtil.isEmpty(factoryDtos)) {
- throw new ErrorException("闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
+ return Result.success(null, "闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
}
RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
- Set<String> sampleTypeValues = new HashSet<>();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
if (sampleTypeDto.getChildren().size() == 0) {
- sampleTypeValues.add(sampleTypeDto.getValue());
- }
- }
- }
- }
- // 鎵归噺鏌ヨ鎵�鏈� sampleTypeDto 鐨勬暟鎹�
- List<SampleDto> standardList = standardTreeMapper.getStandardTree3Batch(sampleTypeValues);
- Map<String, List<SampleDto>> standardTreeMap = standardList.stream().collect(Collectors.groupingBy(SampleDto::getValue));
-
- for (FactoryDto factoryDto : factoryDtos) {
- for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
- List<SampleDto> standardTreeList = standardTreeMap.get(sampleTypeDto.getValue());
- if (sampleTypeDto.getChildren().size() == 0) {
- sampleTypeDto.getChildren().addAll(standardTreeList);
+ sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
}
// 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
// 娣诲姞瀵硅薄
- rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
+ rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + " - "
+ + laboratoryDto.getValue() + " - "
+ sampleTypeDto.getValue());
rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
@@ -126,9 +108,9 @@
for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
// 娣诲姞瀵硅薄
- rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
- + sampleTypeDto.getValue() + "-"
+ rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + " - "
+ + laboratoryDto.getValue() + " - "
+ + sampleTypeDto.getValue() + " - "
+ sampleDto.getValue());
rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
@@ -140,7 +122,7 @@
}
}
}
- return rawMaterialStandardTreeDto;
+ return Result.success(rawMaterialStandardTreeDto);
}
@Override
@@ -169,31 +151,31 @@
.set(IfsInventoryQuantity::getIsInspect, 1)
.set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
);
- threadPoolTaskExecutor.execute(() -> {
- List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
- .in(IfsInventoryQuantity::getId, ids));
- // 浼佷笟寰俊閫氱煡
- String message = "";
- message += "鏂板鎶ユ閫氱煡";
- for (IfsInventoryQuantity inventoryQuantity : quantityList) {
- message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
- message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
- message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
-
- // 鍒ゆ柇鏈夋病鏈夊埌20鍚�. 鎴栬�呰兘鍚﹀厤妫�
- int result = notificationRawOrder(inventoryQuantity.getId());
- switch (result) {
- case 1:
- message += "\n褰撳墠鏍峰搧宸叉楠岃繃, 鍙互鍏嶆";
- break;
- case 2:
- message += "\n褰撳墠鏍峰搧宸茶秴杩�20鍚�";
- break;
- }
- message += "\n";
- }
- WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
- });
+// threadPoolTaskExecutor.execute(() -> {
+// List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
+// .in(IfsInventoryQuantity::getId, ids));
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// for (IfsInventoryQuantity inventoryQuantity : quantityList) {
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+//
+// // 鍒ゆ柇鏈夋病鏈夊埌20鍚�. 鎴栬�呰兘鍚﹀厤妫�
+// int result = notificationRawOrder(inventoryQuantity.getId());
+// switch (result) {
+// case 1:
+// message += "\n褰撳墠鏍峰搧宸叉楠岃繃, 鍙互鍏嶆";
+// break;
+// case 2:
+// message += "\n褰撳墠鏍峰搧宸茶秴杩�20鍚�";
+// break;
+// }
+// message += "\n";
+// }
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
return 1;
}
@@ -237,16 +219,16 @@
.set(IfsInventoryQuantity::getUpdateBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
);
- threadPoolTaskExecutor.execute(() -> {
- IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
- // 浼佷笟寰俊閫氱煡
- String message = "";
- message += "鏂板鎶ユ閫氱煡";
- message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
- message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
- message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
- WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
- });
+// threadPoolTaskExecutor.execute(() -> {
+// IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
return 1;
}
@@ -387,7 +369,8 @@
ifsInventoryQuantityDto.setBeginDeclareDate(null);
ifsInventoryQuantityDto.setEndDeclareDate(null);
- return standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ IPage<IfsInventoryQuantitySupplierDto> ifsByOver = standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ return ifsByOver;
}
/**
@@ -690,12 +673,19 @@
*/
@Override
public void rawAllExport(IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto, HttpServletResponse response) throws UnsupportedEncodingException {
- //鏌ヨ瀵煎嚭鐨勮垂鐢ㄧ粺璁℃暟鎹�
- String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
- String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
- ifsInventoryQuantityDto.setBeginDeclareDate(null);
- ifsInventoryQuantityDto.setEndDeclareDate(null);
- List<IfsInventoryQuantitySupplierDto> ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ // 鍒ゆ柇鏄惁鏄牴鎹�夋嫨鐨勫鍑�
+ List<IfsInventoryQuantitySupplierDto> ifsByOverList = new ArrayList<>();
+ if (StringUtils.isNotBlank(ifsInventoryQuantityDto.getIds())) {
+ List<String> ifsIds = StrUtil.split(ifsInventoryQuantityDto.getIds(), ",");
+ ifsByOverList = standardTreeMapper.getIfsByIds(ifsIds);
+ } else {
+ String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
+ String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
+ ifsInventoryQuantityDto.setBeginDeclareDate(null);
+ ifsInventoryQuantityDto.setEndDeclareDate(null);
+ ifsInventoryQuantityDto.setIds(null);
+ ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ }
for (IfsInventoryQuantitySupplierDto dto : ifsByOverList) {
dto.setSendTimeString(dto.getSendTime() == null ? "" : dto.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
--
Gitblit v1.9.3