From 890c1a83520617c3d66f343594a26306d916a1e2 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Thu, 7 Nov 2024 11:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=84=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BARTX=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/config/MaterialMesConfig.java    | 12 ++-------
 .../material/pojo/vo/MaterialNoticeRtx.java   | 25 +++++++++++++++++++
 .../service/MaterialDeadStockService.java     |  3 ++-
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialNoticeRtx.java

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/config/MaterialMesConfig.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/config/MaterialMesConfig.java
index 5e19705a..a3969780 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/config/MaterialMesConfig.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/config/MaterialMesConfig.java
@@ -1,6 +1,7 @@
 package com.nflg.product.material.config;
 
 import com.google.common.collect.Lists;
+import com.nflg.product.material.pojo.vo.MaterialNoticeRtx;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -78,15 +79,6 @@ public class MaterialMesConfig {
     /**
      *  采购组负责人RTX通知
      */
-    private List<NoticeRtx> purchaseNoticeList = Lists.newArrayList();
+    private List<MaterialNoticeRtx> purchaseNoticeList;
 
-    @Data
-    public class NoticeRtx{
-
-        @ApiModelProperty(value = "ekgrp")
-        private String ekgrp;
-
-        @ApiModelProperty(value = "rtx账号")
-        private String rtx;
-    }
 }
\ No newline at end of file
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialNoticeRtx.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialNoticeRtx.java
new file mode 100644
index 00000000..0af48b4a
--- /dev/null
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialNoticeRtx.java
@@ -0,0 +1,25 @@
+package com.nflg.product.material.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * packageName com.nflg.product.material.pojo.vo
+ *
+ * @author luohj
+ * @className MaterialNoticeRtx
+ * @date 2024/11/7 0007
+ * @description TODO
+ */
+@Data
+@Accessors(chain = true)
+public class MaterialNoticeRtx {
+
+    @ApiModelProperty(value = "ekgrp")
+    private String ekgrp;
+
+    @ApiModelProperty(value = "rtx账号")
+    private String rtx;
+
+}
\ No newline at end of file
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java
index 79b04b24..14e73c4d 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java
@@ -10,6 +10,7 @@ import com.nflg.product.material.config.MaterialMesConfig;
 import com.nflg.product.material.mapper.master.MaterialDeadStockMapper;
 import com.nflg.product.material.pojo.entity.MaterialDeadStockEntity;
 import com.nflg.product.material.pojo.sop.SopStockVo;
+import com.nflg.product.material.pojo.vo.MaterialNoticeRtx;
 import com.nflg.product.material.pojo.vo.MaterialOrderPlanVo;
 import com.nflg.product.material.util.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -75,7 +76,7 @@ public class MaterialDeadStockService  extends ServiceImpl<MaterialDeadStockMapp
             String title = "呆滞物料提醒";
             String msg = "有新增呆滞物料，请及时查看！";
             String receiver = materialMesConfig.getPurchaseNoticeList().stream().filter(pur -> purchaseSet.contains(pur.getEkgrp()))
-                            .map(MaterialMesConfig.NoticeRtx::getRtx).collect(Collectors.joining(","));
+                            .map(MaterialNoticeRtx::getRtx).collect(Collectors.joining(","));
             httpUtils.rtxMessage(profiles,title,msg,receiver);
         }
         return true;