From 23d35c163bd5308fc4a8e94cda87881d9547a251 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 29 八月 2025 13:31:12 +0800
Subject: [PATCH] 去除与其他系统的对接配置
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 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 fb5bfdc..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
@@ -75,7 +75,7 @@
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;
@@ -97,8 +97,8 @@
// 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
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());
@@ -108,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());
@@ -151,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;
}
@@ -219,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;
}
--
Gitblit v1.9.3