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

√2、物料变更，弹窗匹配最新的英文描述 

√3、物料变更，弹窗显示字段：变更人、变更部门、申请变更时间、变更生效时间
4、物料申请，增加选填字段 通用程度；取消项目类别字段必填
This commit is contained in:
10001392 2024-09-26 08:48:26 +08:00
parent 4fe36d5b9c
commit 582ccdc66a
5 changed files with 82 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import com.nflg.product.base.core.exception.NflgBusinessException;
import com.nflg.product.material.pojo.dto.MaterialStateUpExcelDTO;
import com.nflg.product.material.pojo.dto.MaterialUpdateBillDTO;
import com.nflg.product.material.pojo.dto.TwentyMaterialTemplateExcelDTO;
import com.nflg.product.material.pojo.entity.MaterialAttrValueI18nEntity;
import com.nflg.product.material.pojo.entity.MaterialUpdateBillEntity;
import com.nflg.product.material.pojo.entity.MaterialUpdateImportTaskEntity;
import com.nflg.product.material.pojo.query.MaterialUpdateBillQuery;
@ -198,4 +199,14 @@ public class MaterialUpdateBillApi extends BaseApi {
public ResultVO<List<MaterialUpdateImportTaskEntity>> getMaterialUpdateImportTaskList() {
return ResultVO.success(materialUpdateBillService.getMaterialUpdateImportTaskList());
}
/**
* 获取制作物料名称国际化表
* @param
*/
@GetMapping("getI18nForUpdate")
@ApiOperation("获取制作物料名称国际化表")
public ResultVO<MaterialAttrValueI18nEntity> materialUpdateBillService(@RequestParam("attrValueCn") String attrValueCn, @RequestParam("type") String type) {
return materialUpdateBillService.materialUpdateBillService(attrValueCn, type);
}
}

30
nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
View File

@ -1,6 +1,7 @@
package com.nflg.product.material.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.nflg.product.material.pojo.dto.MaterialMainAttrDTO;
import com.nflg.product.material.pojo.entity.MaterialFilesEntity;
import io.swagger.annotations.ApiModel;
@ -12,6 +13,7 @@ import org.ttzero.excel.annotation.ExcelColumn;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -438,4 +440,32 @@ public class MaterialMainVO implements Serializable {
*/
@ApiModelProperty(value = "项目类别")
private String projectType;
// 变更弹窗字段 start
/**
* 变更人
*/
@ApiModelProperty(value = "变更人")
private String updateCreatedByName;
/**
* 变更部门
*/
@ApiModelProperty(value = "变更部门")
private String updateApplyDeptName;
/**
* 申请变更时间
*/
@ApiModelProperty(value = "申请变更时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateCreatedTime;
/**
* 变更生效时间
*/
@ApiModelProperty(value = "变更生效时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateEffectTime;
// 变更弹窗字段 end
}

4
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
View File

@ -238,8 +238,8 @@ public class MaterialExcelService {
throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", diff).concat("分类代码在系统中不存在"));
}
// 校验项目类别
checkProjectType(datas);
// // 校验项目类别
// checkProjectType(datas);
//验证21 物料
check21Droring(datas);

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

@ -1325,10 +1325,10 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
}
}
ResultVO<String> projectTypeResult = checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto);
if (Objects.nonNull(projectTypeResult)) {
return projectTypeResult;
}
// ResultVO<String> projectTypeResult = checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto);
// if (Objects.nonNull(projectTypeResult)) {
// return projectTypeResult;
// }
// 工具工装，只验证图号是否重名，不验证前缀
if (materialCategoryEntity.getRelCategoryCode().equals(MaterialRelCategoryCodeEnum.relCategoryCode_71.getRelCategoryCode())) {
@ -1602,7 +1602,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
}
MaterialCategoryEntity materialCategoryEntity = materialCategoryService.lambdaQuery().eq(MaterialCategoryEntity::getCategoryCode, paramDto.getMaterialCategoryCode()).one();
checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto);
// checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto);
//效验21物料图片
check21And31DrawingNo(paramDto, paramDto.getRowId());

