From 9e83b3ab31cdb647cf421bfc7cdc8319385d0e7c Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 8 Oct 2024 09:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=91=20=E2=88=9A1=E3=80=81=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=20=E2=88=9A2=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E2=80=9C=E6=9B=BF=E4=BB=A3=E7=89=A9=E6=96=99=E2=80=9D?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BC=A0=E7=BB=99OA=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=20=E2=88=9A3=E3=80=81=E7=89=A9=E6=96=99=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=8A=B6=E6=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E6=88=96=E5=AE=8C=E5=85=A8=E5=BC=83=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/user/material/MaterialUpdateBillApi.java  | 15 +++++++++++++++
 .../service/MaterialUpdateToOAService.java        | 10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java
index 1f9759cb..42785841 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java
@@ -1,5 +1,7 @@
 package com.nflg.product.material.api.user.material;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nflg.product.base.core.api.BaseApi;
 import com.nflg.product.base.core.exception.NflgBusinessException;
@@ -209,4 +211,17 @@ public class MaterialUpdateBillApi  extends BaseApi {
     public ResultVO<MaterialAttrValueI18nEntity> materialUpdateBillService(@RequestParam("attrValueCn") String attrValueCn, @RequestParam("type") String type) {
         return materialUpdateBillService.materialUpdateBillService(attrValueCn, type);
     }
+
+    @GetMapping("getCurrentUpdateReason")
+    @ApiOperation("获取最近一次变更情况")
+    public ResultVO<MaterialUpdateBillVO> getCurrentUpdateReason(@RequestParam("materialNo") String materialNo) {
+        List<MaterialUpdateBillEntity> list = materialUpdateBillService.lambdaQuery()
+                .eq(MaterialUpdateBillEntity::getMaterialNo, materialNo)
+                .orderByDesc(MaterialUpdateBillEntity::getCreatedTime)
+                .list();
+        if (CollectionUtil.isNotEmpty(list)) {
+            return ResultVO.success(Convert.convert(MaterialUpdateBillVO.class, list.get(0)));
+        }
+        return ResultVO.success();
+    }
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java
index 85714fad..7ef2cdd7 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java
@@ -101,9 +101,17 @@ public class MaterialUpdateToOAService {
             material.put("UPDATEREASON", u.getUpdateResion());
             material.put("OLDMAKTX", u.getOldMaterialDesc());
             material.put("OLDTYPEMAKTX", u.getOldCategoryNameTree());
+
             if (StringUtils.isNotEmpty(u.getReplaceMaterialNo())) {
-                material.put("Ftdwl", u.getReplaceMaterialNo());
+                MaterialMainEntity materialMainEntity = materialMainService.lambdaQuery().eq(MaterialMainEntity::getMaterialNo, u.getMaterialNo()).one();
+                MaterialMainEntity replaceMaterialMainEntity = materialMainService.lambdaQuery().eq(MaterialMainEntity::getMaterialNo, u.getReplaceMaterialNo()).one();
+                boolean flag = Objects.nonNull(replaceMaterialMainEntity);
+                boolean flagJudge = materialMainEntity.getMaterialUnit().equals(replaceMaterialMainEntity.getMaterialUnit());
+                if (flag && flagJudge) {
+                    material.put("Ftdwl", u.getReplaceMaterialNo());
+                }
             }
+
             list.add(material);
         });
         result.put("List", list);