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 purchaseNoticeList = Lists.newArrayList(); + private List 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 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;