36
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
View File

@ -20,8 +20,7 @@ import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.base.core.exception.NflgBusinessException;
import com.nflg.product.base.core.vo.PageVO;
import com.nflg.product.material.constant.*;
import com.nflg.product.material.mapper.master.MaterialUpdateBillMapper;
import com.nflg.product.material.mapper.master.MaterialUpdateImportTaskMapper;
import com.nflg.product.material.mapper.master.*;
import com.nflg.product.material.pojo.dto.ExcelDTO.MaterialStateUpExcelDTO;
import com.nflg.product.material.pojo.dto.ExcelDTO.TwentyMaterialTemplateExcelDTO;
import com.nflg.product.material.pojo.dto.MaterialMainAddAttrParamDTO;
@ -96,6 +95,13 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
@Resource
private MaterialUpdateImportTaskMapper materialUpdateImportTaskMapper;
@Resource
private MaterialAttrValueMapper materialAttrValueMapper;
@Resource
private MaterialAttrValueI18nMapper materialAttrValueI18nMapper;
@Resource
private MaterialAttrValueI18n21Mapper materialAttrValueI18n21Mapper;
private static final String PREFIX = "frontend:material";
/**
@ -1058,6 +1064,11 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
}
materialMainVO.setReplaceMaterialNo(materialUpdateBillEntity.getReplaceMaterialNo());
materialMainVO.setRemark(ent.getRemark());
materialMainVO.setMaterialDescEn(materialUpdateBillEntity.getMaterialDescEn());
materialMainVO.setUpdateCreatedByName(materialUpdateBillEntity.getCreatedByName());
materialMainVO.setUpdateApplyDeptName(materialUpdateBillEntity.getApplyDeptName());
materialMainVO.setUpdateCreatedTime(materialUpdateBillEntity.getCreatedTime());
materialMainVO.setUpdateEffectTime(materialUpdateBillEntity.getEffectTime());
}
return materialMainVO;
}
@ -1202,4 +1213,25 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
public List<MaterialUpdateImportTaskEntity> getMaterialUpdateImportTaskList() {
return materialUpdateImportTaskMapper.getMaterialUpdateImportTaskList(SessionUtil.getUserCode());
}
public ResultVO<MaterialAttrValueI18nEntity> materialUpdateBillService(String attrValueCn, String type) {
// 查询制作物料英文
if ("20".equals(type)) {
LambdaQueryWrapper<MaterialAttrValueI18n21Entity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MaterialAttrValueI18n21Entity::getAttrValueCn, attrValueCn).eq(MaterialAttrValueI18n21Entity::getEnableState, 1);
MaterialAttrValueI18n21Entity i18n21Entity = materialAttrValueI18n21Mapper.selectOne(queryWrapper);
return ResultVO.success(Convert.convert(MaterialAttrValueI18nEntity.class, i18n21Entity));
} else {
// 查询采购物料英文
LambdaQueryWrapper<MaterialAttrValueEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MaterialAttrValueEntity::getAttrRowId, 1).eq(MaterialAttrValueEntity::getAttrValueName, attrValueCn);
MaterialAttrValueEntity materialAttrValueEntity = materialAttrValueMapper.selectOne(queryWrapper);
if (ObjectUtil.isNotEmpty(materialAttrValueEntity)) {
LambdaQueryWrapper<MaterialAttrValueI18nEntity> i18nQueryWrapper = new LambdaQueryWrapper<>();
i18nQueryWrapper.eq(MaterialAttrValueI18nEntity::getAttrValueRowId, materialAttrValueEntity.getRowId());
return ResultVO.success(materialAttrValueI18nMapper.selectOne(i18nQueryWrapper));
}
}
return ResultVO.success();
}
}