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 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 updateList.size()) { + endIdx = updateList.size(); + } + if (startIdx == updateList.size()) { + break; + } + log.info("第" + (i + 1) + "次循环,区间:" + startIdx + "," + endIdx); + List subList = updateList.subList(startIdx, endIdx); + materialMainMapper.updateBatchTwoYearsUsage(subList); + } } } catch (Exception e) { log.error("【ZRFC_MM_003】异常:{}", e.getMessage());