From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
index 239b707..b6f567f 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
@@ -247,6 +247,10 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
depotConf.getGrainSer());
+ // 鑻ヨ櫕瀹冲垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇铏鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getPestSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getPestSer());
+ }
CheckPestRequest request = new CheckPestRequest();
request.setDepotId(param.getDepotId());
--
Gitblit v1.9.3