rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【物料主数据】 

√1、批量导入下载模板提示问题
√2、状态变更模板，加上“替代物料”是否传给OA的判断
√3、物料查看，如果状态是冻结或完全弃用，显示最新一次变更原因
This commit is contained in:
10001392 2024-10-08 09:57:49 +08:00
parent 775fbf15e2
commit 9e83b3ab31
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java
View File

@ -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();
}
}

10
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java
View File

@ -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);