From 91be7b8de1eba334b01e030c1e79c5b9df75746d Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 2 Sep 2024 11:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=201=E3=80=81=E3=80=90=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E3=80=91=E5=88=B6=E4=BD=9C=E7=89=A9=E6=96=99=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MaterialExcelService.java         | 21 +++++++++++++++++++
 .../material/service/MaterialMainService.java | 12 +++++------
 .../pojo/entity/MaterialMainEntity.java       |  9 +++++++-
 .../bomnew/service/MaterialService.java       | 18 ++++++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)

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 f93925a1..5f9904ad 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
@@ -284,6 +284,19 @@ public class MaterialExcelService {
             excelEnt.setProcessState(MaterialProcessStateEnum.WAIT_SUBMIT.getValue());
             if (ObjectUtil.isNotEmpty(excelEnt.getMaterialName())) {
                 excelEnt.setMaterialDescEn(query21MaterialDescEn(excelEnt.getMaterialName().split(" ")[0]));
+                if ("201101".equals(excelEnt.getMaterialCategoryCode())) {
+                    if (excelEnt.getMaterialName().endsWith("(发货)")) {
+                        excelEnt.setMaterialDescEn("Deliver Goods Package");
+                    } else if (excelEnt.getMaterialName().endsWith("(制作)")) {
+                        excelEnt.setMaterialDescEn("Make Package");
+                    } else if (excelEnt.getMaterialName().endsWith("(直发)")) {
+                        excelEnt.setMaterialDescEn("Inventory Deliver Goods Package");
+                    } else if (excelEnt.getMaterialName().endsWith("(油漆)")) {
+                        excelEnt.setMaterialDescEn("Paint Package");
+                    } else if (excelEnt.getMaterialName().endsWith("(发货前装配)")) {
+                        excelEnt.setMaterialDescEn("Assembly before Shipment");
+                    }
+                }
             }
         }
 
@@ -304,6 +317,14 @@ public class MaterialExcelService {
             List<String> descDbExites = dbExitstDesc.stream().map(MaterialMainEntity::getMaterialDesc).collect(Collectors.toList());
             throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", descDbExites).concat("图号+名称在数据库中已存在"));
         }
+        // 检查英文描述不能为空
+        List<MaterialSelfExcelDTO> emptyMaterialDescEnList = datas.stream()
+                .filter(item -> !"201301".equals(item.getMaterialCategoryCode()) && ObjectUtil.isEmpty(item.getMaterialDescEn()))
+                .collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(emptyMaterialDescEnList)) {
+            List<String> emptyDescEnList = emptyMaterialDescEnList.stream().map(MaterialSelfExcelDTO::getMaterialName).collect(Collectors.toList());
+            throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", emptyDescEnList).concat("未匹配到英文描述"));
+        }
         List<MaterialMainEntity> result = Convert.convert(new TypeReference<List<MaterialMainEntity>>() {
         }, datas);
 
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 8a0c744a..3b6727f0 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
@@ -1202,14 +1202,14 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
      */
     public void initPic(MaterialMainVO data) {
         MaterialFilesEntity file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).one();
+                .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         if (Objects.isNull(file)) {
             file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).one();
+                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         }
         if (Objects.isNull(file)) {
             file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).one();
+                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         }
         if (!Objects.isNull(file)) {
             data.setPicUrl(file.getFileUrl());
@@ -1223,14 +1223,14 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
      */
     public void initPic2(MaterialMainVO data) {
         MaterialFilesEntity file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                .eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).one();
+                .eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         if (Objects.isNull(file)) {
             file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).one();
+                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         }
         if (Objects.isNull(file)) {
             file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
-                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).one();
+                    .eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
         }
         if (!Objects.isNull(file)) {
             data.setPicUrl(file.getFileUrl());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/MaterialMainEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/MaterialMainEntity.java
index 7c0f0bf4..58f60ed9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/MaterialMainEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/MaterialMainEntity.java
@@ -52,7 +52,14 @@ public class MaterialMainEntity implements Serializable {
         @TableField(value = "material_desc")
         @ApiModelProperty(value = "物料描述")
     private String materialDesc;
-        
+
+    /**
+     * 英文描述
+     */
+    @TableField(value = "material_desc_en")
+    @ApiModelProperty(value = "英文描述")
+    private String materialDescEn;
+
     /**
      * 物料描述(简写)
      */
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
index cda22991..f87ea03f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
@@ -206,6 +207,7 @@ public class MaterialService {
                 ma.setProjectType(md.getProjectType());
             }
             ma.setMaterialGetType(md.getMaterialGetType());
+            this.get201101MaterialDescEn(ma);
             resultList.add(ma);
 
             AddMaterialMainDTO ent = new AddMaterialMainDTO();
@@ -236,6 +238,22 @@ public class MaterialService {
         return result;
     }
 
+    private void get201101MaterialDescEn(MaterialMainEntity ma) {
+        if ("201101".equals(ma.getMaterialCategoryCode()) && ObjectUtil.isNotEmpty(ma.getMaterialName())) {
+            if (ma.getMaterialName().endsWith("(发货)")) {
+                ma.setMaterialDescEn("Deliver Goods Package");
+            } else if (ma.getMaterialName().endsWith("(制作)")) {
+                ma.setMaterialDescEn("Make Package");
+            } else if (ma.getMaterialName().endsWith("(直发)")) {
+                ma.setMaterialDescEn("Inventory Deliver Goods Package");
+            } else if (ma.getMaterialName().endsWith("(油漆)")) {
+                ma.setMaterialDescEn("Paint Package");
+            } else if (ma.getMaterialName().endsWith("(发货前装配)")) {
+                ma.setMaterialDescEn("Assembly before Shipment");
+            }
+        }
+    }
+
     public Map<String, AddVirtrualMaterialDTO> batchAddMaterial(List<AddVirtrualMaterialDTO> mds) {
         return batchAddMaterial(mds, SessionUtil.getUser());
     }