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 materialUpdateBillService(@RequestParam("attrValueCn") String attrValueCn, @RequestParam("type") String type) { return materialUpdateBillService.materialUpdateBillService(attrValueCn, type); } + + @GetMapping("getCurrentUpdateReason") + @ApiOperation("获取最近一次变更情况") + public ResultVO getCurrentUpdateReason(@RequestParam("materialNo") String materialNo) { + List 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);