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

【物料变更】提示语 

【标准部件】非标导出加字段：选型说明，备注
This commit is contained in:
10001392 2024-09-05 09:31:08 +08:00
parent c9a570f706
commit 9e930b2aaa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java
View File

@ -30,4 +30,10 @@ public class StandardPartPickExcelDTO implements Serializable {
@ExcelColumn(value = "单重") @ExcelColumn(value = "单重")
private BigDecimal unitWeight; private BigDecimal unitWeight;
@ExcelColumn(value = "选型说明")
private String modelSelectionRemark;
@ExcelColumn(value = "备注")
private String remark;
} }

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

@ -664,7 +664,7 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
&& (ObjectUtil.isNotEmpty(update.getNewMaterialState()) && update.getNewMaterialState().equals(MaterialStateEnum.ACTIVATE.getValue()))).collect(Collectors.toList()); && (ObjectUtil.isNotEmpty(update.getNewMaterialState()) && update.getNewMaterialState().equals(MaterialStateEnum.ACTIVATE.getValue()))).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(filterList)) { if (CollectionUtil.isNotEmpty(filterList)) {
List<String> materialNos = filterList.stream().map(MaterialUpdateBillEntity::getMaterialNo).collect(Collectors.toList()); List<String> materialNos = filterList.stream().map(MaterialUpdateBillEntity::getMaterialNo).collect(Collectors.toList());
throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", materialNos).concat("物料解冻时，禁止改成激活")); throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", materialNos).concat("营销中心(工服)解冻11、21物料时不能选激活，应选择售后专用或禁止采购"));
} }
} }