From 8548f82c67f9def7ccb87986d4f923c25b70705a Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Thu, 11 Jul 2024 09:15:58 +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=911=E3=80=81=E5=88=B6?=
 =?UTF-8?q?=E4=BD=9C=E7=89=A9=E6=96=99=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=B1=E6=96=87=E6=8F=8F=E8=BF=B0=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=202=E3=80=81=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99SAP=E8=BF=91=E4=B8=A4=E5=B9=B4=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=87=8F=EF=BC=88=E6=96=B0=EF=BC=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/dto/ExcelDTO/MaterialSelfExcelDTO.java  |  4 ++++
 .../material/service/MaterialExcelService.java   | 14 ++++++++++++++
 .../material/service/MaterialMainService.java    | 16 +++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/MaterialSelfExcelDTO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/MaterialSelfExcelDTO.java
index c56be8ea..a332e9e7 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/MaterialSelfExcelDTO.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/MaterialSelfExcelDTO.java
@@ -39,6 +39,10 @@ public class MaterialSelfExcelDTO extends BaseImportExcelDTO {
     @IgnoreExport
     private String materialDesc;
 
+    @ApiModelProperty(value = "英文描述")
+    @IgnoreExport
+    private String materialDescEn;
+
     @IgnoreExport
     private String applyUserCode;
 
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
index dc8e27de..f93925a1 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
@@ -282,6 +282,9 @@ public class MaterialExcelService {
             // 20231107大改动：制作物料批量导入，先保存物料数据，流程状态为待提交（这样可避免OA处理过久timeout报错，而丢失保存物料数据），
             // 再发起OA流程，等OA流程返回信息，再更新物料表的oaRowId字段
             excelEnt.setProcessState(MaterialProcessStateEnum.WAIT_SUBMIT.getValue());
+            if (ObjectUtil.isNotEmpty(excelEnt.getMaterialName())) {
+                excelEnt.setMaterialDescEn(query21MaterialDescEn(excelEnt.getMaterialName().split(" ")[0]));
+            }
         }
 
         //检查图号不能重复
@@ -563,4 +566,15 @@ public class MaterialExcelService {
         }
         return "";
     }
+
+    private static String query21MaterialDescEn(String cn) {
+        if (ObjectUtil.isEmpty(cn)) {
+            return "";
+        }
+        ResultVO<MaterialAttrValueI18n21Entity> i18n21EntityResultVO = SpringContextUtils.getBean(MaterialAttrValueService.class).getI18n21(cn);
+        if (ObjectUtil.isNotEmpty(i18n21EntityResultVO.getData())) {
+            return i18n21EntityResultVO.getData().getAttrValueEn();
+        }
+        return "";
+    }
 }
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 e73c3ded..c8793e3c 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
@@ -2846,7 +2846,21 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                     update.setTwoYearsUsage(new BigDecimal(out.get("BDMNG").toString()));
                     updateList.add(update);
                 });
-                materialMainMapper.updateBatchTwoYearsUsage(updateList);
+
+                // updateList 太大，会超过 mysql 数据包大小（默认4M），所以每次10000条分批次执行
+                for (int i = 0; i < (updateList.size() / 10000) + 1; i++) {
+                    int startIdx = i * 10000;
+                    int endIdx = startIdx + 10000;
+                    if (endIdx > updateList.size()) {
+                        endIdx = updateList.size();
+                    }
+                    if (startIdx == updateList.size()) {
+                        break;
+                    }
+                    log.info("第" + (i + 1) + "次循环，区间：" + startIdx + "," + endIdx);
+                    List<MaterialMainEntity> subList = updateList.subList(startIdx, endIdx);
+                    materialMainMapper.updateBatchTwoYearsUsage(subList);
+                }
             }
         } catch (Exception e) {
             log.error("【ZRFC_MM_003】异常：{}", e.getMessage());