From c59157c3cba0c11cc72d77d187b7f9dbc49e1d14 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 23 Jul 2024 16:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=80=E6=9C=9F=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E3=80=91=E5=AF=B9=E5=A4=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/MaterialMainService.java  | 18 +++++++++---------
 .../mapper/master/MaterialMainMapper.xml       |  6 ++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
index c8793e3c..9bd64a93 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
@@ -2393,7 +2393,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                 updateList.add(update);
             });
             List<String> materialNos = list.stream().map(MaterialMainEntity::getMaterialNo).collect(Collectors.toList());
-            log.info("【计算推荐度】采购物料半年内新编码：\n{}", materialNos);
+//            log.info("【计算推荐度】采购物料半年内新编码：\n{}", materialNos);
         }
         List<MaterialMainEntity> list2 = this.lambdaQuery()
                 // 已审核 || 历史物料
@@ -2434,7 +2434,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                     updateList.add(update);
                 });
                 List<String> materialNos = subList21.stream().map(MaterialMainEntity::getMaterialNo).collect(Collectors.toList());
-                log.info("【计算推荐度】半年前非激活物料编码：\n{}", materialNos);
+//                log.info("【计算推荐度】半年前非激活物料编码：\n{}", materialNos);
             }
             // 激活物料
             List<MaterialMainEntity> subList22 = list2.stream().filter(item -> item.getMaterialState() == 1).collect(Collectors.toList());
@@ -2442,7 +2442,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
             Set<String> categorySet = subList22.stream().map(MaterialMainEntity::getMaterialCategoryCode).collect(Collectors.toSet());
             if (CollectionUtil.isNotEmpty(categorySet)) {
                 List<String> materialNos = subList22.stream().map(MaterialMainEntity::getMaterialNo).collect(Collectors.toList());
-                log.info("【计算推荐度】半年前激活物料编码：\n{}", materialNos);
+//                log.info("【计算推荐度】半年前激活物料编码：\n{}", materialNos);
                 categorySet.forEach(item -> {
                     log.info("【计算推荐度】分类代码：{}", item);
                     // 该分类的物料
@@ -2496,19 +2496,19 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                             int size60Index = new BigDecimal(itemList.size()).multiply(new BigDecimal("0.6").setScale(2, RoundingMode.HALF_DOWN)).intValue();
                             // 80% 下标
                             int size80Index = new BigDecimal(itemList.size()).multiply(new BigDecimal("0.8").setScale(2, RoundingMode.HALF_DOWN)).intValue();
-                            log.info("【10% 下标】{}", size10Index);
-                            log.info("【30% 下标】{}", size30Index);
-                            log.info("【60% 下标】{}", size60Index);
-                            log.info("【80% 下标】{}", size80Index);
+//                            log.info("【10% 下标】{}", size10Index);
+//                            log.info("【30% 下标】{}", size30Index);
+//                            log.info("【60% 下标】{}", size60Index);
+//                            log.info("【80% 下标】{}", size80Index);
                             otherSubList.forEach(i -> {
                                 Double towYearLssl = i.getTowYearLssl();
                                 // 该数量最小下标
                                 int minIdx = numList.indexOf(towYearLssl);
                                 // 该数量最大下标
                                 int maxIdx = numList.lastIndexOf(towYearLssl);
-                                log.info("【库存量】: {}, 【范围】: {}, {}", towYearLssl, minIdx, maxIdx);
+//                                log.info("【库存量】: {}, 【范围】: {}, {}", towYearLssl, minIdx, maxIdx);
                                 int recommend = confirmRecommend(size10Index, size30Index, size60Index, size80Index, itemList.size(), minIdx);
-                                log.info("【确定推荐度】{}", recommend);
+//                                log.info("【确定推荐度】{}", recommend);
                                 MaterialMainEntity update = new MaterialMainEntity();
                                 update.setRowId(i.getRowId());
                                 update.setRecommend(recommend);
diff --git a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
index e8440485..246e38b6 100644
--- a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -546,6 +546,12 @@
         <if test="query.materialNo != null and query.materialNo != ''">
             AND material_no = #{query.materialNo}
         </if>
+        <if test="query.materialNos != null and query.materialNos.size() > 0">
+            and material_no in
+            <foreach collection="query.materialNos" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         order by material_no
     </select>